gentoo resync : 08.10.2021

32 files changed, 281 insertions, 280 deletions

diff --git a/app-crypt/Manifest.gz b/app-crypt/Manifest.gz
index c65ae5ff0540..22d4007f4521 100644
--- a/app-crypt/Manifest.gz
+++ b/app-crypt/Manifest.gz
diff --git a/app-crypt/acme-sh/Manifest b/app-crypt/acme-sh/Manifest
index 25fa0f8e320e..75ec7c4c0df8 100644
--- a/app-crypt/acme-sh/Manifest
+++ b/app-crypt/acme-sh/Manifest
@@ -1,6 +1,6 @@
 AUX 99acme-sh 62 BLAKE2B b9542b99b2e720e0930139f7dd56efc63e596156dca1649624f6f4c27a7d57555bb13deb3b5714aa06477e9ca79996b5f891c8a91ea808d853cc7e5d5655b0a0 SHA512 b7fc9402e3bea3ca846bdb82d6f21d1b7023bb2ace8d5ffd146959cd12e3270243fd22e3a7dde9b6cefae8f2cbca369b35d2da4ea9f1e60a2f61ae81612d8bc5
 AUX acme.sh 63 BLAKE2B 50c3284c0172ff0a0dc57fcfbaba57a6518d7c043b5d052f2710b28229b9b13313e7ca7c8b644ea273eb2f4991246631e70e6184fb5489005be12b77b8efa229 SHA512 7ec0764c86db5c68c42189a8af708e769189df201fdf017bd0d8d9e322ab71c2f422be382d170a1f4b876a1e5a6629eb55df0c564abfebab665e27e58660ff6e
-DIST acme.sh-3.0.0.tar.gz 237047 BLAKE2B 4165cb8b5d6f7a6deda8149332c798f795e5c8cfc63953f2e30e28f1b7ec256a1f3e38596d33d075c7257921d9ffd27bc6add3ac8bb3b9c0ddf5861cb0d3a2d3 SHA512 e93e955100071fda9398131aad965fe6d5b51d9c496b1db0269744513baca4c8eb142d9a35a72b72d4919c004848696fdf9de1ae51edec835ae0f695a6cb14b1
-EBUILD acme-sh-3.0.0.ebuild 1176 BLAKE2B b20e0c245dbf3b7f42487b920882aa266fff5d944e358a272389d5d90b4276c7feb52fba39a08d069444d854b758f1ae55e4e4cac09f0243ae86c8e0fae8bf80 SHA512 46f1a2cf03b03245dbd5bf212ab9714c6fdd80de9191bb74eb4e21a560eea53d8d90aa4a7fdd25b2eedbe9b472be88a72f000ad63bbe5e9cd0450a0b552c6ac3
+DIST acme.sh-3.0.1.tar.gz 239311 BLAKE2B cbbaf6da068447c3400081889e249dc6f17f56df2038d75915eb990e417ecf5407c9c8272dfbd8403fac413357f30df552678ed27096de769ee5355f6343b6f4 SHA512 8bc5468fa70bf0a23f516b05e49f4c457cceb3ae0c12e963b538297912adce1f16fca200b116fc39a88ee0ba522e1757654ed231bebb6199ef7f5ad152511c71
+EBUILD acme-sh-3.0.1.ebuild 1176 BLAKE2B b20e0c245dbf3b7f42487b920882aa266fff5d944e358a272389d5d90b4276c7feb52fba39a08d069444d854b758f1ae55e4e4cac09f0243ae86c8e0fae8bf80 SHA512 46f1a2cf03b03245dbd5bf212ab9714c6fdd80de9191bb74eb4e21a560eea53d8d90aa4a7fdd25b2eedbe9b472be88a72f000ad63bbe5e9cd0450a0b552c6ac3
 EBUILD acme-sh-9999.ebuild 1068 BLAKE2B 30c215e09a39861eaf708402590c9a5b26585d60627bf743cfa39d3ca50012df52e53a2b350cc67d9980446af22b61678a845b3dd1d007d63fc4ab8eef4de8b7 SHA512 3184802d442b94dbfd38b23a244879cf9f863d4e2371051b6925e8ab1de4077c697f48b1625ff36447c004a679f45df0419b9560d165519e06c96a6250768aa0
 MISC metadata.xml 677 BLAKE2B 783e74dfc78dc11568fe72316c5bd100d18fd5c90987d9c21386930f98713d6be5de74d395ed919a8dd7986f0bada50d16c24a670ba856318d103b186a514046 SHA512 6a34e252d900761bc12fe5b1f8d8b8277fded6685f8495a307de4906a19d797f2a4eb9b84676ae1f5f43720c092e3f3d081ec243dff19efa626d4d538974efc1
diff --git a/app-crypt/acme-sh/acme-sh-3.0.0.ebuild b/app-crypt/acme-sh/acme-sh-3.0.1.ebuild
index a6b09a058aa2..a6b09a058aa2 100644
--- a/app-crypt/acme-sh/acme-sh-3.0.0.ebuild
+++ b/app-crypt/acme-sh/acme-sh-3.0.1.ebuild
diff --git a/app-crypt/acme/Manifest b/app-crypt/acme/Manifest
index 8d85bbafe401..5ca004ac403e 100644
--- a/app-crypt/acme/Manifest
+++ b/app-crypt/acme/Manifest
@@ -1,8 +1,6 @@
-DIST certbot-1.17.0.tar.gz 1386471 BLAKE2B 26cf23c481cc67e1fa0f698dee83dd42b1d382814f10bdb4d2a459f1274f3d661d2a58815c30110701d46362c3fbaee9f57089a7eda1221c9b9dadb2c48dc79d SHA512 104deb8e6e804a3a3f50c730f00307aa39d9d42756f24be009fedc27c889c1575b456455ee11441e341025db6f528359e927a347554ebd57b64c39e789576eda
 DIST certbot-1.18.0.tar.gz 1332615 BLAKE2B eb086710b943893025d6e1091470ca02de074232372f4c9fa21fa83a347fe54df988b9553c8cf6afd6e166b8c464d595171984c984008a872e16c0179bb774b2 SHA512 94b16ba0586e0f5d3036280c68f9976c25889ca48fbbe7aded41f0d9feba2300a3f0ff8fe321b39d8642bcdd874c7332cf2acb3187b5869fe415831f58a75a7b
 DIST certbot-1.19.0.tar.gz 1338653 BLAKE2B b6ed909da2aed9853cf3dc6b936c513f33a127548ee30ac45a32a682141c5e4e79401ea328b7caf4e28d1d85aa2a9831e93deaa26c93216708a33be465dc8387 SHA512 2c1beb8c06299b9003fafd970cd3e977db85c4e84f1bf710166b7a99035b5c43a2a222d8d51513ac595255dd8eda02a1fb834c01ce68921927715c880052536e
-EBUILD acme-1.17.0.ebuild 1679 BLAKE2B ff4806292419911de014008dc51d250464f90368325db9a0cd73b6ba2881c6f60563fd7831d999ffba75772cbfa24af517d9fa52556f260f13c5855400d635bf SHA512 fbdc63af62a50e9ca6f98ed17b1b1be58a0a206b4e0940557b592f715a3d8bb81c6432132623e497e94806d595d4e71f0a660512c8ee23bd15b84088a62821cf
 EBUILD acme-1.18.0-r1.ebuild 1123 BLAKE2B 37c29dec8eb47e63cc708fd431af8689155798c9a4fe2c07dd2de26980adf8335d523f1a5e06a17c707561571ac6b0b7ba97a477419b1f974c8881fd03b99ca4 SHA512 964a1b0e24ad95302f47a09d1c1f1560d5551547c36f3bd2eaaab6c03a320444ef296f4141017420a61d9d36378490a149a3c325e43e471796a960c913650a5d
-EBUILD acme-1.19.0.ebuild 1125 BLAKE2B e573b1ec4d48443aeec1bde0b70c9c510982b9cfb802c2d8ab2503db9b1830b7066b91da290f51eb234512a9c82bcd60afc93c022a9aae370739984d1b26f607 SHA512 a57c453c1607e03521deebbe7ff3ec55cc214015b7afb69e39b66b2f82c7d51c73fe66a2ff36efd88d0248b5ca50e755c065e1a18e8a833373a9980a025fc017
-EBUILD acme-9999.ebuild 1125 BLAKE2B e573b1ec4d48443aeec1bde0b70c9c510982b9cfb802c2d8ab2503db9b1830b7066b91da290f51eb234512a9c82bcd60afc93c022a9aae370739984d1b26f607 SHA512 a57c453c1607e03521deebbe7ff3ec55cc214015b7afb69e39b66b2f82c7d51c73fe66a2ff36efd88d0248b5ca50e755c065e1a18e8a833373a9980a025fc017
+EBUILD acme-1.19.0.ebuild 1132 BLAKE2B c040463a55642cb2f08cd57c8dd7f8b2d338a785522b3aefb6f71f234d0800442c367ed545bb40b12eb82f0f43e8e26ba366d00f6e3bef8887e902b442cc8570 SHA512 3e75f147716119305b12826babb4431c467fd0bc285627e98ab3aa71008b7d70436cd6ca1cb595b5a8c743a07bea6d064024eba2ad0458486c94f8d2b18b0429
+EBUILD acme-9999.ebuild 1132 BLAKE2B c040463a55642cb2f08cd57c8dd7f8b2d338a785522b3aefb6f71f234d0800442c367ed545bb40b12eb82f0f43e8e26ba366d00f6e3bef8887e902b442cc8570 SHA512 3e75f147716119305b12826babb4431c467fd0bc285627e98ab3aa71008b7d70436cd6ca1cb595b5a8c743a07bea6d064024eba2ad0458486c94f8d2b18b0429
 MISC metadata.xml 401 BLAKE2B 30a2ac1f03749a8e3bb98723c57f47ab6bcf7bfa58c2b6e21c309fae279feca0d3612df6c2a1dafaf27b4f0781c583a140322feac1a1cf2c13e50861cad129ea SHA512 d8e725b71ca81ce4ca6565ed58271b283c25394448f0f48f726f232122577c33d5b2d726e117419b2fae99f9dae29a8080bb9564eccbca13368c83988cf3da01
diff --git a/app-crypt/acme/acme-1.17.0.ebuild b/app-crypt/acme/acme-1.17.0.ebuild
deleted file mode 100644
index 37a6145366aa..000000000000
--- a/app-crypt/acme/acme-1.17.0.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=(python{3_7,3_8,3_9})
-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/certbot/certbot/archive/v${PV}.tar.gz -> certbot-${PV}.tar.gz"
-	KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
-	S=${WORKDIR}/certbot-${PV}/acme
-fi
-
-inherit distutils-r1
-
-DESCRIPTION="An implementation of the ACME protocol"
-HOMEPAGE="https://github.com/certbot/certbot https://letsencrypt.org/"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="doc test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=dev-python/cryptography-2.1.4[${PYTHON_USEDEP}]
-	>=dev-python/idna-2.0.0[${PYTHON_USEDEP}]
-	>=dev-python/josepy-1.1.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.10[${PYTHON_USEDEP}]
-	>=dev-python/requests-toolbelt-0.3.0[${PYTHON_USEDEP}]
-"
-DEPEND="
-	doc? (
-		dev-python/sphinx[${PYTHON_USEDEP}]
-		dev-python/sphinx_rtd_theme[${PYTHON_USEDEP}]
-	)
-	test? (
-		${RDEPEND}
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-		dev-python/pytest-xdist[${PYTHON_USEDEP}]
-	)
-"
-
-src_compile() {
-	python_foreach_impl run_in_build_dir default
-	distutils-r1_src_compile
-	if use doc ; then
-		cd docs || die
-		sphinx-build -b html -d _build/doctrees   . _build/html
-	fi
-}
-
-python_test() {
-	nosetests -w ${PN} || die
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( docs/_build/html/. )
-
-	distutils-r1_python_install_all
-}
diff --git a/app-crypt/acme/acme-1.19.0.ebuild b/app-crypt/acme/acme-1.19.0.ebuild
index 7c666ebed1ff..c3e47e636d10 100644
--- a/app-crypt/acme/acme-1.19.0.ebuild
+++ b/app-crypt/acme/acme-1.19.0.ebuild
@@ -14,7 +14,7 @@ if [[ ${PV} == 9999* ]]; then
 	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 ~x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
 	S=${WORKDIR}/certbot-${PV}/acme
 fi
 
diff --git a/app-crypt/acme/acme-9999.ebuild b/app-crypt/acme/acme-9999.ebuild
index 7c666ebed1ff..c3e47e636d10 100644
--- a/app-crypt/acme/acme-9999.ebuild
+++ b/app-crypt/acme/acme-9999.ebuild
@@ -14,7 +14,7 @@ if [[ ${PV} == 9999* ]]; then
 	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 ~x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
 	S=${WORKDIR}/certbot-${PV}/acme
 fi
 
diff --git a/app-crypt/certbot-apache/Manifest b/app-crypt/certbot-apache/Manifest
index 985fe637fefb..50cb37a084c0 100644
--- a/app-crypt/certbot-apache/Manifest
+++ b/app-crypt/certbot-apache/Manifest
@@ -1,7 +1,5 @@
-DIST certbot-1.17.0.tar.gz 1386471 BLAKE2B 26cf23c481cc67e1fa0f698dee83dd42b1d382814f10bdb4d2a459f1274f3d661d2a58815c30110701d46362c3fbaee9f57089a7eda1221c9b9dadb2c48dc79d SHA512 104deb8e6e804a3a3f50c730f00307aa39d9d42756f24be009fedc27c889c1575b456455ee11441e341025db6f528359e927a347554ebd57b64c39e789576eda
 DIST certbot-1.18.0.tar.gz 1332615 BLAKE2B eb086710b943893025d6e1091470ca02de074232372f4c9fa21fa83a347fe54df988b9553c8cf6afd6e166b8c464d595171984c984008a872e16c0179bb774b2 SHA512 94b16ba0586e0f5d3036280c68f9976c25889ca48fbbe7aded41f0d9feba2300a3f0ff8fe321b39d8642bcdd874c7332cf2acb3187b5869fe415831f58a75a7b
 DIST certbot-1.19.0.tar.gz 1338653 BLAKE2B b6ed909da2aed9853cf3dc6b936c513f33a127548ee30ac45a32a682141c5e4e79401ea328b7caf4e28d1d85aa2a9831e93deaa26c93216708a33be465dc8387 SHA512 2c1beb8c06299b9003fafd970cd3e977db85c4e84f1bf710166b7a99035b5c43a2a222d8d51513ac595255dd8eda02a1fb834c01ce68921927715c880052536e
-EBUILD certbot-apache-1.17.0.ebuild 915 BLAKE2B e6cfa64a1bfad2719088c2ff8355040b8a607833f3372deb7236a0660788a4a4f7957df10aea8c7d9fa82ffe47ccc2c68542b1724f07f9495299166b87a4cb51 SHA512 91c65759d818a7c8c279de035f8280dda7408d46108139e689038906e212628d4a69b7a427448fb36a726090e0aa0805043da8a78764f6e3b925f44e94a657ae
 EBUILD certbot-apache-1.18.0.ebuild 945 BLAKE2B 5ec08b80fcce13df8f20cc1d2710abac4a8ed4e0847682b287c374921d2b7d301b75f34bce9090057548f5b1630f605a62fc3ffcfee3f13dff3f860350e04728 SHA512 8af41c92c60da9608015574316a2b776a8893b97e731d0bd779b200a2051708d3e6b2b98a0f140ed1c725bf697d56001cf608d51b68916c6e5fe6f19c40fb09d
 EBUILD certbot-apache-1.19.0.ebuild 947 BLAKE2B 5da53f56cef939f37cefd63251b522b54c18e30db386a229413bcc3a02605984194d1ea4c5647fa895a9502d254fcb9b73f5575fb7096f31df51f1e0b17659a5 SHA512 79358b1fe949ee2302a2db4c72b55bce960b0ba9aafff3cc50ee86e886c80a1337f086166646cb7f9e1baa8ead34dd43188feb53516321acd297e55a7475535b
 EBUILD certbot-apache-9999.ebuild 947 BLAKE2B 5da53f56cef939f37cefd63251b522b54c18e30db386a229413bcc3a02605984194d1ea4c5647fa895a9502d254fcb9b73f5575fb7096f31df51f1e0b17659a5 SHA512 79358b1fe949ee2302a2db4c72b55bce960b0ba9aafff3cc50ee86e886c80a1337f086166646cb7f9e1baa8ead34dd43188feb53516321acd297e55a7475535b
diff --git a/app-crypt/certbot-apache/certbot-apache-1.17.0.ebuild b/app-crypt/certbot-apache/certbot-apache-1.17.0.ebuild
deleted file mode 100644
index 0ef28b9c4132..000000000000
--- a/app-crypt/certbot-apache/certbot-apache-1.17.0.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=(python{3_7,3_8,3_9})
-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}]"
diff --git a/app-crypt/certbot-nginx/Manifest b/app-crypt/certbot-nginx/Manifest
index a77c4247f529..8e9d164edf38 100644
--- a/app-crypt/certbot-nginx/Manifest
+++ b/app-crypt/certbot-nginx/Manifest
@@ -1,7 +1,5 @@
-DIST certbot-1.17.0.tar.gz 1386471 BLAKE2B 26cf23c481cc67e1fa0f698dee83dd42b1d382814f10bdb4d2a459f1274f3d661d2a58815c30110701d46362c3fbaee9f57089a7eda1221c9b9dadb2c48dc79d SHA512 104deb8e6e804a3a3f50c730f00307aa39d9d42756f24be009fedc27c889c1575b456455ee11441e341025db6f528359e927a347554ebd57b64c39e789576eda
 DIST certbot-1.18.0.tar.gz 1332615 BLAKE2B eb086710b943893025d6e1091470ca02de074232372f4c9fa21fa83a347fe54df988b9553c8cf6afd6e166b8c464d595171984c984008a872e16c0179bb774b2 SHA512 94b16ba0586e0f5d3036280c68f9976c25889ca48fbbe7aded41f0d9feba2300a3f0ff8fe321b39d8642bcdd874c7332cf2acb3187b5869fe415831f58a75a7b
 DIST certbot-1.19.0.tar.gz 1338653 BLAKE2B b6ed909da2aed9853cf3dc6b936c513f33a127548ee30ac45a32a682141c5e4e79401ea328b7caf4e28d1d85aa2a9831e93deaa26c93216708a33be465dc8387 SHA512 2c1beb8c06299b9003fafd970cd3e977db85c4e84f1bf710166b7a99035b5c43a2a222d8d51513ac595255dd8eda02a1fb834c01ce68921927715c880052536e
-EBUILD certbot-nginx-1.17.0.ebuild 933 BLAKE2B 019025bd57899cca498bc2011e4d4822a0aafe94b974cc785eb8c770b6a7b00c19f9891f5ed890046467d6ebb31fd1f9b1452b63c2e2c6eb7cd09db318a282f4 SHA512 57f1466ad320578076f5ab974d92791fed4c2469df0c91ca21b649ea86ed0dc6ab9caf5c0db7d669944e893e40f2fbef33eb42a1addf7d11cac310616cabd2c2
 EBUILD certbot-nginx-1.18.0.ebuild 962 BLAKE2B d395edd7714ead5647918d5e413b61e4c9a4a9fa363504c204250b511e92d35ac032816892f97322ac1c1f99b9c446c2b5abccb9d341193a0e6bacea84d887ed SHA512 cfc5b873c74156fe3d8843a6dcbd3084af86778b4d66c26bae0d1ba6f5c22ca147b79098cc4ffb40986bc6f38cca0475682b15669940c88f01be8f535a26d8dc
 EBUILD certbot-nginx-1.19.0.ebuild 964 BLAKE2B 7c84e63e0f822a1c3f6db07b53f7f7c00a66e2d0f37d5cd2eaf3042710c3184074709a24d7fbf0af88a5802957212304c4dce35bf4466b7a6959a20c4ef6e89f SHA512 a4606d2e422a002e04b15c22d7d111b04e12e6ebdcc17afbc24322d6786e82a9a999370c68e26f50a0dba1056e5f9e61f84f3c03a524cd1e55f35c0d2e43375a
 EBUILD certbot-nginx-9999.ebuild 964 BLAKE2B 7c84e63e0f822a1c3f6db07b53f7f7c00a66e2d0f37d5cd2eaf3042710c3184074709a24d7fbf0af88a5802957212304c4dce35bf4466b7a6959a20c4ef6e89f SHA512 a4606d2e422a002e04b15c22d7d111b04e12e6ebdcc17afbc24322d6786e82a9a999370c68e26f50a0dba1056e5f9e61f84f3c03a524cd1e55f35c0d2e43375a
diff --git a/app-crypt/certbot-nginx/certbot-nginx-1.17.0.ebuild b/app-crypt/certbot-nginx/certbot-nginx-1.17.0.ebuild
deleted file mode 100644
index 8aeb6ce5d52e..000000000000
--- a/app-crypt/certbot-nginx/certbot-nginx-1.17.0.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=(python{3_7,3_8,3_9})
-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}]"
diff --git a/app-crypt/certbot/Manifest b/app-crypt/certbot/Manifest
index 6a769e23961a..ce9a13876033 100644
--- a/app-crypt/certbot/Manifest
+++ b/app-crypt/certbot/Manifest
@@ -1,8 +1,6 @@
-DIST certbot-1.17.0.tar.gz 1386471 BLAKE2B 26cf23c481cc67e1fa0f698dee83dd42b1d382814f10bdb4d2a459f1274f3d661d2a58815c30110701d46362c3fbaee9f57089a7eda1221c9b9dadb2c48dc79d SHA512 104deb8e6e804a3a3f50c730f00307aa39d9d42756f24be009fedc27c889c1575b456455ee11441e341025db6f528359e927a347554ebd57b64c39e789576eda
 DIST certbot-1.18.0.tar.gz 1332615 BLAKE2B eb086710b943893025d6e1091470ca02de074232372f4c9fa21fa83a347fe54df988b9553c8cf6afd6e166b8c464d595171984c984008a872e16c0179bb774b2 SHA512 94b16ba0586e0f5d3036280c68f9976c25889ca48fbbe7aded41f0d9feba2300a3f0ff8fe321b39d8642bcdd874c7332cf2acb3187b5869fe415831f58a75a7b
 DIST certbot-1.19.0.tar.gz 1338653 BLAKE2B b6ed909da2aed9853cf3dc6b936c513f33a127548ee30ac45a32a682141c5e4e79401ea328b7caf4e28d1d85aa2a9831e93deaa26c93216708a33be465dc8387 SHA512 2c1beb8c06299b9003fafd970cd3e977db85c4e84f1bf710166b7a99035b5c43a2a222d8d51513ac595255dd8eda02a1fb834c01ce68921927715c880052536e
-EBUILD certbot-1.17.0.ebuild 1150 BLAKE2B 3d12f9623927d69800604d841f3159d131160be4d80bd1ff44242164c813600a117778c22f6bad056ff22412897a7449444d6cd685123ab390afb7b75d2787b5 SHA512 4fae07647cb002f625e7fff6dae5d6a15bcaa9dbdf3de847c1f8dc8cb6e4b5e2f64369967f0955ab10451921e0c200504478956fd7903ed32fbb04978bc4ba2e
 EBUILD certbot-1.18.0.ebuild 1180 BLAKE2B 55c9e5b606cd2d9e569483cc6d5e9ed558654685c30186dff79b38c0de8f449d16cf8b50151b0edee8343a8840e390019b75523be78f5db085914bc22bab57b4 SHA512 8299e5833351978765b9fc49dfb9f0434882a14d82ece0b21104ecdcd5d2e501d9c2407d0792ed1a9a3e26b56da0488c6d28603f9d85616296c50e0105b0d2e6
-EBUILD certbot-1.19.0.ebuild 1182 BLAKE2B aaf65eef4c2301c3baba82173d1bfc7018dd03b65bcc33cf39e095e440e11a30d43acd6adeed316c51955330862228d9fc97c8d14505b806d1b1d229ee7f1afc SHA512 0dd7a05c32cd9da5cc43888a32031166cdf316a93bbe4a4ca71963d4a0962acabaae7ae73655b4b5303ff99ca6f465211a0354bed3a7ee047cdff80594b01a13
-EBUILD certbot-9999.ebuild 1182 BLAKE2B aaf65eef4c2301c3baba82173d1bfc7018dd03b65bcc33cf39e095e440e11a30d43acd6adeed316c51955330862228d9fc97c8d14505b806d1b1d229ee7f1afc SHA512 0dd7a05c32cd9da5cc43888a32031166cdf316a93bbe4a4ca71963d4a0962acabaae7ae73655b4b5303ff99ca6f465211a0354bed3a7ee047cdff80594b01a13
+EBUILD certbot-1.19.0.ebuild 1189 BLAKE2B 2bf07d3f5ce29a1d6fa94feac130e9b6826a5168762919953ff7496158103289a75f271c104774c6c9927750bcf126d40c3def6ade3bf15b108d4615b8e38e44 SHA512 2c6b143f928639c81cbd3d3d1b260a9231f75755ad10b470cd7e28b0f982094026f31ad75402f7e3aa20891448233751fb97b3185f79707d96f582c1b93d52ac
+EBUILD certbot-9999.ebuild 1189 BLAKE2B 2bf07d3f5ce29a1d6fa94feac130e9b6826a5168762919953ff7496158103289a75f271c104774c6c9927750bcf126d40c3def6ade3bf15b108d4615b8e38e44 SHA512 2c6b143f928639c81cbd3d3d1b260a9231f75755ad10b470cd7e28b0f982094026f31ad75402f7e3aa20891448233751fb97b3185f79707d96f582c1b93d52ac
 MISC metadata.xml 359 BLAKE2B 7f8ac46ecea304579baca80978cc35905720d1950caa183b5b5b297afab8bf6ea328324bacc438e9ecd91176230e42e55deda1c15e1ba73c63b2021ac2842c0f SHA512 a50b1db5a30eac290ac6645fcb30b0d5c4d8e51d83cff284e76358ee4fe7cef9366e40b06f532ba64a2131672972ea10b73541a9bd42cc323c17f6d26f6b0197
diff --git a/app-crypt/certbot/certbot-1.17.0.ebuild b/app-crypt/certbot/certbot-1.17.0.ebuild
deleted file mode 100644
index a2ad43b5a62c..000000000000
--- a/app-crypt/certbot/certbot-1.17.0.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=(python{3_7,3_8,3_9})
-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 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.8[${PYTHON_USEDEP}]
-	>=dev-python/distro-1.0.1[${PYTHON_USEDEP}]
-	>=dev-python/josepy-1.1.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}]"
diff --git a/app-crypt/certbot/certbot-1.19.0.ebuild b/app-crypt/certbot/certbot-1.19.0.ebuild
index d1f283af9bb4..4c776f1113cc 100644
--- a/app-crypt/certbot/certbot-1.19.0.ebuild
+++ b/app-crypt/certbot/certbot-1.19.0.ebuild
@@ -11,7 +11,7 @@ if [[ ${PV} == 9999* ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
 fi
 S=${WORKDIR}/${P}/${PN}
 
diff --git a/app-crypt/certbot/certbot-9999.ebuild b/app-crypt/certbot/certbot-9999.ebuild
index d1f283af9bb4..4c776f1113cc 100644
--- a/app-crypt/certbot/certbot-9999.ebuild
+++ b/app-crypt/certbot/certbot-9999.ebuild
@@ -11,7 +11,7 @@ if [[ ${PV} == 9999* ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
 fi
 S=${WORKDIR}/${P}/${PN}
 
diff --git a/app-crypt/efitools/Manifest b/app-crypt/efitools/Manifest
index 948fa024336a..4dc311aa06b3 100644
--- a/app-crypt/efitools/Manifest
+++ b/app-crypt/efitools/Manifest
@@ -1,6 +1,7 @@
 AUX 1.7.0-Make.rules.patch 296 BLAKE2B ca12dbe2f0bb60cffcbe2646a99f421e1f7f9d3b9eab0c96481cbbcfe064efc81afb25e8819746051e3f47b325eb97d213b7ebf95df60a195a5d16d68332f42d SHA512 a8d6245b09e80e2c9082589e62c2687234ee7838d19255e07aadfd05ddffdb1817e38eac434e71d5f0e19b7f9a88a51126349ae4aa324a634769050dbf433f0d
+AUX 1.8.1-respect-ar.patch 634 BLAKE2B a75d716b2f16f9c64e0a99fb91eda15a1009cd29576fbaf70d02b6565a6374647e924a964b607832ef122f003871578eff7dfac8b30deaaf292527cf24506b58 SHA512 4bfa8347a5e6965971320fd7fbbb1b8b8a57ac4aa186bf0ee1264190fefc34fee00bf40cec094763ee1d3adfc2c9d121de7832ce735734f442836941d2bd070c
 DIST efitools-1.8.1.tar.gz 115319 BLAKE2B 3aad65defc203055122027cc3a48f50912d2f08b592841780fdc1bf337d75774116e698c4270865275ce7fe64988cd84105138ca979d81818f0065d7ae90f1d0 SHA512 114ef8e52160f5a5239ec306dbd587610849bce771ba8145ed092afd79e44f3ecee93cc1d97e2d5fdb880cc825bbbe928b3ef6701fd3b1fa444053894be1098a
 DIST efitools-1.9.2.tar.gz 116037 BLAKE2B b3540932eb112e362fd0eed47090360603807dcaec8c6a10058618f8252eeb5dcbbd703d313cb6fadae62c1312815080cf2c77fc86f9dfc9f9afca24ad97f584 SHA512 77e0ad7e865814ed388ff6daabe0f4b49ba51672bf2cbb98b7905e209cbd28f9ede2f73213ce45af8a978c1e67dba24ec88a1188661317cc22317b47e575cde8
-EBUILD efitools-1.8.1.ebuild 1221 BLAKE2B 5de949efc7615fb61d26dc892b2aef1f74fe6b0d7073cbaf88f870139cec0b1d1e951112a33ce3e379f1f4f90bc2553947e37bfe52bd3548cba99ad8c205ea26 SHA512 54f49ec77e7de52c0b246675a1456170a660d7df5c91bfb67ca141c5660faa2b58950acbccc048d51185fa1cd5a4d3b3b0146368674d4fcd924b01edf9f4cdaa
-EBUILD efitools-1.9.2.ebuild 1333 BLAKE2B faf93582b00832f2b9745c8631b2b20b2e42aae9e9d07850425400d137e288c639612039780c1da8d192564d4d1b50fd20534f4f543b164d4001fd68671e9279 SHA512 7216fddf9b466951fdb7e77589697ea6371ff7f8dfab7ad509f0808716310dc2a43022a20e43d25fe2fbd15c06564500d4c7e554709068346069cf5dbf81d80a
+EBUILD efitools-1.8.1.ebuild 1259 BLAKE2B e71109957eb391a0a8e5915cd834f38a149c27f3a72602ebf1fe04110b9778b18a38d0d7d439ec7ae04410b1a232a7fc7ee7e53d71a5f75360d617865194ec86 SHA512 69f08f7a557875ae331f69891208d9a800df6c5bad02eac9764c79eb5e665d1eb060b208bee5db128259297e7229265f153019508388b28d8659d98bdd9f9880
+EBUILD efitools-1.9.2.ebuild 1371 BLAKE2B 3b6365e47baea942517f9a607ada4b332ad1a305bda1a6e160e2a9a86b04b1f622f060ec34a0f296138c9b312bc984155c6103eb9f953389d0021c0ed742a78e SHA512 b5509e5b8bc324d493d47d62685be8079ed940da0ed27ced73644351a57d4ec17df0b6247dffea03dd675a9c1202f89104c8625f0de8a126fcadae5972faaf23
 MISC metadata.xml 218 BLAKE2B e650ab1b6c50b385efc18a924f5382ef66cd5669e4c138270215328e5b595a45b519dc48925a76e824ba834e159865adbb131c0b7e166c2ffaf91d3c63b76163 SHA512 79219cfff4bf8680335548005e5f1f64270e1dcbabb2700b033e355fa65f0a5aefb0eaec20fbe231fc4525a7511693b84c0d957452fc9aa39e4ab31a1e1e56eb
diff --git a/app-crypt/efitools/efitools-1.8.1.ebuild b/app-crypt/efitools/efitools-1.8.1.ebuild
index 3d0ff6e70f24..ebac350dbca7 100644
--- a/app-crypt/efitools/efitools-1.8.1.ebuild
+++ b/app-crypt/efitools/efitools-1.8.1.ebuild
@@ -29,6 +29,7 @@ DEPEND="${RDEPEND}
 
 PATCHES=(
 	"${FILESDIR}/1.7.0-Make.rules.patch"
+	"${FILESDIR}/1.8.1-respect-ar.patch"
 )
 
 src_prepare() {
diff --git a/app-crypt/efitools/efitools-1.9.2.ebuild b/app-crypt/efitools/efitools-1.9.2.ebuild
index 2f10592f3b1c..ac731ef3bd03 100644
--- a/app-crypt/efitools/efitools-1.9.2.ebuild
+++ b/app-crypt/efitools/efitools-1.9.2.ebuild
@@ -29,6 +29,7 @@ DEPEND="${RDEPEND}
 
 PATCHES=(
 	"${FILESDIR}/1.7.0-Make.rules.patch"
+	"${FILESDIR}/1.8.1-respect-ar.patch"
 )
 
 src_prepare() {
diff --git a/app-crypt/efitools/files/1.8.1-respect-ar.patch b/app-crypt/efitools/files/1.8.1-respect-ar.patch
new file mode 100644
index 000000000000..36e6620119f3
--- /dev/null
+++ b/app-crypt/efitools/files/1.8.1-respect-ar.patch
@@ -0,0 +1,25 @@
+From 81503d7a43b99c036758d05c1794502c09189fa4 Mon Sep 17 00:00:00 2001
+From: Matthias Maier <tamiko@43-1.org>
+Date: Tue, 5 Oct 2021 22:27:52 -0500
+Subject: [PATCH] Do not use ar directly
+
+---
+ Make.rules | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/Make.rules b/Make.rules
+index e46d407..767070d 100644
+--- a/Make.rules
++++ b/Make.rules
+@@ -129,7 +129,7 @@ getvar = $(shell if [ "$(1)" = "PK" -o "$(1)" = "KEK" ]; then echo $(1); else ec
+ #	sbsign --key KEK.key --cert KEK.crt --output $@ $<
+ 
+ %.a:
+-	ar rcv $@ $^
++	$(AR) rcv $@ $^
+ 
+ doc/%.1: doc/%.1.in %
+ 	$(HELP2MAN) --no-info -i $< -o $@ ./$*
+-- 
+2.32.0
+
diff --git a/app-crypt/gnupg/Manifest b/app-crypt/gnupg/Manifest
index 5b208e6df328..0f6951619d5f 100644
--- a/app-crypt/gnupg/Manifest
+++ b/app-crypt/gnupg/Manifest
@@ -3,9 +3,11 @@ DIST gnupg-2.2.16-scdaemon_shared-access.patch 2586 BLAKE2B 42fd5482c4e86751ce62
 DIST gnupg-2.2.27.tar.bz2 7191555 BLAKE2B d652aad382cf07cc458b29ff82718edd47457d8236dcbeee51f22d88503be141f009e9ea45b6dafe614115d9558fe371509579e58ce17a5f04540a31aa406ea3 SHA512 cf336962116c9c08ac80b1299654b94948033ef51d6d5e7f54c2f07bbf7d92c7b0bddb606ceee2cdd837063f519b8d59af5a82816b840a0fc47d90c07b0e95ab
 DIST gnupg-2.2.29.tar.bz2 7215986 BLAKE2B 04b777730b8fcbe8d93dfc8985aadd6bc7385ac2ac9684e6248cb3ae6d008daae5aa976ffa3bae27fe9e89bc2c4c1d4ae81dcaa259fb08d13f894f00f12072e9 SHA512 12645e230fc6aa4811420ef33def6baa590e847ecdf7e5f8b96eb49122e6406cbdba4595d0b52fa26700d5d5def67acb4ed7dfe7f778e496d4d21ccbef3c476b
 DIST gnupg-2.2.31.tar.bz2 7212188 BLAKE2B 57a2b6c6ea491137a708e18a0119502621b7bdf0591818d19beb8b08a521a7dbf60472243e1723f53acbfb9a5de612b8e5040c45dc847bdda26012244edb11be SHA512 2f6fa200e08d6b8993b482e5825bea6083afc8686c4e1ae80386b36ae49e1c2d73066c508edaa359a7794cb26ba7a00f81555a906fa422d1117e41415cfa2fea
+DIST gnupg-2.2.32.tar.bz2 7212625 BLAKE2B 8e1feba83a0d8fa1c154c814e26b41aa252cef4af53937e4e8954860249c180c1d6910356b0c46dfefde094846b02bd5375f17c8b6fdcc9138281d0daa292d42 SHA512 76b75d3688561ce65a8014812656aa87c9722c898d7e186fdb1331dee6af32f886a6b0a4806975c348a22ad6dda60f956ece56076d00153b9706aad4c934c6a1
 DIST gnupg-2.3.2.tar.bz2 7589445 BLAKE2B f7e35ed553ea89cdb073abb1432f67fa00bb625f6e686e534f96bca11d88f09ea272b3cb0d6706e4bce2c023f8c5b8d628742aa2f60752a2e605132cd32f62ed SHA512 2747cbe38546f500d165f024ebb2dc5be70fa68d20702af3f61e97db685eba94caf65307293137c76ea6cfcc189ed24aaee025c80cd33f26609e5fe512bdda73
 EBUILD gnupg-2.2.27.ebuild 5168 BLAKE2B cc9ad82a855cb56a630aa043537fe44fadbfece92cc09205996ba4cc3f3ca000534f7b11c29da543ec923b118d24bc23b490ce6ea29b09a799d17b36e387f855 SHA512 3f1377ad593d19580e953ef426dd23f23ae2fab65d8e6bcfee58c09605086fc0a2f2d2432b5d33ed70685ebb87561801a6b3dbf781d585aa59b6e8c9fc0dd81e
-EBUILD gnupg-2.2.29.ebuild 4710 BLAKE2B b411b3ea5662dd4ca25387e1ad878db8feacd2833d95c3b8606824d660e0b4da82670ad62a547962e9325a035a9ca118eda29ad6a6730047d447cbd8f123448b SHA512 c2057f6f3af94a56ae06c6479b19fda8e43302b8426e72b76febe3b2414af29354390979dc4bee422dabd92dc5835392cdd83843377b35146015ec1a046bccb7
+EBUILD gnupg-2.2.29.ebuild 4709 BLAKE2B 709b2d1da7770181ce1c108c5f5afb668f46f3ac1673032c94eb41f24af6e78ab260180fad116aafd944336326d45d84388b48159518b776d3425cf40e07c605 SHA512 5617ad34369e42e934cb4704ce2c1191edb38eea902f2cdbe2494a27da86dbe92365c2dd836e24bae9aad2fb7d262df029a8fd5d1a5c0ab716f6d9918e8b04cc
 EBUILD gnupg-2.2.31.ebuild 4717 BLAKE2B cd39c581bf930c519e4f38fc0741d7c157ee44ebe6599253931e9a90f493cf28e06fac31a025a08b5958be04a0a92fa87bbc481153d746d4b8a194eb51d9377c SHA512 e3fe9d932a558b2e646b13fc98b429a6162d18f853481fe88218bde6b756a16eb8e24038860a2b8dd8922bb689e1c7b9df4855476315fd6fdf2249a169364a59
-EBUILD gnupg-2.3.2.ebuild 4752 BLAKE2B 65ecc00b22ad7b3df2f21f10c7c683f301207c64d2486cefe239e4bf97eff3f1d1eedda05a620ec681eaa13496f01f3031af71b3a999f56fec624db8829c4dc5 SHA512 01080e8bb522db5fa342a602ae51fdb4f72d95a6bffd1fc924adfc5d1360f8a4ddde9d8062838949100572032da3da87c69149398295d9134aa9b5636be02fbc
+EBUILD gnupg-2.2.32.ebuild 4712 BLAKE2B bb2e2463fb79fc39f06ff8c085caa4b80b2c70afecb24a446c78770732f7162daee4acdb57a8a45c94562b3225cd6d4a738dbc3754704e0e0c0fe3cb78e8371b SHA512 98d4559a461e4ccd9e52ce1bb847af09621407739b9e9e61cfbd8b78e59970426bfb97f2b224a09ff1cb992422a739daffca77a0eec6c2bdae9982cabbd4d3fd
+EBUILD gnupg-2.3.2.ebuild 4752 BLAKE2B 4014d0cbab030ecfeeaef7b80424bc47f3b7d6b1b8605b1fcbf3b73a691bb451190c99639ab06be148cddc7de41a38fe4f73f20e96f5d38cb3386e5dc6e06b38 SHA512 d393dac1af9a5a76e087a747ef809f24f47b6735bbc5c42e584e8a532ed2c53a1868dc467702f1ac7042ea1fba73389a2d7db9719f3270726943294ca34cb526
 MISC metadata.xml 1498 BLAKE2B aba846d09c0230ea7e10a5585068509c9f56575da979a85f84caf6244555609782381bb8beae68222a0ab71a0d820a4d4655ed3d9b1399cc259e400f29d8ab6b SHA512 1314093db4291b4230cdda07bdae9c30dbce8bb698a2afb236f6c657c636791c8e2a9d5a3fc488bffddbff25d307d0ba9d50c54551652dfd099e73e70811e859
diff --git a/app-crypt/gnupg/gnupg-2.2.29.ebuild b/app-crypt/gnupg/gnupg-2.2.29.ebuild
index 5a864898ea36..654d757e6632 100644
--- a/app-crypt/gnupg/gnupg-2.2.29.ebuild
+++ b/app-crypt/gnupg/gnupg-2.2.29.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://gnupg/gnupg/${MY_P}.tar.bz2"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="bzip2 doc ldap nls readline selinux +smartcard ssl tofu tools usb user-socket wks-server"
 
 # Existence of executables is checked during configuration.
diff --git a/app-crypt/gnupg/gnupg-2.2.32.ebuild b/app-crypt/gnupg/gnupg-2.2.32.ebuild
new file mode 100644
index 000000000000..69c41d5c42c8
--- /dev/null
+++ b/app-crypt/gnupg/gnupg-2.2.32.ebuild
@@ -0,0 +1,152 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit flag-o-matic systemd toolchain-funcs
+
+MY_P="${P/_/-}"
+
+DESCRIPTION="The GNU Privacy Guard, a GPL OpenPGP implementation"
+HOMEPAGE="https://gnupg.org/"
+SRC_URI="mirror://gnupg/gnupg/${MY_P}.tar.bz2"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="bzip2 doc ldap nls readline selinux +smartcard ssl tofu tools usb user-socket wks-server"
+
+# Existence of executables is checked during configuration.
+DEPEND=">=dev-libs/libassuan-2.5.0
+	>=dev-libs/libgcrypt-1.8.0:=
+	>=dev-libs/libgpg-error-1.29
+	>=dev-libs/libksba-1.3.4
+	>=dev-libs/npth-1.2
+	>=net-misc/curl-7.10
+	bzip2? ( app-arch/bzip2 )
+	ldap? ( net-nds/openldap )
+	readline? ( sys-libs/readline:0= )
+	smartcard? ( usb? ( virtual/libusb:1 ) )
+	ssl? ( >=net-libs/gnutls-3.0:0= )
+	sys-libs/zlib
+	tofu? ( >=dev-db/sqlite-3.7 )"
+
+RDEPEND="${DEPEND}
+	app-crypt/pinentry
+	nls? ( virtual/libintl )
+	selinux? ( sec-policy/selinux-gpg )
+	wks-server? ( virtual/mta )"
+
+BDEPEND="virtual/pkgconfig
+	doc? ( sys-apps/texinfo )
+	nls? ( sys-devel/gettext )"
+
+S="${WORKDIR}/${MY_P}"
+
+DOCS=(
+	ChangeLog NEWS README THANKS TODO VERSION
+	doc/FAQ doc/DETAILS doc/HACKING doc/TRANSLATE doc/OpenPGP doc/KEYSERVER
+)
+
+PATCHES=(
+	"${FILESDIR}/${PN}-2.1.20-gpgscm-Use-shorter-socket-path-lengts-to-improve-tes.patch"
+)
+
+src_prepare() {
+	default
+
+	# Inject SSH_AUTH_SOCK into user's sessions after enabling gpg-agent-ssh.socket in systemctl --user mode,
+	# idea borrowed from libdbus, see
+	#   https://gitlab.freedesktop.org/dbus/dbus/-/blob/master/bus/systemd-user/dbus.socket.in#L6
+	#
+	# This cannot be upstreamed, as it requires determining the exact prefix of 'systemctl',
+	# which in turn requires discovery in Autoconf, something that upstream deeply resents.
+	sed -e "/DirectoryMode=/a ExecStartPost=-${EPREFIX}/bin/systemctl --user set-environment SSH_AUTH_SOCK=%t/gnupg/S.gpg-agent.ssh" \
+		-i doc/examples/systemd-user/gpg-agent-ssh.socket || die
+}
+
+src_configure() {
+	local myconf=(
+		$(use_enable bzip2)
+		$(use_enable nls)
+		$(use_enable smartcard scdaemon)
+		$(use_enable ssl gnutls)
+		$(use_enable tofu)
+		$(use smartcard && use_enable usb ccid-driver || echo '--disable-ccid-driver')
+		$(use_enable wks-server wks-tools)
+		$(use_with ldap)
+		$(use_with readline)
+		--with-mailprog=/usr/libexec/sendmail
+		--disable-ntbtls
+		--enable-all-tests
+		--enable-gpg
+		--enable-gpgsm
+		--enable-large-secmem
+		CC_FOR_BUILD="$(tc-getBUILD_CC)"
+		GPG_ERROR_CONFIG="${ESYSROOT}/usr/bin/${CHOST}-gpg-error-config"
+		KSBA_CONFIG="${ESYSROOT}/usr/bin/ksba-config"
+		LIBASSUAN_CONFIG="${ESYSROOT}/usr/bin/libassuan-config"
+		LIBGCRYPT_CONFIG="${ESYSROOT}/usr/bin/${CHOST}-libgcrypt-config"
+		NPTH_CONFIG="${ESYSROOT}/usr/bin/npth-config"
+		$("${S}/configure" --help | grep -o -- '--without-.*-prefix')
+	)
+
+	if use prefix && use usb; then
+		# bug #649598
+		append-cppflags -I"${EPREFIX}/usr/include/libusb-1.0"
+	fi
+
+	#bug 663142
+	if use user-socket; then
+		myconf+=( --enable-run-gnupg-user-socket )
+	fi
+
+	# glib fails and picks up clang's internal stdint.h causing weird errors
+	[[ ${CC} == *clang ]] && \
+		export gl_cv_absolute_stdint_h=/usr/include/stdint.h
+
+	# Hardcode mailprog to /usr/libexec/sendmail even if it does not exist.
+	# As of GnuPG 2.3, the mailprog substitution is used for the binary called
+	# by wks-client & wks-server; and if it's autodetected but not not exist at
+	# build time, then then 'gpg-wks-client --send' functionality will not
+	# work. This has an unwanted side-effect in stage3 builds: there was a
+	# [R]DEPEND on virtual/mta, which also brought in virtual/logger, bloating
+	# the build where the install guide previously make the user chose the
+	# logger & mta early in the install.
+
+	econf "${myconf[@]}"
+}
+
+src_compile() {
+	default
+
+	use doc && emake -C doc html
+}
+
+src_test() {
+	#Bug: 638574
+	use tofu && export TESTFLAGS=--parallel
+	default
+}
+
+src_install() {
+	default
+
+	use tools &&
+		dobin \
+			tools/{convert-from-106,gpg-check-pattern} \
+			tools/{gpg-zip,gpgconf,gpgsplit,lspgpot,mail-signed-keys} \
+			tools/make-dns-cert
+
+	dosym gpg /usr/bin/gpg2
+	dosym gpgv /usr/bin/gpgv2
+	echo ".so man1/gpg.1" > "${ED}"/usr/share/man/man1/gpg2.1 || die
+	echo ".so man1/gpgv.1" > "${ED}"/usr/share/man/man1/gpgv2.1 || die
+
+	dodir /etc/env.d
+	echo "CONFIG_PROTECT=/usr/share/gnupg/qualified.txt" >> "${ED}"/etc/env.d/30gnupg || die
+
+	use doc && dodoc doc/gnupg.html/* doc/*.png
+
+	systemd_douserunit doc/examples/systemd-user/*.{service,socket}
+}
diff --git a/app-crypt/gnupg/gnupg-2.3.2.ebuild b/app-crypt/gnupg/gnupg-2.3.2.ebuild
index 9e1c1de7266c..0c66be6c9fd2 100644
--- a/app-crypt/gnupg/gnupg-2.3.2.ebuild
+++ b/app-crypt/gnupg/gnupg-2.3.2.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=8
+EAPI=7
 
 inherit flag-o-matic systemd toolchain-funcs
 
diff --git a/app-crypt/jitterentropy-rngd/Manifest b/app-crypt/jitterentropy-rngd/Manifest
index b4e557e526f4..d876954e548f 100644
--- a/app-crypt/jitterentropy-rngd/Manifest
+++ b/app-crypt/jitterentropy-rngd/Manifest
@@ -1,7 +1,5 @@
 AUX jitterentropy-rngd-1.1.0-do-not-strip-and-compress.patch 581 BLAKE2B ee6f98d762fea06504ea7157ea2b13ececeaef1ee204cf0e5d63fc0932e1c41da13b2a8ad0cb8564548fcabe1989693ed16c7d461f75844323864e457e8fb804 SHA512 7c42e8deebf0d36fdd91b879cbc28eab1a92d413f64ab5f19eeaa214b51f6e96866c1bd53fdd6c2c4e335ae156cef24d2bba4c1dd6b557d96e89b61618703241
 AUX jitterentropy-rngd-initd 338 BLAKE2B a717848317980f0376058c04f53cfc7ac4e771ffbd926b36f2f5e18e121d846aa9248b38cfae7d1c6e4c2241e0c1124394d9b5b58d2d119bf455d0d8786e74df SHA512 1993262b47e703514bba9a4dff18e58ff70b6b109a2eb3097b0231467ea7f948c6fb6d0f695988de6c2d41fa2295a8a40af19124572b8e72fe09610eaf8caa39
-DIST jitterentropy-rngd-1.1.0.tar.gz 25891 BLAKE2B f711b173c68b74cbc0dbac1ae1b7a2beb5352b38e411f96172aa36ac7f720f05469f5fac2fa97b3514ec11fbe2ccfe0351ee7df8f51a8b36a566635ef93e4d08 SHA512 32835475b604e502caaab9b0d1cd9fe2920c126a27841669f6cf9c717094bfd4c11feab0f9f706ee4cf4caeedf26ced7039075499a3faaf41830c72968544646
-DIST jitterentropy-rngd-1.2.2.tar.gz 35773 BLAKE2B 5b1987108beb5db7a456f1216173598c893b1c845dfaa7594854a82257e88adda01e2bb4160b70f2605aff519b7d1ba79bcea94dda34c2fc75e412e0a031b943 SHA512 c317cfb77910b6983da7bf0733c26f28260da746b917cde59a9cdb023b95cf727cf729dd7de27c8cc308b1958ca054114d01ad7dfb9bd211c241a95b7bed83c6
-EBUILD jitterentropy-rngd-1.1.0.ebuild 605 BLAKE2B 04c2f307c31d2b26befd16f5e39d81445ae958fe7c5003363210ec25d5f00a87f0aef27f66757274f181b8303b649bf71dd0511c56eeb055bebdc94853b96d70 SHA512 7c4d42890396959d69ae8a215e9bf23ba2546655814baa7830b444208e7067fcd481cd7f3fae64b67551f457ef7fac8180e65436e44502b31be903a5599f7b4f
-EBUILD jitterentropy-rngd-1.2.2.ebuild 699 BLAKE2B 89349823ec63727a4822165659771c0b6c2fc8fa89bbf6f4d7be315a317278ecaaf3e82c855dcde58ba22e523f62d2415ee5b3de074fa9d6173def10cb68dff8 SHA512 27d875211941fcd597ad5ee78a643b4a633caab9b3ccfe61ffdd241835cc05339b171d5a1c51464adf4bcfd63aaf49d437644af629c6c2829bee500c3ff00ea6
+DIST jitterentropy-rngd-1.2.5.tar.gz 45262 BLAKE2B 0fdbd513f0dd2fa216c079d55790ea2848fac26ca17846cfce06d0d338e8e88a13f2e9a7a7d55c938f0366f7cb010d22fc35d63921e4bb1408a5bda73ac9e96c SHA512 23079ff64e1145efa22960dfa772f77dd27f45f1cd950fe7b3a45d56cb75920902a7136da92a7202c686f33db0895115624ac3d809627378056ca13250e5b07b
+EBUILD jitterentropy-rngd-1.2.5.ebuild 699 BLAKE2B 89349823ec63727a4822165659771c0b6c2fc8fa89bbf6f4d7be315a317278ecaaf3e82c855dcde58ba22e523f62d2415ee5b3de074fa9d6173def10cb68dff8 SHA512 27d875211941fcd597ad5ee78a643b4a633caab9b3ccfe61ffdd241835cc05339b171d5a1c51464adf4bcfd63aaf49d437644af629c6c2829bee500c3ff00ea6
 MISC metadata.xml 599 BLAKE2B 4d51b86a06b56fa5ab530fdeeac4ab0e8e127afa844b64265c159ee839c3b0bc7470c5e7390b7cf88c8a89f78612e18aeec34a04791186b37eeaf76cbf7f124a SHA512 60b241303e2960e8b9a5d097771a87174d46c089770ba37ad5e8dfe764858f2e7b7f5cf71156efac25380ee8727af5f73a0eb6c69a4a0086b913c48f5dd4f280
diff --git a/app-crypt/jitterentropy-rngd/jitterentropy-rngd-1.1.0.ebuild b/app-crypt/jitterentropy-rngd/jitterentropy-rngd-1.1.0.ebuild
deleted file mode 100644
index 1bfdd410b06d..000000000000
--- a/app-crypt/jitterentropy-rngd/jitterentropy-rngd-1.1.0.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit linux-info systemd
-
-DESCRIPTION="Jitter RNG daemon"
-HOMEPAGE="https://www.chronox.de/jent.html"
-SRC_URI="https://github.com/smuellerDD/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~mips ~x86"
-IUSE=""
-
-PATCHES=(
-	"${FILESDIR}"/${P}-do-not-strip-and-compress.patch
-)
-
-src_install() {
-	emake DESTDIR="${D}" PREFIX="${EPREFIX}/usr" \
-		UNITDIR="$(systemd_get_systemunitdir)" install
-	newinitd "${FILESDIR}"/jitterentropy-rngd-initd jitterentropy-rngd
-}
diff --git a/app-crypt/jitterentropy-rngd/jitterentropy-rngd-1.2.2.ebuild b/app-crypt/jitterentropy-rngd/jitterentropy-rngd-1.2.5.ebuild
index 653e5d0a9589..653e5d0a9589 100644
--- a/app-crypt/jitterentropy-rngd/jitterentropy-rngd-1.2.2.ebuild
+++ b/app-crypt/jitterentropy-rngd/jitterentropy-rngd-1.2.5.ebuild
diff --git a/app-crypt/libmd/Manifest b/app-crypt/libmd/Manifest
index 1f36f0cc5e3c..a5fd0abec44a 100644
--- a/app-crypt/libmd/Manifest
+++ b/app-crypt/libmd/Manifest
@@ -1,5 +1,7 @@
 AUX libmd-1.0.3-out-of-source.patch 1147 BLAKE2B f255a1367f89912ba81c69e3e813acc48bcfea1406389ef40087308fa762dfbb524becf16138d4e243864991791b1f3601edb7d1fb6a51e7ad77cc768de5a213 SHA512 894413794c3e6523bb23bbc983d1489391b14e5bb08428d7dcd874060d5c64490d239b983eb8f291d8e98e76ed26548252cbd10ae74d28fa4cace82fb100290a
 DIST libmd-1.0.3.tar.xz 258584 BLAKE2B 35b732800a4b0a7b8d0a88eeff5e7e80fe55ab5ed05b7a7a1ffe866e156cc6dc6daca95f865a56297857b10b1bdfc9815b5bf0b198e8284f217498265c08fcc9 SHA512 f4b5a86bea7b9fac9f7f173032ee436d1e7141f760c1a114a785d31644edbf6802fe8193cc4cf3b5c66d38963be919c05055780bdf6bf5a47927690490ff5966
+DIST libmd-1.0.4.tar.xz 264472 BLAKE2B ddc2da74635f5cc009c66a58ae82b83e6e0930e18af8a6b0ecec7cbf378246707b493a99fb97d3491d0d626a0d5ef068baea6a3ba2ec311c5a1516ba5b4e2fd5 SHA512 731553ecc5e0e1eb228cced8fccd531fe31fb5c7627ca30013d287e1aeb8222959cf7498fbb7414bbabb967b25d4e8b0edd54fc47f6ccf55fc91087db0725ce3
 EBUILD libmd-1.0.3-r2.ebuild 746 BLAKE2B 34cac3a544162234b7f24d277d8310004f324ba47842a3696c27f16266d56a11fb593259b0947293d1d2e7ae7b9c0a5d97afdcc26884199229a29010240c14bf SHA512 dd2e5f1efb04fe6fbd2c6ff1580ace52a66a894a1c0ca28a80201bd8b018f25cce0cc43858c41282877fb8382e7178abe69dab63328ebde14a9453cf4b199fc7
+EBUILD libmd-1.0.4.ebuild 651 BLAKE2B 1008fd79ceda82ed5defb9e2e6f216527940180c4a15041d48378752d952dc061735a976d6f49b402c73ac7e2b1b6843034562322ad5b9883cd4b709d6daed44 SHA512 14046069d447dd835add40b02563d9e58cb50be84436e53f9475f30836fdec0d6642c6cf3606bd08b08305463d5cbb538467961aecf4f123e2d505f259ae23cd
 EBUILD libmd-9999.ebuild 567 BLAKE2B c31c8d0780cd63516fae57497f80340712547fe78d17e16ad8d1c1f7320681ef914d0ffefc459593b2de6e0db054860296c72060bea33a4ef47de42dc3da8a14 SHA512 82345337a69a40c8f7199a3be295b18e530be415c712af1259b4e110f7cc80d50705559ad92ce0b7c001c8f6f95ad7d5fae3d09b3ec527a1b860e8577d078ed6
 MISC metadata.xml 167 BLAKE2B 868e3b584722eaacf68273db062bb773d8c7e5d7ab2b81ca7e8397643bf7cc106c3a1033594401c99c54f667bb45d6b73f9048fc335580bbd44b4589ad26a832 SHA512 30caadd1496c3b9969136038239a1d8e01f236726b4022c2d7e19ca7575f25f735e556835e581afbf44fbd3e4104c40f2b5ef5fa70118d75c881fdf871962d0a
diff --git a/app-crypt/libmd/libmd-1.0.4.ebuild b/app-crypt/libmd/libmd-1.0.4.ebuild
new file mode 100644
index 000000000000..b6e1a48767c5
--- /dev/null
+++ b/app-crypt/libmd/libmd-1.0.4.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit multilib-minimal
+
+DESCRIPTION="Message Digest functions from BSD systems"
+HOMEPAGE="https://www.hadrons.org/software/libmd/"
+SRC_URI="https://archive.hadrons.org/software/libmd/${P}.tar.xz"
+
+LICENSE="|| ( BSD BSD-2 ISC BEER-WARE public-domain )"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+
+multilib_src_configure() {
+	ECONF_SOURCE="${S}" econf
+}
+
+multilib_src_install_all() {
+	einstalldocs
+	find "${ED}" -type f -name '*.la' -delete || die
+}
diff --git a/app-crypt/tpm2-tools/Manifest b/app-crypt/tpm2-tools/Manifest
index 68948400c880..cc01d183fece 100644
--- a/app-crypt/tpm2-tools/Manifest
+++ b/app-crypt/tpm2-tools/Manifest
@@ -1,8 +1,8 @@
 AUX tpm2-tools-4.3.0-Remove-WError.patch 360 BLAKE2B 440f48fca6e8aaf9b2c0fd094011738c467a22dc31bd94b53f6788b8fa52c00c5d7ebe074434be60b6370dcf1e94ee4d57bcfc93857fcf03dbdff30c8e157445 SHA512 0d246d1446b5b2ebca0e12467c746a731897311448840a7aac35b57d22edcdec0c9f424d1c95c9614d969a57dba458bbbad8826516cc05329b47d2dad05318fe
-AUX tpm2-tools-5.1.1-fix-tpm-checkquote.patch 1193 BLAKE2B d65717bc15b490c99123ad8022dace6b337b638b797d6f5b0aa783e04fd4f12f2f4281bcc5d53728a6b612c6106aa2ab1593bce9833fcd4109e94de1a1718135 SHA512 a38cdc124eaf1321d954dc969c3c5a409a90ee7d5d25eb0bb692b9a56f8340a6f783852e995a4e9790f5472c47d8475ad083b76015ccfddb7d74ea167cc54364
 AUX tpm2-tools-5.1.1-no-efivar-automagic.patch 1083 BLAKE2B 10a8299a28ee54339ac73692dc54475da3044d3afcfe570d6c72f5d8ace2bbf3faf5242002be02c4a765ba9b9c37ba9777d9b4b8bac416e6721d9b8660d19bf2 SHA512 4622e235ef5202cc3448fbc67f362ce36396ca04892c340f275f67c93d5bb2857a14094329ec499c4f7215ac10002b70d18cfc2bdef1474d93f556c5759383ae
+AUX tpm2-tools-5.2-testparms-fix-condition-for-negative-test.patch 1380 BLAKE2B ffbbe59cbfd4a411544ef7f03ed04c73afc774edebaa2da8deb11e7fe4f321b88b686d3138fd5524b2279407518dda32de0e1cb96a5517ba87f8cc8c9ddb2be5 SHA512 557ad07048e288a9611222b920e8c82fab9852dde04da2b57981cb04ce3bb9d4ea40c57ba24fb2b3dc09cacc16ef731d11428d0603d757f7f7adc2023c5ca779
 DIST tpm2-tools-4.3.2.tar.gz 887708 BLAKE2B ee6fe3d0566138d6289d1a91252ccb106d36ff80d55f2d6f9ee30c8e16338d706e80085ac5f4f56a79bcb339e5dcb240efcf71d4003bcffdad366f3cd7a1165b SHA512 1aa47c62c3d2a83195ec649e50c0be2c8be39f926806d8d7cb96edc499c385d527661813e02024e98f83ae9ebcb22d7dadc507ddfab48be9bbe428d9439d7ee1
-DIST tpm2-tools-5.1.1.tar.gz 1044427 BLAKE2B 885ff61ad971c95d067bf8f9339de289f082f3103d1c382f45ac3ffbd4d5effc343ddc3c2c74b97b9d31f3f823d264991d1726c1f9c21d5c9b82ac1cdf714d3f SHA512 4e094dcffb66103773d85e866ab9ba8db5d0f205ff9658e08fe14e8e41250570a7f7274b4048934adf256ea41650fa498fc3d6da2786adc241a4bf2e8f7bf78e
+DIST tpm2-tools-5.2.tar.gz 1072078 BLAKE2B 27d035e0f44029db57477a1fd10e1cee9b470ad54411297985cb7f33ba7bbb7a94ac392815e32287d69abf928dce0c361703542b812ae88b208ddca645bb3be2 SHA512 9fb5dc298717a8a57c89d286e3590370a096c81b14d2d8d4eb5fca140d66148a8e24727ee04fb02057bbfcc3ede50e93ba0ef22396888c9df48bf6f42a5d6e6b
 EBUILD tpm2-tools-4.3.2.ebuild 1052 BLAKE2B 7c6f919d4a43a7c990803e12b9f2233c018975c01fe792aa6ea49a944ec4865c57fb947803c8e4b3360fcd5933e24607b0750fe90cdc9272c261f579eecc8997 SHA512 ed36b9a1721c02268e5990b9d63721bbcf0c09eb2360e3dc02f295d83c01b2f98aeb306def7052a79de6b98e10c7edc1ec46aff2009e1babacdbc681a9e33dfd
-EBUILD tpm2-tools-5.1.1-r2.ebuild 1648 BLAKE2B 73ab30ec326263a71d298d5f88046ec3379e1bb4b13e4ebaeba67ebccb83cbd126103618dac1240db8c6562ede67bd8ebd52b27378e031c4afd831fe2c513f86 SHA512 6faf487b4da7b073d79ec59475f84e3e048302596ca97988c2ada9b26e8c7ac18b0699b456f56eed8ebaef6ae161afc76371f29be1ff235c4534a97fedb5289e
+EBUILD tpm2-tools-5.2.ebuild 1560 BLAKE2B 01459fa5e19f8b2e188ad22ab0d4b6baf011b678d1644d6bc567a3c330e9a807754764e96cae438e7d9a934b504e71b835985fdc580400c0f848409cac0d39dd SHA512 03e01d581da6fdd9a78d0a23bb4f9eca67088e983b53c31af9c97ecd015644464a2ae57cfb551b4f5180ab085dceff5744f61651689cd0e6fb88000f2a60a8a1
 MISC metadata.xml 560 BLAKE2B fe8daaba2a7586247537f8ed7b92769676b20f2c1377f7bb582dff49e06cf3f9beba4f79e28f10ea76d67d089eb152b060b091414dd9b47c5694ca153211421f SHA512 a744fcc50c7e44b1939190150404aee9054eab8e921e6f63cafa58dc80be5f20692632509de85399b6a9633701da72fd951e8bcfbe9e5177f315fa1dcbcc9ee5
diff --git a/app-crypt/tpm2-tools/files/tpm2-tools-5.1.1-fix-tpm-checkquote.patch b/app-crypt/tpm2-tools/files/tpm2-tools-5.1.1-fix-tpm-checkquote.patch
deleted file mode 100644
index 73fb0e3f487a..000000000000
--- a/app-crypt/tpm2-tools/files/tpm2-tools-5.1.1-fix-tpm-checkquote.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From 3d7edb1c70cba6c34c71c9b856c07b8adcebb15c Mon Sep 17 00:00:00 2001
-From: Alberto Planas <aplanas@suse.com>
-Date: Thu, 17 Jun 2021 11:07:25 +0200
-Subject: [PATCH] tpm2_checkquote: fix uninitialized variable
-
-The variable `temp_pcrs` is uninitialized, and later partially
-uninitialized when reading the selection data from file.
-
-When activating lto optimizations, this bug presents itself showing an
-error during the read of the quote:
-
-ERROR: Malformed PCR file, pcr count cannot be greater than 32, got: ...
-
-Fixes: #2767
-
-Co-authored-by: Martin Liska <marxin.liska@gmail.com>
-Signed-off-by: Alberto Planas <aplanas@suse.com>
----
- tools/misc/tpm2_checkquote.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/tools/misc/tpm2_checkquote.c b/tools/misc/tpm2_checkquote.c
-index 531508579..8d780f111 100644
---- a/tools/misc/tpm2_checkquote.c
-+++ b/tools/misc/tpm2_checkquote.c
-@@ -376,7 +376,7 @@ static tool_rc init(void) {
-     TPM2B_ATTEST *msg = NULL;
-     TPML_PCR_SELECTION pcr_select;
-     tpm2_pcrs *pcrs;
--    tpm2_pcrs temp_pcrs;
-+    tpm2_pcrs temp_pcrs = {};
-     tool_rc return_value = tool_rc_general_error;
- 
-     msg = message_from_file(ctx.msg_file_path);
diff --git a/app-crypt/tpm2-tools/files/tpm2-tools-5.2-testparms-fix-condition-for-negative-test.patch b/app-crypt/tpm2-tools/files/tpm2-tools-5.2-testparms-fix-condition-for-negative-test.patch
new file mode 100644
index 000000000000..e1094647bdfd
--- /dev/null
+++ b/app-crypt/tpm2-tools/files/tpm2-tools-5.2-testparms-fix-condition-for-negative-test.patch
@@ -0,0 +1,33 @@
+From 3d80fad66694ad14a58dd89204a25e9248c4ab0c Mon Sep 17 00:00:00 2001
+From: Jonas Witschel <git@diabonas.de>
+Date: Wed, 29 Sep 2021 17:08:07 +0200
+Subject: [PATCH] testparms: fix condition for negative test
+
+Commit e858dec76686bb4c42e74e0984b433231e530f93 ("testparms: ensure curve not
+supported before negative test") is supposed to ensure that the negative test
+is run only if ecc521 is *not* supported, but instead it runs the negative test
+if ecc521 is *available*. This worked anyway for libtpms < 0.9.0 because camellia
+was not supported, but since libtpms 0.9.0 added support for this algorithm, the
+test suite fails now with swtpm.
+
+Signed-off-by: Jonas Witschel <git@diabonas.de>
+---
+ test/integration/tests/testparms.sh | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/test/integration/tests/testparms.sh b/test/integration/tests/testparms.sh
+index 8c3548e5..a587a60a 100644
+--- a/test/integration/tests/testparms.sh
++++ b/test/integration/tests/testparms.sh
+@@ -63,7 +63,7 @@ else
+ fi
+ 
+ # Attempt to specify a suite that is not supported (error from TPM)
+-if tpm2 getcap ecc-curves | grep -q TPM2_ECC_NIST_P521; then
++if ! tpm2 getcap ecc-curves | grep -q TPM2_ECC_NIST_P521; then
+     if tpm2 testparms "ecc521:ecdsa:camellia" &>/dev/null; then
+         echo "tpm2 testparms succeeded while it shouldn't or TPM failed"
+         exit 1
+-- 
+2.32.0
+
diff --git a/app-crypt/tpm2-tools/tpm2-tools-5.1.1-r2.ebuild b/app-crypt/tpm2-tools/tpm2-tools-5.2.ebuild
index 6ede7d5e055c..f5db2002958f 100644
--- a/app-crypt/tpm2-tools/tpm2-tools-5.1.1-r2.ebuild
+++ b/app-crypt/tpm2-tools/tpm2-tools-5.2.ebuild
@@ -1,20 +1,23 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
-PYTHON_COMPAT=( python3_{8,9} )
+PYTHON_COMPAT=( python3_{8..10} )
 inherit autotools bash-completion-r1 python-single-r1
 
 DESCRIPTION="Tools for the TPM 2.0 TSS"
 HOMEPAGE="https://github.com/tpm2-software/tpm2-tools"
-SRC_URI="https://github.com/tpm2-software/${PN}/releases/download/${PV}/${P}.tar.gz"
+SRC_URI="https://github.com/tpm2-software/tpm2-tools/releases/download/${PV}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="+fapi test"
 
+RESTRICT="!test? ( test )"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
 RDEPEND=">=app-crypt/tpm2-tss-3.0.1[fapi?]
 	dev-libs/openssl:=
 	net-misc/curl
@@ -24,30 +27,28 @@ DEPEND="${RDEPEND}
 	test? (
 		app-crypt/swtpm
 		app-crypt/tpm2-abrmd
-		app-editors/vim-core
-		dev-tcltk/expect
 		dev-util/cmocka
-		dev-python/pyyaml
 	)"
 BDEPEND="virtual/pkgconfig
-	sys-devel/autoconf-archive"
-
-RESTRICT="!test? ( test )"
-REQUIRED_USE=" ${PYTHON_REQUIRED_USE} "
+	sys-devel/autoconf-archive
+	test? (
+		app-editors/vim-core
+		dev-tcltk/expect
+		$(python_gen_cond_dep 'dev-python/pyyaml[${PYTHON_USEDEP}]')
+	)
+	${PYTHON_DEPS}"
 
-# One of the tests fails without this patch. See
-# https://github.com/tpm2-software/tpm2-tools/issues/2767
 PATCHES=(
-	"${FILESDIR}/${PN}-5.1.1-fix-tpm-checkquote.patch"
 	"${FILESDIR}/${PN}-5.1.1-no-efivar-automagic.patch"
+	"${FILESDIR}/${PN}-5.2-testparms-fix-condition-for-negative-test.patch"
 )
 
 src_prepare() {
+	default
 	sed -i \
 	"s/m4_esyscmd_s(\[git describe --tags --always --dirty\])/${PV}/" \
-	"${S}/configure.ac" || die
-	"${S}/scripts/utils/man_to_bashcompletion.sh"
-	default
+		"configure.ac" || die
+	"./scripts/utils/man_to_bashcompletion.sh" || die
 	eautoreconf
 }
 
@@ -61,12 +62,7 @@ src_configure() {
 
 src_install() {
 	default
-
-	mv "${D}/$(get_bashcompdir)/tpm2_completion.bash" \
-	   "${D}/$(get_bashcompdir)/tpm2" || die
-	for B in "${D}"/usr/bin/tpm2_*
-	do
-		TPM2_UTILS="${TPM2_UTILS} $(basename ${B})"
-	done
-	bashcomp_alias tpm2 ${TPM2_UTILS}
+	mv "${ED}"/$(get_bashcompdir)/tpm2{_completion.bash,} || die
+	local utils=( "${ED}"/usr/bin/tpm2_* )
+	bashcomp_alias tpm2 "${utils[@]##*/}"
 }