From c719fdcee603a5a706a45d10cb598762d56a727d Mon Sep 17 00:00:00 2001
From: V3n3RiX <venerix@redcorelinux.org>
Date: Sat, 25 Sep 2021 20:21:45 +0100
Subject: gentoo resync : 25.09.2021

---
 app-crypt/Manifest.gz                              | Bin 28276 -> 28281 bytes
 app-crypt/acme/Manifest                            |   2 -
 app-crypt/acme/acme-1.16.0.ebuild                  |  68 ---------
 app-crypt/certbot-apache/Manifest                  |   2 -
 .../certbot-apache/certbot-apache-1.16.0.ebuild    |  30 ----
 app-crypt/certbot-nginx/Manifest                   |   2 -
 .../certbot-nginx/certbot-nginx-1.16.0.ebuild      |  32 -----
 app-crypt/certbot/Manifest                         |   2 -
 app-crypt/certbot/certbot-1.16.0.ebuild            |  36 -----
 app-crypt/coolkey/Manifest                         |   3 +-
 app-crypt/coolkey/coolkey-1.1.0-r7.ebuild          |   7 +-
 app-crypt/coolkey/coolkey-1.1.0-r9.ebuild          |  90 ++++++++++++
 app-crypt/gnupg/Manifest                           |   6 +-
 app-crypt/gnupg/gnupg-2.2.30.ebuild                | 152 ---------------------
 app-crypt/gnupg/gnupg-2.2.31.ebuild                | 152 +++++++++++++++++++++
 app-crypt/gnupg/metadata.xml                       |   4 +
 app-crypt/johntheripper-jumbo/Manifest             |   3 +
 .../johntheripper-jumbo-1.9.0-fix-bashism.patch    |  24 ++++
 .../johntheripper-jumbo-1.9.0_p20210920.ebuild     | 143 +++++++++++++++++++
 app-crypt/libmd/Manifest                           |   2 +-
 app-crypt/libmd/libmd-1.0.3-r2.ebuild              |   2 +-
 app-crypt/libu2f-server/Manifest                   |   2 +-
 .../libu2f-server/libu2f-server-1.1.0-r1.ebuild    |  54 --------
 .../libu2f-server/libu2f-server-1.1.0-r2.ebuild    |  54 ++++++++
 app-crypt/pinentry/Manifest                        |   6 +-
 app-crypt/pinentry/metadata.xml                    |   4 +
 app-crypt/pinentry/pinentry-1.1.0-r4.ebuild        |  88 ------------
 app-crypt/pinentry/pinentry-1.2.0.ebuild           |  90 ++++++++++++
 app-crypt/rhash/Manifest                           |   2 +-
 app-crypt/rhash/rhash-1.4.2.ebuild                 |   2 +-
 app-crypt/swtpm/Manifest                           |   4 +-
 app-crypt/swtpm/swtpm-0.6.0-r1.ebuild              |  69 ----------
 app-crypt/swtpm/swtpm-0.6.1.ebuild                 |  70 ++++++++++
 app-crypt/tpm2-abrmd/Manifest                      |   2 +-
 app-crypt/tpm2-abrmd/tpm2-abrmd-2.4.0.ebuild       |   2 +-
 app-crypt/tpm2-tools/Manifest                      |   2 +-
 app-crypt/tpm2-tools/tpm2-tools-5.1.1-r2.ebuild    |   6 +-
 37 files changed, 661 insertions(+), 558 deletions(-)
 delete mode 100644 app-crypt/acme/acme-1.16.0.ebuild
 delete mode 100644 app-crypt/certbot-apache/certbot-apache-1.16.0.ebuild
 delete mode 100644 app-crypt/certbot-nginx/certbot-nginx-1.16.0.ebuild
 delete mode 100644 app-crypt/certbot/certbot-1.16.0.ebuild
 create mode 100644 app-crypt/coolkey/coolkey-1.1.0-r9.ebuild
 delete mode 100644 app-crypt/gnupg/gnupg-2.2.30.ebuild
 create mode 100644 app-crypt/gnupg/gnupg-2.2.31.ebuild
 create mode 100644 app-crypt/johntheripper-jumbo/files/johntheripper-jumbo-1.9.0-fix-bashism.patch
 create mode 100644 app-crypt/johntheripper-jumbo/johntheripper-jumbo-1.9.0_p20210920.ebuild
 delete mode 100644 app-crypt/libu2f-server/libu2f-server-1.1.0-r1.ebuild
 create mode 100644 app-crypt/libu2f-server/libu2f-server-1.1.0-r2.ebuild
 delete mode 100644 app-crypt/pinentry/pinentry-1.1.0-r4.ebuild
 create mode 100644 app-crypt/pinentry/pinentry-1.2.0.ebuild
 delete mode 100644 app-crypt/swtpm/swtpm-0.6.0-r1.ebuild
 create mode 100644 app-crypt/swtpm/swtpm-0.6.1.ebuild

(limited to 'app-crypt')

diff --git a/app-crypt/Manifest.gz b/app-crypt/Manifest.gz
index 8791c38620d4..c420b4c01f6c 100644
Binary files a/app-crypt/Manifest.gz and b/app-crypt/Manifest.gz differ
diff --git a/app-crypt/acme/Manifest b/app-crypt/acme/Manifest
index 7235ea8d2e36..8d85bbafe401 100644
--- a/app-crypt/acme/Manifest
+++ b/app-crypt/acme/Manifest
@@ -1,8 +1,6 @@
-DIST certbot-1.16.0.tar.gz 1384177 BLAKE2B 4e46e7d7b9db2f6ef19fab60c2d904f84b502d2911ed496967bbe272db5352c1e9bdb65b8f45358f222214bce4721ceecc12c018b875148bc897f83c5eb63933 SHA512 c2a0c4ea52ab241e387d686a9e5ed67aa5e8b4b7d34ad8996e34562e036c25ab8b397bf482a856758ca787b97bbd78c890189250c0c3d948f03fbf91aa25ece0
 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.16.0.ebuild 1679 BLAKE2B ff4806292419911de014008dc51d250464f90368325db9a0cd73b6ba2881c6f60563fd7831d999ffba75772cbfa24af517d9fa52556f260f13c5855400d635bf SHA512 fbdc63af62a50e9ca6f98ed17b1b1be58a0a206b4e0940557b592f715a3d8bb81c6432132623e497e94806d595d4e71f0a660512c8ee23bd15b84088a62821cf
 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
diff --git a/app-crypt/acme/acme-1.16.0.ebuild b/app-crypt/acme/acme-1.16.0.ebuild
deleted file mode 100644
index 37a6145366aa..000000000000
--- a/app-crypt/acme/acme-1.16.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/certbot-apache/Manifest b/app-crypt/certbot-apache/Manifest
index 67514ed6286a..985fe637fefb 100644
--- a/app-crypt/certbot-apache/Manifest
+++ b/app-crypt/certbot-apache/Manifest
@@ -1,8 +1,6 @@
-DIST certbot-1.16.0.tar.gz 1384177 BLAKE2B 4e46e7d7b9db2f6ef19fab60c2d904f84b502d2911ed496967bbe272db5352c1e9bdb65b8f45358f222214bce4721ceecc12c018b875148bc897f83c5eb63933 SHA512 c2a0c4ea52ab241e387d686a9e5ed67aa5e8b4b7d34ad8996e34562e036c25ab8b397bf482a856758ca787b97bbd78c890189250c0c3d948f03fbf91aa25ece0
 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.16.0.ebuild 915 BLAKE2B e6cfa64a1bfad2719088c2ff8355040b8a607833f3372deb7236a0660788a4a4f7957df10aea8c7d9fa82ffe47ccc2c68542b1724f07f9495299166b87a4cb51 SHA512 91c65759d818a7c8c279de035f8280dda7408d46108139e689038906e212628d4a69b7a427448fb36a726090e0aa0805043da8a78764f6e3b925f44e94a657ae
 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
diff --git a/app-crypt/certbot-apache/certbot-apache-1.16.0.ebuild b/app-crypt/certbot-apache/certbot-apache-1.16.0.ebuild
deleted file mode 100644
index 0ef28b9c4132..000000000000
--- a/app-crypt/certbot-apache/certbot-apache-1.16.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 81dafe0cd059..a77c4247f529 100644
--- a/app-crypt/certbot-nginx/Manifest
+++ b/app-crypt/certbot-nginx/Manifest
@@ -1,8 +1,6 @@
-DIST certbot-1.16.0.tar.gz 1384177 BLAKE2B 4e46e7d7b9db2f6ef19fab60c2d904f84b502d2911ed496967bbe272db5352c1e9bdb65b8f45358f222214bce4721ceecc12c018b875148bc897f83c5eb63933 SHA512 c2a0c4ea52ab241e387d686a9e5ed67aa5e8b4b7d34ad8996e34562e036c25ab8b397bf482a856758ca787b97bbd78c890189250c0c3d948f03fbf91aa25ece0
 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.16.0.ebuild 933 BLAKE2B 019025bd57899cca498bc2011e4d4822a0aafe94b974cc785eb8c770b6a7b00c19f9891f5ed890046467d6ebb31fd1f9b1452b63c2e2c6eb7cd09db318a282f4 SHA512 57f1466ad320578076f5ab974d92791fed4c2469df0c91ca21b649ea86ed0dc6ab9caf5c0db7d669944e893e40f2fbef33eb42a1addf7d11cac310616cabd2c2
 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
diff --git a/app-crypt/certbot-nginx/certbot-nginx-1.16.0.ebuild b/app-crypt/certbot-nginx/certbot-nginx-1.16.0.ebuild
deleted file mode 100644
index 8aeb6ce5d52e..000000000000
--- a/app-crypt/certbot-nginx/certbot-nginx-1.16.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 2211b51c252a..6a769e23961a 100644
--- a/app-crypt/certbot/Manifest
+++ b/app-crypt/certbot/Manifest
@@ -1,8 +1,6 @@
-DIST certbot-1.16.0.tar.gz 1384177 BLAKE2B 4e46e7d7b9db2f6ef19fab60c2d904f84b502d2911ed496967bbe272db5352c1e9bdb65b8f45358f222214bce4721ceecc12c018b875148bc897f83c5eb63933 SHA512 c2a0c4ea52ab241e387d686a9e5ed67aa5e8b4b7d34ad8996e34562e036c25ab8b397bf482a856758ca787b97bbd78c890189250c0c3d948f03fbf91aa25ece0
 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.16.0.ebuild 1150 BLAKE2B 3d12f9623927d69800604d841f3159d131160be4d80bd1ff44242164c813600a117778c22f6bad056ff22412897a7449444d6cd685123ab390afb7b75d2787b5 SHA512 4fae07647cb002f625e7fff6dae5d6a15bcaa9dbdf3de847c1f8dc8cb6e4b5e2f64369967f0955ab10451921e0c200504478956fd7903ed32fbb04978bc4ba2e
 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
diff --git a/app-crypt/certbot/certbot-1.16.0.ebuild b/app-crypt/certbot/certbot-1.16.0.ebuild
deleted file mode 100644
index a2ad43b5a62c..000000000000
--- a/app-crypt/certbot/certbot-1.16.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/coolkey/Manifest b/app-crypt/coolkey/Manifest
index afca652e67a9..b5161042f5dc 100644
--- a/app-crypt/coolkey/Manifest
+++ b/app-crypt/coolkey/Manifest
@@ -1,4 +1,5 @@
 DIST coolkey-1.1.0-patches-003.tar.gz 21263 BLAKE2B 27025b8aa24df45f8efa872122a1c3699db6d0d627861182c7eb1d61b921d026d7e3355d1b3d12608747ed1d214eee764b53dbbc5599c452b347e191e1516eca SHA512 25a5fac68ca041fcf9e927d134d0179fa286e6de75019e7bbf205edeaf73222d9fb9fd3861a8f6e0d933d1a09229e3e727278c3a9b3cc63390ef07774c46390d
 DIST coolkey-1.1.0.tar.gz 432808 BLAKE2B 7e443cdb0dedcec5de32cf5c7cc5eb2d81f1d51fbc2e580fda302153d3f8a919bc89d2308b8799cf395c89d16150e09bd33bc76eacb8af855c54b961bb5d082a SHA512 4b61de9b40abcf620fbb519d5e3cf1e93ebdd0470854cb63a597fc91e0182998217353014327f7bc4f255d22515d8ea2b08d36b3a831f5f09134fdcd418bc08b
-EBUILD coolkey-1.1.0-r7.ebuild 1955 BLAKE2B e0aaf94e3d6a1ebd97d0a65933b3ba88508282768f7ba6bd446da4e46d2fc7b7ad874bce2c67d8ddfb5de83da34a8dad78c43c01e423dd1b5a3af966abacd6ee SHA512 e82f42b46efe278f5ab74b5205f451e4759c8701564d6132672bcc41e140fd4ad8817f047c900b09c5bc26b35e32b8197cbf2b4648475f43d83483c24873b129
+EBUILD coolkey-1.1.0-r7.ebuild 2019 BLAKE2B ded7d0f8142132e7c44702103e5f63d9bae0da84dbdd79b0a9977a221ee29644e10d8394e42d4b4b297e1bacea43a393ad890bf3f27ede7a797551b09d6ba58c SHA512 5bd6912bd7f9945e96995aaaa8794c151fed4d3a41e5ba2c86846bb0dbebe5c9fd09414cb5111bfaad98162bbe032683be0f7204fa07bd98878cf1f75e7de8f1
+EBUILD coolkey-1.1.0-r9.ebuild 2096 BLAKE2B cf968723617586ea25279011bdf3cb2de557be52f68e90d71500094f0e134c9b8f4601ff97d95231b6b5a15de5f425806e4980cfe830226bb9be6963aed9ffb2 SHA512 833e5196d2da412686ac4c89203bea7206e806bb7022fb1e7fcf68800bf94dacbc30d5e54e5f1b28be16bfa46faeddc8757d5fc35eb4ea7da21892160a909afd
 MISC metadata.xml 168 BLAKE2B 2e0e000b4c3b6ca04c12903fdbe278415c05a822623c52e9aa95cbbf3d50bcb1246b7edbda7d2f6b559af8950c6374e6e0a69b76319964cfe686bf50b0604a57 SHA512 4dcf45d1809e8390a2d8155c8ebfe0dd610203e392aeab0ccd8a10f42cc8532a4925eff32b35e7a6c35598a4efd288229034ec0732299dbd8cfa0acff705fed3
diff --git a/app-crypt/coolkey/coolkey-1.1.0-r7.ebuild b/app-crypt/coolkey/coolkey-1.1.0-r7.ebuild
index cbb3e7161b80..4a15201f3fba 100644
--- a/app-crypt/coolkey/coolkey-1.1.0-r7.ebuild
+++ b/app-crypt/coolkey/coolkey-1.1.0-r7.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -47,6 +47,11 @@ src_compile() {
 	emake CFLAGS+="-fno-strict-aliasing" -j1
 }
 
+src_install() {
+	emake DESTDIR="${D}" install -j1
+	einstalldocs
+}
+
 pkg_postinst() {
 	if [[ -x $dbdir ]]; then
 		if ! $(modutil -rawlist -dbdir $dbdir | grep libcoolkeypk11); then
diff --git a/app-crypt/coolkey/coolkey-1.1.0-r9.ebuild b/app-crypt/coolkey/coolkey-1.1.0-r9.ebuild
new file mode 100644
index 000000000000..cd3d7f1e434b
--- /dev/null
+++ b/app-crypt/coolkey/coolkey-1.1.0-r9.ebuild
@@ -0,0 +1,90 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools flag-o-matic
+
+PATCHVER="003"
+
+DESCRIPTION="Linux Driver support for the CoolKey and CAC products"
+HOMEPAGE="https://directory.fedora.redhat.com/wiki/CoolKey"
+SRC_URI="https://directory.fedora.redhat.com/download/coolkey/${P}.tar.gz
+	mirror://gentoo/${P}-patches-${PATCHVER}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="debug"
+
+RDEPEND=">=sys-apps/pcsc-lite-1.6.4
+	dev-libs/nss[utils]
+	sys-libs/zlib"
+DEPEND="${RDEPEND}
+	>=app-crypt/ccid-1.4.0"
+BDEPEND="virtual/pkgconfig"
+
+PATCHES=(
+	"${WORKDIR}/${PN}-patches"
+)
+
+pkg_setup() {
+	pk="pk11install"
+	dbdir="/etc/pki/nssdb"
+	ck_mod_name="CoolKey PKCS #11 Module"
+
+	if ! [[ -x $dbdir ]]; then
+		ewarn "No /etc/pki/nssdb found; check under \$HOME/.pki and"
+		ewarn "follow the suggested commands using the correct path."
+	fi
+}
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	append-flags -fno-strict-aliasing
+	econf \
+		--enable-pk11install \
+		$(use_enable debug)
+}
+
+src_compile() {
+	emake -j1
+}
+
+src_install() {
+	emake DESTDIR="${D}" install -j1
+	einstalldocs
+}
+
+pkg_postinst() {
+	if [[ -x $dbdir ]]; then
+		if ! $(modutil -rawlist -dbdir $dbdir | grep libcoolkeypk11); then
+			elog "You still need to install libcoolkey in your PKCS11 library:"
+			elog "$pk -p $dbdir 'name=$ck_mod_name library=libcoolkeypk11.so'"
+
+		fi
+	else
+		elog ""
+		elog "You still need to setup your PKCS11 library, or at least"
+		elog "find where it is (perhaps \$HOME/.pki/nssdb).  Once you"
+		elog "find it, use 'modutil -rawlist -dbdir \$db' to look for"
+		elog "libcoolkeypk11.so, and if not found, add it using:"
+		elog ""
+		elog "$pk -p \$db 'name=$ck_mod_name library=libcoolkeypk11.so'"
+		elog ""
+		elog "where \$db is the full path to your pki/nssdb directory."
+		elog ""
+	fi
+}
+
+pkg_postrm() {
+	if [[ -x $dbdir ]]; then
+		if $(modutil -rawlist -dbdir $dbdir | grep libcoolkeypk11); then
+			elog "You should remove libcoolkey from your PKCS11 library."
+		fi
+	fi
+}
diff --git a/app-crypt/gnupg/Manifest b/app-crypt/gnupg/Manifest
index 09e698c873c0..5b208e6df328 100644
--- a/app-crypt/gnupg/Manifest
+++ b/app-crypt/gnupg/Manifest
@@ -2,10 +2,10 @@ AUX gnupg-2.1.20-gpgscm-Use-shorter-socket-path-lengts-to-improve-tes.patch 1048
 DIST gnupg-2.2.16-scdaemon_shared-access.patch 2586 BLAKE2B 42fd5482c4e86751ce62836125997c2295c44bc5db0671a06460fd306b2ed93f290fb898fc1b1e463a863eddf9ab5f99ea3c90a55499ef45ca1ed6edf2854663 SHA512 38abaa4200114ae6b6f220fabc0a84a056761949c97bd0564557f4411a299b9a1939893555c27e26da2d8e8da4bc97a298fa7e68f1e80fe99c3f88cc329eaa84
 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.30.tar.bz2 7215171 BLAKE2B 3754bdab2bfe56bb111079cf606b71664ae7fbbffd840b03f1e7a52d483248686ec8ba42b79ecf14a2da5a07f4f356df62b91ebe7af550254d7e2ec018b20a32 SHA512 942adac2e0eff654d54c2fe03501bfa20fa5e58575253ca57e9ad585ec2b96e14cc108e0191f3f586234a3b1675fe17dc2cf9e7790280a57166f84ddeb5d5d4f
+DIST gnupg-2.2.31.tar.bz2 7212188 BLAKE2B 57a2b6c6ea491137a708e18a0119502621b7bdf0591818d19beb8b08a521a7dbf60472243e1723f53acbfb9a5de612b8e5040c45dc847bdda26012244edb11be SHA512 2f6fa200e08d6b8993b482e5825bea6083afc8686c4e1ae80386b36ae49e1c2d73066c508edaa359a7794cb26ba7a00f81555a906fa422d1117e41415cfa2fea
 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.30.ebuild 4717 BLAKE2B cd39c581bf930c519e4f38fc0741d7c157ee44ebe6599253931e9a90f493cf28e06fac31a025a08b5958be04a0a92fa87bbc481153d746d4b8a194eb51d9377c SHA512 e3fe9d932a558b2e646b13fc98b429a6162d18f853481fe88218bde6b756a16eb8e24038860a2b8dd8922bb689e1c7b9df4855476315fd6fdf2249a169364a59
+EBUILD gnupg-2.2.31.ebuild 4717 BLAKE2B cd39c581bf930c519e4f38fc0741d7c157ee44ebe6599253931e9a90f493cf28e06fac31a025a08b5958be04a0a92fa87bbc481153d746d4b8a194eb51d9377c SHA512 e3fe9d932a558b2e646b13fc98b429a6162d18f853481fe88218bde6b756a16eb8e24038860a2b8dd8922bb689e1c7b9df4855476315fd6fdf2249a169364a59
 EBUILD gnupg-2.3.2.ebuild 4752 BLAKE2B 65ecc00b22ad7b3df2f21f10c7c683f301207c64d2486cefe239e4bf97eff3f1d1eedda05a620ec681eaa13496f01f3031af71b3a999f56fec624db8829c4dc5 SHA512 01080e8bb522db5fa342a602ae51fdb4f72d95a6bffd1fc924adfc5d1360f8a4ddde9d8062838949100572032da3da87c69149398295d9134aa9b5636be02fbc
-MISC metadata.xml 1380 BLAKE2B 00355001d2ce89f16480059e14d5097e8c89417ab73d6c89c926e97c34119f7c49e7f4926f7dc054d71712507dfae1d185b621faba06f911d6d67ec8a06351a4 SHA512 59def73d4e8cd90e0795f80e9db4483ad6c1c3b42cf0c157047790303f3a56a0fbcbcfbdb1910369b12cffcbb0dee3365045475536dc0ddddeab1f77182025a5
+MISC metadata.xml 1498 BLAKE2B aba846d09c0230ea7e10a5585068509c9f56575da979a85f84caf6244555609782381bb8beae68222a0ab71a0d820a4d4655ed3d9b1399cc259e400f29d8ab6b SHA512 1314093db4291b4230cdda07bdae9c30dbce8bb698a2afb236f6c657c636791c8e2a9d5a3fc488bffddbff25d307d0ba9d50c54551652dfd099e73e70811e859
diff --git a/app-crypt/gnupg/gnupg-2.2.30.ebuild b/app-crypt/gnupg/gnupg-2.2.30.ebuild
deleted file mode 100644
index 81662988beb7..000000000000
--- a/app-crypt/gnupg/gnupg-2.2.30.ebuild
+++ /dev/null
@@ -1,152 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-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.2.31.ebuild b/app-crypt/gnupg/gnupg-2.2.31.ebuild
new file mode 100644
index 000000000000..81662988beb7
--- /dev/null
+++ b/app-crypt/gnupg/gnupg-2.2.31.ebuild
@@ -0,0 +1,152 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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/metadata.xml b/app-crypt/gnupg/metadata.xml
index 365e1de60a59..f6fc64ff0b0b 100644
--- a/app-crypt/gnupg/metadata.xml
+++ b/app-crypt/gnupg/metadata.xml
@@ -9,6 +9,10 @@
 		<email>polynomial-c@gentoo.org</email>
 		<name>Lars Wendler</name>
 	</maintainer>
+	<maintainer type="project">
+		<email>base-system@gentoo.org</email>
+		<name>Gentoo Base System</name>
+	</maintainer>
 	<use>
 		<flag name="scd-shared-access">
 		Allow concurrent access to scdaemon by multiple apps from same
diff --git a/app-crypt/johntheripper-jumbo/Manifest b/app-crypt/johntheripper-jumbo/Manifest
index 8c4b1e77ced4..68545a069a78 100644
--- a/app-crypt/johntheripper-jumbo/Manifest
+++ b/app-crypt/johntheripper-jumbo/Manifest
@@ -1,6 +1,9 @@
+AUX johntheripper-jumbo-1.9.0-fix-bashism.patch 939 BLAKE2B e3e4a45a7cba373203d636cf731896249208c7e92b5da64992ddd98a93922f326e077028812db57b5a505410b227afc07bc7097ad02c620858dea76539ecbe2e SHA512 9b46ed5fcdbd1efd43bb1903faa25c7c4e2c82417a8b963d8cab584d52eefee74408f51f51a059af2e558eebfcfed7bf3484c4bc85b169327548240116d5fb5a
 AUX johntheripper-jumbo-1.9.0-gcc11.patch 1713 BLAKE2B b1f3aaf0c76f1c0fc6ad0d498dce4722994ed11a6f0547bb4ff7683083b9c9d59ce817133189853380378121515aa12db1cf08699c40b39e2fdec667045da88d SHA512 d341eeb291b5bf5721b781272ac66aa56e7d38db305f0272e65a0b77bad05ffc631cfe5fe8093f94a8545cc09020d639dfebb1b903585248bd57933661571b4f
 AUX johntheripper-jumbo-1.9.0-opencl-fix.patch 333 BLAKE2B 248ad5ecba48908a982c27c9d8162c22031cfc29f0becb05209f56c837bb850f6032c847a60d8cd05ba88a0f73ad35f27a08fefb734c6bd87f458b22f77db0ab SHA512 81f9dabc6d8ad54944be7eb9b3c7204ce426db842325c31662038e213775c0a86288c860712e6d3c24f7a9d0b7a0fd8962126a25242f45e5f242307691a97d38
 DIST john-1.9.0-jumbo-1.tar.xz 33638768 BLAKE2B 2fd6813e234308408d42581705ee8b25f9217a3dfb43f05483156f7bb67d0ce0d6de9c3ce8c2e4a17bb99bb377119dae2897bc08c800e7bc80bc6cf245400df6 SHA512 c5cb5dc739ee4c666f8479cdf10511fddc391b590c59f90c060d3ccd8449b794ac7b831a6d1f7553883892499e709a66578cfa4d62caef9b7e0a831eb827e808
+DIST johntheripper-jumbo-1.9.0_p20210920.tar.gz 47758128 BLAKE2B e85255dc218c43e6358f76eac1e79af01d437a7a1fcddd608a390734fdc4070cbf949b8abc080b82decf4a1f5e32d2baa6d2a09d385a31913d8e988c8732e85e SHA512 5121434ad275921fe6288c51fd9dfd36ed3162387e70e8089bbc266d4a17ea461b72ce26b2004acfb62d95a9ee2d570ef3b3f00c1d031abd8cff2f20c3ab480a
 EBUILD johntheripper-jumbo-1.9.0-r3.ebuild 3046 BLAKE2B 2573edffdbd3fd90ea3cff11197767acd593d24a99ae8a1c3f60c1b4f14b9e2e6ffb134b03a6f2e86ce850c379d4d8ce5fdeddf872e045126142a3592fd0b9c6 SHA512 5714243ca54db6aeeeb083070a419d0d93c67d24c272ecba833b4e813c605f56b5909fb663ec85f3142462113e716b1817a67e3dc8bfba511e89e30a8d37bfcc
+EBUILD johntheripper-jumbo-1.9.0_p20210920.ebuild 3143 BLAKE2B 08615f5cadc78b6a833c01dcc4a2235d2e6e735542834f8325486f921faf38d95b7bfafac09481ab8370588f70a259c772d1ace0b5b9c2119474b70e6c14c60e SHA512 533c042e8b7996f2ddba22df15ddf4a44f3c358abe96ad3f0d80334ccda7de7d9dd138d0e7f891da1c564dbd536f6c658e065f9151976bf3412efcceec2de581
 EBUILD johntheripper-jumbo-9999.ebuild 2842 BLAKE2B f3a248bb7713f41e9d87f0b8d751e2edd3136266c50da26419d9aeb01f0e884f52a3bf78e8c012efa26a3192552e77eee69c4bdc832817b9907c255a52403682 SHA512 b5d8625f3c3c62e0a9a7b859c8b65be7655ec4fbab5b38cb3264f444770dd23b2770dfd8dc478de2693c8b4e9dd168a4fe5edc7adca6ede5c2e4951d52fd643d
 MISC metadata.xml 473 BLAKE2B ed1c424492ff052e83ce899d8ea4a805ce5d4a5604da336ad16929594d14307c2e264c4eb6e6ee985d3167b8917e8c80c38ed9f97ba5293a0b8f84f472fd9786 SHA512 f124050eecf17e3c2fa01b6140881349e089840c75cb30bf054286a049026bb372cc70e1ce7be3054fffbe5836be7dc1f7fc9e3918f874443644ea99c5b441ab
diff --git a/app-crypt/johntheripper-jumbo/files/johntheripper-jumbo-1.9.0-fix-bashism.patch b/app-crypt/johntheripper-jumbo/files/johntheripper-jumbo-1.9.0-fix-bashism.patch
new file mode 100644
index 000000000000..a0a18158ce7e
--- /dev/null
+++ b/app-crypt/johntheripper-jumbo/files/johntheripper-jumbo-1.9.0-fix-bashism.patch
@@ -0,0 +1,24 @@
+https://patch-diff.githubusercontent.com/raw/openwall/john/pull/4822.patch
+
+From dd9501341808fe19b9c5cd4f8f04edfc5f377077 Mon Sep 17 00:00:00 2001
+From: Sam James <sam@gentoo.org>
+Date: Wed, 22 Sep 2021 19:34:38 +0100
+Subject: [PATCH] configure.ac: avoid bashism in pkg-config check
+
+== is a Bashism and configure scripts need to work
+with a POSIX shell, so let's change to = (like in
+the other condition).
+
+Signed-off-by: Sam James <sam@gentoo.org>
+--- a/src/configure.ac
++++ b/src/configure.ac
+@@ -347,7 +347,7 @@ AS_IF([test -z "$STRIP"], [AC_CHECK_TOOL([STRIP], [strip])])
+ dnl Check if we have this at all
+ PKG_PROG_PKG_CONFIG
+ AC_MSG_CHECKING([if pkg-config will be used])
+-if test "x$PKG_CONFIG" = x || test "x$enable_pkg_config" == xno ; then
++if test "x$PKG_CONFIG" = x || test "x$enable_pkg_config" = xno ; then
+   JTR_MSG_RESULT_FAILIF_FORCED([xno], [x$enable_pkg_config], [pkg-config is NOT available])
+   PKG_CONFIG=no
+ else
+
diff --git a/app-crypt/johntheripper-jumbo/johntheripper-jumbo-1.9.0_p20210920.ebuild b/app-crypt/johntheripper-jumbo/johntheripper-jumbo-1.9.0_p20210920.ebuild
new file mode 100644
index 000000000000..df228200cfd7
--- /dev/null
+++ b/app-crypt/johntheripper-jumbo/johntheripper-jumbo-1.9.0_p20210920.ebuild
@@ -0,0 +1,143 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools flag-o-matic toolchain-funcs pax-utils
+
+DESCRIPTION="Fast password cracker"
+HOMEPAGE="http://www.openwall.com/john/"
+
+MY_PN="JohnTheRipper"
+
+if [[ ${PV} == "9999" ]] ; then
+	EGIT_REPO_URI="https://github.com/magnumripper/${MY_PN}.git"
+	inherit git-r3
+else
+	JUMBO="jumbo-1.1"
+	MY_PV="${PV}-${JUMBO}"
+	MY_P="john-${MY_PV}"
+	HASH_COMMIT="43c7f8850736d4ec68bf0a022ae9fb34c274a01d"
+
+	SRC_URI="https://github.com/openwall/john/archive/${HASH_COMMIT}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/john-${HASH_COMMIT}"
+
+	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="custom-cflags kerberos mpi opencl openmp pcap"
+
+DEPEND=">=dev-libs/openssl-1.0.1:=
+	virtual/libcrypt:=
+	mpi? ( virtual/mpi )
+	opencl? ( virtual/opencl )
+	kerberos? ( virtual/krb5 )
+	pcap? ( net-libs/libpcap )
+	dev-libs/gmp:=
+	sys-libs/zlib
+	app-arch/bzip2"
+RDEPEND="${DEPEND}
+	!app-crypt/johntheripper"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.9.0-fix-bashism.patch
+)
+
+pkg_setup() {
+	if use openmp && [[ ${MERGE_TYPE} != binary ]]; then
+		tc-has-openmp || die "Please switch to an OpenMP compatible compiler"
+	fi
+}
+
+src_prepare() {
+	default
+
+	cd src || die
+	eautoreconf
+
+	sed -i 's#$prefix/share/john#/etc/john#' configure || die
+}
+
+src_configure() {
+	cd src || die
+
+	use custom-cflags || strip-flags
+
+	econf \
+		--enable-pkg-config \
+		--disable-native-march \
+		--disable-native-tests \
+		--disable-rexgen \
+		--with-openssl \
+		--with-systemwide \
+		$(use_enable mpi) \
+		$(use_enable opencl) \
+		$(use_enable openmp) \
+		$(use_enable pcap)
+}
+
+src_compile() {
+	emake -C src
+}
+
+src_test() {
+	pax-mark -mr run/john
+	#if use opencl; then
+		#gpu tests fail in portage, so run cpu only tests
+	#	./run/john --device=cpu --test=0 --verbosity=2 || die
+	#else
+		#weak tests
+	#	./run/john --test=0 --verbosity=2 || die
+		#strong tests
+		#./run/john --test=1 --verbosity=2 || die
+	#fi
+	ewarn "When built systemwide, john can't run tests without reading files in /etc."
+	ewarn "Don't bother opening a bug for this unless you include a patch to fix it"
+}
+
+src_install() {
+	# Executables
+	dosbin run/john
+	newsbin run/mailer john-mailer
+
+	pax-mark -mr "${ED}/usr/sbin/john"
+
+	# grep '$(LN)' Makefile.in | head -n-3 | tail -n+2 | cut -d' ' -f3 | cut -d/ -f3
+	local s
+	for s in \
+		unshadow unafs undrop unique ssh2john putty2john pfx2john keepass2john keyring2john \
+		zip2john gpg2john rar2john racf2john keychain2john kwallet2john pwsafe2john dmg2john \
+		hccap2john base64conv truecrypt_volume2john keystore2john
+	do
+		dosym john /usr/sbin/${s}
+	done
+
+	# Scripts
+	exeinto /usr/share/john
+	doexe run/*.pl
+	doexe run/*.py
+	cd run || die
+
+	local s
+	for s in *.pl *.py; do
+		dosym ../share/john/${s} /usr/bin/${s}
+	done
+	cd .. || die
+
+	if use opencl; then
+		insinto /etc/john
+		doins -r run/opencl
+	fi
+
+	# Config files
+	insinto /etc/john
+	doins run/*.chr run/password.lst
+	doins run/*.conf
+	doins -r run/rules run/ztex
+
+	# dDocumentation
+	rm -f doc/README || die
+	dodoc -r README.md doc/*
+}
diff --git a/app-crypt/libmd/Manifest b/app-crypt/libmd/Manifest
index 05f820b57bbb..1f36f0cc5e3c 100644
--- a/app-crypt/libmd/Manifest
+++ b/app-crypt/libmd/Manifest
@@ -1,5 +1,5 @@
 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
-EBUILD libmd-1.0.3-r2.ebuild 740 BLAKE2B cbd151eed80f8998e07a8cb8dcb55b9aedc0ad10e9863f6aa506441ac4087bbeae0be9a60182e2a99a092df09f941da082463fd71abf5de9b759c509cdd5c45d SHA512 729571dc53a192c7c20e6dd3248d8bf2cfd73a75cf4b7368e27e10407ce23b742bcafb03046aa59366f74be78f218d6637124af7ddf26191ba6c6808c1159e83
+EBUILD libmd-1.0.3-r2.ebuild 746 BLAKE2B 34cac3a544162234b7f24d277d8310004f324ba47842a3696c27f16266d56a11fb593259b0947293d1d2e7ae7b9c0a5d97afdcc26884199229a29010240c14bf SHA512 dd2e5f1efb04fe6fbd2c6ff1580ace52a66a894a1c0ca28a80201bd8b018f25cce0cc43858c41282877fb8382e7178abe69dab63328ebde14a9453cf4b199fc7
 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.3-r2.ebuild b/app-crypt/libmd/libmd-1.0.3-r2.ebuild
index 88ad43e9af55..fc1811f2948b 100644
--- a/app-crypt/libmd/libmd-1.0.3-r2.ebuild
+++ b/app-crypt/libmd/libmd-1.0.3-r2.ebuild
@@ -11,7 +11,7 @@ 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 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
 
 PATCHES=( "${FILESDIR}"/${P}-out-of-source.patch )
 
diff --git a/app-crypt/libu2f-server/Manifest b/app-crypt/libu2f-server/Manifest
index 8f0f6faf1f4b..f686e15688fd 100644
--- a/app-crypt/libu2f-server/Manifest
+++ b/app-crypt/libu2f-server/Manifest
@@ -1,6 +1,6 @@
 AUX libu2f-server-1.1.0-disable-help2man-gengetopt-checks.patch 1137 BLAKE2B fc1d8287d590acf1385747091195e4401f9c3cba2ad6c0911f2ca549504569250567ef5e1b64124b5545460ba53e7e61354c4393051c275212b40c5a70764dd9 SHA512 cae13f6c9738be740055d0d26a7913f84bee0edf3df06d8a4e3da39dbcd7dd24ca19af638c1f00c3e45d68389e9ae842ab2a92ccd690a04af610646705edd498
 AUX libu2f-server-1.1.0-jsonc014.patch 1137 BLAKE2B 84d26d1439662ee15e72aae0f8789be6326d2fc4eb987d1ab961ce3200750414d9e5173c1f6ec16d210ce0a9d7aa4fd274d84967cef611e1638a1f2404da1e38 SHA512 eaeea076939f52f0c28a24825b56c67fb05be4d1c392f1cadf10452cc465edc5c711c998ef836cabf81886b89641492f9df7c9fe9ae03fe2f05bfcda2f65bdac
 DIST libu2f-server-1.1.0.tar.xz 269128 BLAKE2B 084b177a878e8216f2ee5af9eeee11e691edcd12b7ed1b1c57f74bcc45f0418a0d44a9e72423c41b4104aa9f69807a0289172d08d21d168c6be5b36ee8c70bc3 SHA512 ebdb7c8c20727f37f4e31d8f16df7966603374f78478ada723a7b9bec1b0b0622caf6d12a65067ac8651f6088aaad61b2ad6ed51b9d6ef0dc45f031c974d8ff9
-EBUILD libu2f-server-1.1.0-r1.ebuild 1188 BLAKE2B 44674ed1395804a8d0d39db1a8a139f1a6fed0cea1b13ebe16282cde7ae249271cae7e173146fab3aad285d19687630bb40a828464acd0e40ed2c7f7ade589c0 SHA512 0aa96dc7d2a1e789ffcb6597d23d8c33fc8725c43b0f005060a0fd3103aa135afb9ea9e42a24c4a3a1af0cb379f96b9f15d538f0e210e404002ff3297128f09f
+EBUILD libu2f-server-1.1.0-r2.ebuild 1188 BLAKE2B 81a0e4f2a118ebac4a9235cc06eedc090e7581ceb82d37eb829fa21f745cbb70a2b6e9a603562f333c17df9c458ee5b321d61687d94e8e80f564ae7390678507 SHA512 440dcf630b8bd40e7e0eb27d3a2f6dbdd49c59a8941a6a36067895b06046a8c25d06f07da1039096f7558fabb29c5f3a22fb0e8471e5a0f3251f537f672c1683
 EBUILD libu2f-server-1.1.0.ebuild 1174 BLAKE2B 577b4354eb5750d937cf09d0fec86e377efe7723af597e72aa86086e8caba0c3ad24e928b87a755d817f6fe7bafe9c185bbef20d827d6e39e6fea8e89061a0a2 SHA512 3424fa86980abad63a16de3577a951b65bd8973f9df261701cc8c3c5a6634561f77db7f580b146e3e15240369bc0350aff90f3b1ea2e2faff60e6908ab293c9c
 MISC metadata.xml 336 BLAKE2B d2ac3ba73f1a51ab8f2aceaf61dee8f7038891ccdf9cd9dafd5dce3bf3f82a630247d82a587bca97121e89cab4e06078164e71f93b6bc59b0ff94499c0867ea4 SHA512 743488dbe5c72ec0e9fe53d1b2373067bc7fc878eec3e43e623f02d04ff8dddc9ca2ac531990187d1538e6cc65bfd9faf3785150205521deb539b687d23bdc31
diff --git a/app-crypt/libu2f-server/libu2f-server-1.1.0-r1.ebuild b/app-crypt/libu2f-server/libu2f-server-1.1.0-r1.ebuild
deleted file mode 100644
index c4164b376589..000000000000
--- a/app-crypt/libu2f-server/libu2f-server-1.1.0-r1.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools multilib-minimal
-
-DESCRIPTION="Yubico Universal 2nd Factor (U2F) server C Library"
-HOMEPAGE="https://developers.yubico.com/libu2f-server/"
-SRC_URI="https://developers.yubico.com/${PN}/Releases/${P}.tar.xz"
-
-LICENSE="BSD-2"
-SLOT="0/0.1"
-KEYWORDS="~amd64 ~x86"
-IUSE="static-libs test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	dev-libs/openssl:0=[${MULTILIB_USEDEP}]
-	dev-libs/hidapi[${MULTILIB_USEDEP}]
-	dev-libs/json-c:=[${MULTILIB_USEDEP}]
-"
-DEPEND="${RDEPEND}
-	test? ( dev-libs/check[${MULTILIB_USEDEP}] )
-"
-BDEPEND="
-	virtual/pkgconfig
-"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-1.1.0-disable-help2man-gengetopt-checks.patch"
-	"${FILESDIR}/${PN}-1.1.0-jsonc014.patch"
-)
-
-src_prepare() {
-	default
-	eautoreconf
-	touch man/u2f-server.1 || die # do not rebuild the man page
-}
-
-multilib_src_configure() {
-	myeconfargs=(
-		--disable-h2a # tarball already contains the manpage
-		$(use_enable static-libs static)
-		$(use_enable test tests)
-	)
-
-	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
-}
-
-multilib_src_install_all() {
-	default
-	find "${D}" -name '*.la' -delete || die
-}
diff --git a/app-crypt/libu2f-server/libu2f-server-1.1.0-r2.ebuild b/app-crypt/libu2f-server/libu2f-server-1.1.0-r2.ebuild
new file mode 100644
index 000000000000..2141848a479b
--- /dev/null
+++ b/app-crypt/libu2f-server/libu2f-server-1.1.0-r2.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools multilib-minimal
+
+DESCRIPTION="Yubico Universal 2nd Factor (U2F) server C Library"
+HOMEPAGE="https://developers.yubico.com/libu2f-server/"
+SRC_URI="https://developers.yubico.com/${PN}/Releases/${P}.tar.xz"
+
+LICENSE="BSD-2"
+SLOT="0/0.1"
+KEYWORDS="~amd64 ~x86"
+IUSE="static-libs test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	dev-libs/openssl:0=[${MULTILIB_USEDEP}]
+	dev-libs/hidapi[${MULTILIB_USEDEP}]
+	dev-libs/json-c:=[${MULTILIB_USEDEP}]
+"
+DEPEND="${RDEPEND}
+	test? ( dev-libs/check[${MULTILIB_USEDEP}] )
+"
+BDEPEND="
+	virtual/pkgconfig
+"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-1.1.0-disable-help2man-gengetopt-checks.patch"
+	"${FILESDIR}/${PN}-1.1.0-jsonc014.patch"
+)
+
+src_prepare() {
+	default
+	eautoreconf
+	touch man/u2f-server.1 || die # do not rebuild the man page
+}
+
+multilib_src_configure() {
+	myeconfargs=(
+		--disable-h2a # tarball already contains the manpage
+		$(use_enable static-libs static)
+		$(use_enable test tests)
+	)
+
+	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
+}
+
+multilib_src_install_all() {
+	default
+	find "${D}" -name '*.la' -delete || die
+}
diff --git a/app-crypt/pinentry/Manifest b/app-crypt/pinentry/Manifest
index a3ffa3c426e6..2854c550ce2c 100644
--- a/app-crypt/pinentry/Manifest
+++ b/app-crypt/pinentry/Manifest
@@ -1,8 +1,8 @@
 AUX pinentry-0.8.2-ncurses.patch 824 BLAKE2B 922bb9a7079d4a3bc307a441f3f884f764f78819a16b57cde3dcb000ae7a23b592b390f53c528358818087c2c313716289b829c307f07dbee3c9580bd174cd0d SHA512 415ad55fd7a4ab66e87e5db76b1314b00f5a86552804f1f431a533ba1e7ec3f2c7136096106688b572639ceb637fdf0c3e25d96aa2e07fd1f6f295d39e1d4901
 AUX pinentry-1.0.0-AR.patch 326 BLAKE2B 2a05565287d2a3ff9423db1365af6ac1d2d0e0e5b3b7db49ee927eacd480cfbd29abd2313d84eb764e9d7eccd4654e2173fbf8be4508dd88f14bf12f0f9dab39 SHA512 3a8b13ddaa2af8c793586cd73e44b59828e769c3861b2d328273bac991e7e171c8714e2098674a9ae8a77c9a68098012d217e67dde8872df154a1e499837de52
 AUX pinentry-1.0.0-make-icon-work-under-Plasma-Wayland.patch 1606 BLAKE2B bebea23f44a0512dad873f693a8343a47684c983ca37faba908bee62a7f87d1eaf2a097672df45fcfabb28911b55bc3b02177f910137f50d9c97a6939a1f7047 SHA512 15e6b86015bbf9f199bfa9e68f2a1b9f3fc14105313e1dbfb303d76b1949092ec2671b8d2a90fa8b05e0196da81e9f20875656dc11fdd96b48a14d79e4becdf7
-DIST pinentry-1.1.0.tar.bz2 467702 BLAKE2B cf43555848ab0dc60756fca123aba7599ebb1bfe0458b973ed9d84479f8de9ee69ef309b518b40aa340434d64d37793cf97c94f78f99820bc5c71ecd2aac7a49 SHA512 5012672925bcb5f683358c259e55e4b87c67cf063ad52c759308933733025c33f7ce08e5b8019ffc101cbf7ef30499040ef2fd34a7611698e65e1593f80948cd
 DIST pinentry-1.1.1.tar.bz2 515723 BLAKE2B f257fe552852e6d1ff2c23aeb0c1127b43e3a60e44c78dfa764d569e659ccb78528ce3ee863114af273a4b6f6c24686cda2cb14bb04995eb8c41ccd4541a9fbd SHA512 d6ab5af8ac2f3c9c05e09703e95d8e2676f9b2b7ceb97f6a31d101d0e9da7a1e106a6d3eabe86cab1bb35a4b119a7cba1380ac64bf13c61af0b3c48803116c12
-EBUILD pinentry-1.1.0-r4.ebuild 2239 BLAKE2B f0bf43fd9a1d9d8bdcade2398e07ef5f960d13c20884965439cd90f5e08b0e8bc8d065f9d08d67bfaeff2759e62e99271fce5466f8cb60f19ef08d3e7a65fcf8 SHA512 da10a565ab8b921ab9a6097cd319183e0cdb278d56cb3c60d41eb4ee996e9f09fb6d9d1b80f14e8bff98e132a978df6df7c6e8ec1899bf73b6c647e35692b5da
+DIST pinentry-1.2.0.tar.bz2 498390 BLAKE2B 6e97b55fe39e9c17f8a87fa669d23fca56c1095c2533a9eebe459fafc95a3fcb0a5ea502077aae5480b5259a3096c5f85e05d4872c0b19ad33f3d9084a220cc7 SHA512 19cea79aa3982d1f0d75220c8e24ca38d6c49475c6f4c5aa7101151b4690db23ed316096a4a411136e716ba4eb471f48f9b09556e5c9837533c2356b9b384b63
 EBUILD pinentry-1.1.1-r1.ebuild 2312 BLAKE2B a195bb8d27f3f9af602dee69f329b712165ebc6f9bdb74736514e3ba6a8388fad1e26cce3fd45868033fd2b8d686aa973c6190c634f0fff20bc8d303be6bc2b5 SHA512 29bef11fe06782dba8e0776098a0eb9ba813778008b66e4442af545dcd0c91cda7852bc7a9b729c6ad049ea1c4f72bdf4467f6cb34ee92c78ced1ebf9e6d37dd
-MISC metadata.xml 334 BLAKE2B 9d136a24e5c50afb29aa6e1a94706c42bfe4c9323efa31b5011f018e2e44a83d3bb506e5a0889ad0454efc650e25ab89507a3d365c33ec839576bab918834554 SHA512 0a163be530c3070feff545958424a2f328be99c3f358c60df9fcf93e74b5f93e1be6b1ecceda8f06780f6d50f0556e97c83689432380368bbfc5d080318d8710
+EBUILD pinentry-1.2.0.ebuild 2320 BLAKE2B 8651c5ba8d9eb73b75b9390d69c9dddc531a3ddeaebf6c5c8ea6f3950759a02b54b51df5f0cd9661b06759aee072ff56f06e52e06e98fd369a885e422aca9311 SHA512 8b64420f9f1f0d28d7254293d6e4274216a8d1cf7164eb853256419af5052e7889e460acf9dfe0866c4128761d0f0d32b4b13cb5465ca2ccf767e8182d374bad
+MISC metadata.xml 452 BLAKE2B a2aef88d14b75ddb8f8cced6ee2dc1d0d66ac52ac5c686bd8d230bd9291146fa3fc0411682488e0a45c05b20640cf8b4093ee71a0ec60e02fe507dda2910c5fa SHA512 0517e56cd5cb905f4951205f4f7db6d01a14d28e1578612f91bfaee5dfc93a56eff4896201cf3c02f9ca02329b8597d6469187f60f429f7c5f6995fa0023aaf7
diff --git a/app-crypt/pinentry/metadata.xml b/app-crypt/pinentry/metadata.xml
index ec3e1208303b..6d11bc523c76 100644
--- a/app-crypt/pinentry/metadata.xml
+++ b/app-crypt/pinentry/metadata.xml
@@ -5,6 +5,10 @@
 		<email>zlogene@gentoo.org</email>
 		<name>Mikle Kolyada</name>
 	</maintainer>
+	<maintainer type="project">
+		<email>base-system@gentoo.org</email>
+		<name>Gentoo Base System</name>
+	</maintainer>
 	<use>
 		<flag name="efl">Build <pkg>dev-libs/efl</pkg> based pinentry</flag>
 	</use>
diff --git a/app-crypt/pinentry/pinentry-1.1.0-r4.ebuild b/app-crypt/pinentry/pinentry-1.1.0-r4.ebuild
deleted file mode 100644
index 4a7e89129558..000000000000
--- a/app-crypt/pinentry/pinentry-1.1.0-r4.ebuild
+++ /dev/null
@@ -1,88 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools flag-o-matic qmake-utils toolchain-funcs
-
-DESCRIPTION="Simple passphrase entry dialogs which utilize the Assuan protocol"
-HOMEPAGE="https://gnupg.org/aegypten2/index.html"
-SRC_URI="mirror://gnupg/${PN}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~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="caps emacs gnome-keyring gtk ncurses qt5"
-
-DEPEND="
-	app-eselect/eselect-pinentry
-	>=dev-libs/libassuan-2.1
-	>=dev-libs/libgcrypt-1.6.3
-	>=dev-libs/libgpg-error-1.17
-	caps? ( sys-libs/libcap )
-	gnome-keyring? ( app-crypt/libsecret )
-	ncurses? ( sys-libs/ncurses:0= )
-	qt5? (
-		dev-qt/qtcore:5
-		dev-qt/qtgui:5
-		dev-qt/qtwidgets:5
-	)
-"
-RDEPEND="${DEPEND}
-	gtk? ( app-crypt/gcr )
-"
-BDEPEND="
-	sys-devel/gettext
-	virtual/pkgconfig
-"
-
-DOCS=( AUTHORS ChangeLog NEWS README THANKS TODO )
-
-PATCHES=(
-	"${FILESDIR}/${PN}-1.0.0-make-icon-work-under-Plasma-Wayland.patch"
-	"${FILESDIR}/${PN}-0.8.2-ncurses.patch"
-	"${FILESDIR}/${PN}-1.0.0-AR.patch"
-)
-
-src_prepare() {
-	default
-	unset FLTK_CONFIG
-	eautoreconf
-}
-
-src_configure() {
-	[[ "$(gcc-major-version)" -ge 5 ]] && append-cxxflags -std=gnu++11
-
-	export QTLIB="$(qt5_get_libdir)"
-
-	econf \
-		$(use_enable emacs pinentry-emacs) \
-		$(use_enable gnome-keyring libsecret) \
-		$(use_enable gtk pinentry-gnome3) \
-		$(use_enable ncurses fallback-curses) \
-		$(use_enable ncurses pinentry-curses) \
-		$(use_enable qt5 pinentry-qt) \
-		$(use_with caps libcap) \
-		--enable-pinentry-tty \
-		--disable-pinentry-fltk \
-		--disable-pinentry-gtk2 \
-		MOC="$(qt5_get_bindir)"/moc \
-		GPG_ERROR_CONFIG="${ESYSROOT}/usr/bin/${CHOST}-gpg-error-config" \
-		LIBASSUAN_CONFIG="${ESYSROOT}/usr/bin/libassuan-config" \
-		$("${S}/configure" --help | grep -- '--without-.*-prefix' | sed -e 's/^ *\([^ ]*\) .*/\1/g')
-}
-
-src_install() {
-	default
-	rm "${ED}"/usr/bin/pinentry || die
-
-	use qt5 && dosym pinentry-qt /usr/bin/pinentry-qt5
-}
-
-pkg_postinst() {
-	eselect pinentry update ifunset
-}
-
-pkg_postrm() {
-	eselect pinentry update ifunset
-}
diff --git a/app-crypt/pinentry/pinentry-1.2.0.ebuild b/app-crypt/pinentry/pinentry-1.2.0.ebuild
new file mode 100644
index 000000000000..14485afa8415
--- /dev/null
+++ b/app-crypt/pinentry/pinentry-1.2.0.ebuild
@@ -0,0 +1,90 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools flag-o-matic qmake-utils toolchain-funcs
+
+DESCRIPTION="Simple passphrase entry dialogs which utilize the Assuan protocol"
+HOMEPAGE="https://gnupg.org/aegypten2"
+SRC_URI="mirror://gnupg/${PN}/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+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="caps efl emacs gnome-keyring gtk ncurses qt5"
+
+DEPEND="
+	>=app-eselect/eselect-pinentry-0.7.2
+	>=dev-libs/libassuan-2.1
+	>=dev-libs/libgcrypt-1.6.3
+	>=dev-libs/libgpg-error-1.17
+	caps? ( sys-libs/libcap )
+	efl? ( dev-libs/efl[X] )
+	gnome-keyring? ( app-crypt/libsecret )
+	ncurses? ( sys-libs/ncurses:0= )
+	qt5? (
+		dev-qt/qtcore:5
+		dev-qt/qtgui:5
+		dev-qt/qtwidgets:5
+	)
+"
+RDEPEND="${DEPEND}
+	gtk? ( app-crypt/gcr[gtk] )
+"
+BDEPEND="
+	sys-devel/gettext
+	virtual/pkgconfig
+"
+
+DOCS=( AUTHORS ChangeLog NEWS README THANKS TODO )
+
+PATCHES=(
+	"${FILESDIR}/${PN}-1.0.0-make-icon-work-under-Plasma-Wayland.patch"
+	"${FILESDIR}/${PN}-0.8.2-ncurses.patch"
+	"${FILESDIR}/${PN}-1.0.0-AR.patch"
+)
+
+src_prepare() {
+	default
+	unset FLTK_CONFIG
+	eautoreconf
+}
+
+src_configure() {
+	[[ "$(gcc-major-version)" -ge 5 ]] && append-cxxflags -std=gnu++11
+
+	export QTLIB="$(qt5_get_libdir)"
+
+	econf \
+		$(use_enable efl pinentry-efl) \
+		$(use_enable emacs pinentry-emacs) \
+		$(use_enable gnome-keyring libsecret) \
+		$(use_enable gtk pinentry-gnome3) \
+		$(use_enable ncurses fallback-curses) \
+		$(use_enable ncurses pinentry-curses) \
+		$(use_enable qt5 pinentry-qt) \
+		$(use_with caps libcap) \
+		--enable-pinentry-tty \
+		--disable-pinentry-fltk \
+		--disable-pinentry-gtk2 \
+		MOC="$(qt5_get_bindir)"/moc \
+		GPG_ERROR_CONFIG="${ESYSROOT}/usr/bin/${CHOST}-gpg-error-config" \
+		LIBASSUAN_CONFIG="${ESYSROOT}/usr/bin/libassuan-config" \
+		$("${S}/configure" --help | grep -- '--without-.*-prefix' | sed -e 's/^ *\([^ ]*\) .*/\1/g')
+}
+
+src_install() {
+	default
+	rm "${ED}"/usr/bin/pinentry || die
+
+	use qt5 && dosym pinentry-qt /usr/bin/pinentry-qt5
+}
+
+pkg_postinst() {
+	eselect pinentry update ifunset
+}
+
+pkg_postrm() {
+	eselect pinentry update ifunset
+}
diff --git a/app-crypt/rhash/Manifest b/app-crypt/rhash/Manifest
index e184b820ad99..5e81ed2e0331 100644
--- a/app-crypt/rhash/Manifest
+++ b/app-crypt/rhash/Manifest
@@ -7,5 +7,5 @@ DIST rhash-1.4.1-src.tar.gz 413274 BLAKE2B 2027bccc677e8a1766f0624e67f475713653d
 DIST rhash-1.4.2-src.tar.gz 416853 BLAKE2B 06322825116cb00aa4987b01610d967eb57c94aa29b43348ec2c31f053fd471a900fcee776714263213e9a79eaf389b2e79d7b34a5afd3e98d68198193b5cbe7 SHA512 41df57e8b3f32c93d8e6f2ac668b32aaa23eb2eaf90a83f109e61e511404a5036ea88bcf2854e19c1ade0f61960e0d9edf01f3d82e1c645fed36579e9d7a6a25
 EBUILD rhash-1.3.6-r1.ebuild 1815 BLAKE2B 25d7980d3736edd66242acec9de12ef8bc434993a083dd2e12b3f382ca90aefbb42d4e96b35b6c42c106184e6956c8e33aac424d2272e1ae7eb77ead02f4d5af SHA512 15307b2110d89a05d3afdb6ee43a87f3ec33c921d7796cc73831d2d60c7e25df7531a73badb5a9721aa010b58dba74f1536bea7b7c9ec283e2a7ad1e430af1c4
 EBUILD rhash-1.4.1.ebuild 1885 BLAKE2B 65d6c7be3d3db04a2f43f1c1f4614ff3e812e56895ed7e0e0f8824e28a718224614366d08def5d1cb8f480744061b28ef00f08fe61e1859756af5cafeb0e282a SHA512 01e111abd4f61534bc6fef1ed0b76a085e377b698b0350855218e772927bc8adc557cc4e37928c9860649f775995a7e4da296bdb722b4589a5af13e3a4ef3f6b
-EBUILD rhash-1.4.2.ebuild 1885 BLAKE2B 65d6c7be3d3db04a2f43f1c1f4614ff3e812e56895ed7e0e0f8824e28a718224614366d08def5d1cb8f480744061b28ef00f08fe61e1859756af5cafeb0e282a SHA512 01e111abd4f61534bc6fef1ed0b76a085e377b698b0350855218e772927bc8adc557cc4e37928c9860649f775995a7e4da296bdb722b4589a5af13e3a4ef3f6b
+EBUILD rhash-1.4.2.ebuild 1891 BLAKE2B 3d91c3b3d806cef4e010c614060c45c0ddf9fa559321470c209eaa11b7a661428a98efc2d85224c4d4922be10f2df43c651b0bdbc0523e2cbf002a26949afcfa SHA512 924476fcc45ff97f78603c9475646247065647059b85de6bf79b03477250ed24e6c434af1933d1467561606a87892faa9b871db7557f6222c8c052af678bbf1b
 MISC metadata.xml 817 BLAKE2B eeb15cde9e06507f73330759d44dca59dea3bbcb972cb25af71d91f065eb64dbd1ddc61e43f8fad50c264c269542f92efdace36d3397647c3c53972e695da22f SHA512 3e2f688b57c74e051fcfb90d34685346c459c5e9f425266fd3d8e099f586037b14c2bfdac76f135a046c77cc850bb49954c0e7d8dc9ded1db47bf0919ab3ea93
diff --git a/app-crypt/rhash/rhash-1.4.2.ebuild b/app-crypt/rhash/rhash-1.4.2.ebuild
index 4aa5c894ec98..fd42272e981c 100644
--- a/app-crypt/rhash/rhash-1.4.2.ebuild
+++ b/app-crypt/rhash/rhash-1.4.2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}-src.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~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="debug nls ssl static-libs"
 
 RDEPEND="
diff --git a/app-crypt/swtpm/Manifest b/app-crypt/swtpm/Manifest
index 44b444c42719..46dbaa404283 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
-DIST swtpm-0.6.0.tar.gz 326049 BLAKE2B 52b310e4da1f256f440d9e0022cb6d5f5987b10aa85c8bf2837f5a5c61bc076f7d24d0a027987ef28ba0e7983a2fb04476103b88c33e3312536777366bf9b0cd SHA512 b12bb9cc486c50d0689a5655799c0d52f85d320a1d849fd56ee5c4b497472102c61b5d368f46a81e0b9feacc63b25b434bd6229f492951097af1e9c74a37cc96
-EBUILD swtpm-0.6.0-r1.ebuild 1431 BLAKE2B 5e69e9d650ce72204eee89c13a6c33286b96a105c2406808a13b62ac3ce63268cc2f117e99d2412548f655c9b1c349123db965af2219f86479f573a9d77da11c SHA512 2802637fe53e8ea728a2096830d4a564d1d7e85d12ad39e45f508f5518db1c3d27f240dcd3715bd6a276ba838acfb0c59d282e2a112ad39a8201c4073779595a
+DIST swtpm-0.6.1.tar.gz 326488 BLAKE2B 46c53cbd4195cfc1d45ef5e56b1f78c59dcb9f859349e161f07d9933ce720ec3511343cf29236119d08162410355fc50cb5d15745c84db78d860b006812c169f SHA512 a44e36820ad61e84d62b330f3adf0c463c98438056d74c5ba30916d956e722633e0198ae87be8352a0ab909ae5a4bbc3826410d2166186c43bba067f533fec85
+EBUILD swtpm-0.6.1.ebuild 1433 BLAKE2B a5f67396fc4132fc08dbc507f7a7beff6d3d35115b93607d668a2cb5301a3f0ded9985cc61dce1375fed3da62f435b7217017ced0af9da99d473a828ddca3259 SHA512 0bfc6b861f7bd45c41aea45e0b86384d66deee9ae0a7e3ed464ae6bef9233a92dff896d7ddbcd9deb05133438b67d716735a917b53b711dc9fdda173a3cc841f
 MISC metadata.xml 623 BLAKE2B 10e2a56c1ad2da7890bb641cdb368f0f512185cefd18356ef96c8e7b34a873c439e9f7d5d98e0e2f339a0a9f090cb372a1ef8d1cd7251efc115fc021ab05825c SHA512 edd9f7ccc6147cb92f32415ba3ed6ad9351a49fbff8655866c99e80f1782801df90a63f3ca40153bfb01d689ab642823cea5d6e144b0aede0ce6d7da8b48f5f1
diff --git a/app-crypt/swtpm/swtpm-0.6.0-r1.ebuild b/app-crypt/swtpm/swtpm-0.6.0-r1.ebuild
deleted file mode 100644
index 36e64df2d465..000000000000
--- a/app-crypt/swtpm/swtpm-0.6.0-r1.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8,9} )
-
-inherit autotools python-single-r1
-
-DESCRIPTION="Libtpms-based TPM emulator"
-HOMEPAGE="https://github.com/stefanberger/swtpm"
-SRC_URI="https://github.com/stefanberger/swtpm/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
-IUSE="fuse +gnutls seccomp test"
-RESTRICT="!test? ( test )"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="fuse? (
-		dev-libs/glib:2
-		sys-fs/fuse:0
-	)
-	gnutls? (
-		dev-libs/libtasn1:=
-		>=net-libs/gnutls-3.1.0[tools,pkcs11]
-	)
-	seccomp? ( sys-libs/libseccomp )
-	test? (
-		net-misc/socat
-		dev-tcltk/expect
-	)
-	acct-group/tss
-	acct-user/tss
-	dev-libs/openssl:0=
-	dev-libs/json-glib
-	dev-libs/libtpms
-	${PYTHON_DEPS}"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-0.6.0-fix-localca-path.patch"
-	"${FILESDIR}/${PN}-0.5.0-build-sys-Remove-WError.patch"
-)
-
-src_prepare() {
-	use test || eapply "${FILESDIR}/${PN}-0.5.0-disable-test-dependencies.patch"
-	default
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		--disable-static \
-		--with-openssl \
-		--without-selinux \
-		$(use_with fuse cuse) \
-		$(use_with gnutls) \
-		$(use_with seccomp)
-}
-
-src_install() {
-	default
-	fowners -R tss:root /var/lib/swtpm-localca
-	fperms 750 /var/lib/swtpm-localca
-	keepdir /var/lib/swtpm-localca
-	find "${D}" -name '*.la' -delete || die
-}
diff --git a/app-crypt/swtpm/swtpm-0.6.1.ebuild b/app-crypt/swtpm/swtpm-0.6.1.ebuild
new file mode 100644
index 000000000000..edfcad7512ff
--- /dev/null
+++ b/app-crypt/swtpm/swtpm-0.6.1.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{7,8,9} )
+
+inherit autotools python-single-r1
+
+DESCRIPTION="Libtpms-based TPM emulator"
+HOMEPAGE="https://github.com/stefanberger/swtpm"
+SRC_URI="https://github.com/stefanberger/swtpm/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+IUSE="fuse +gnutls seccomp test"
+RESTRICT="!test? ( test )"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="fuse? (
+		dev-libs/glib:2
+		sys-fs/fuse:0
+	)
+	gnutls? (
+		dev-libs/libtasn1:=
+		>=net-libs/gnutls-3.1.0:=[tools,pkcs11]
+	)
+	seccomp? ( sys-libs/libseccomp )
+	acct-group/tss
+	acct-user/tss
+	dev-libs/openssl:0=
+	dev-libs/json-glib
+	dev-libs/libtpms
+	${PYTHON_DEPS}"
+
+DEPEND="${RDEPEND}
+	test? (
+		net-misc/socat
+		dev-tcltk/expect
+	)"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-0.6.0-fix-localca-path.patch"
+	"${FILESDIR}/${PN}-0.5.0-build-sys-Remove-WError.patch"
+)
+
+src_prepare() {
+	use test || eapply "${FILESDIR}/${PN}-0.5.0-disable-test-dependencies.patch"
+	default
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		--with-openssl \
+		--without-selinux \
+		$(use_with fuse cuse) \
+		$(use_with gnutls) \
+		$(use_with seccomp)
+}
+
+src_install() {
+	default
+	fowners -R tss:root /var/lib/swtpm-localca
+	fperms 750 /var/lib/swtpm-localca
+	keepdir /var/lib/swtpm-localca
+	find "${D}" -name '*.la' -delete || die
+}
diff --git a/app-crypt/tpm2-abrmd/Manifest b/app-crypt/tpm2-abrmd/Manifest
index 1f935ee44c87..7daf15c8116d 100644
--- a/app-crypt/tpm2-abrmd/Manifest
+++ b/app-crypt/tpm2-abrmd/Manifest
@@ -1,5 +1,5 @@
 AUX tpm2-abrmd.confd 17 BLAKE2B f3b6301cb29f0f741c26025bded10af8948eb7f16faca051828b063f4fdab823309fac085e69e281600f77646f3e2bd91c1a5079bd675569aef8db762fdbe991 SHA512 ca7c4782ccc3ee7592bb4b24a6a81c624d22969cf9b9e1c3e22d45e85d3720836b1f22735ccf2ba51258c6eb0b30c4d88d7bed893f58b1aac7423fb7013529f9
 AUX tpm2-abrmd.initd 390 BLAKE2B 5dbaccf073eba208e13c24f92127e41c4c71fe62dd9bf2062301efbcc16daa1559ffba127399a189d6466e21a8cf9b85ac0e09d34f495be58430eb3cfe0886ef SHA512 aef622face110e22831dddab8a6474b4d003e6d50da9d334653a88ef0a7fca88377379a56fef9c404af5222c8c2fb97090eca913aa7d96183c4e14d7ab470044
 DIST tpm2-abrmd-2.4.0.tar.gz 575440 BLAKE2B 20c1fa772b016879adf28a67966450d64924bc1ac22b3111cf7376706335dc92fa8de97183d89c9d3ff5955dfb2a7617869469e9da61eb05847fd29b4a0208fd SHA512 c2ef05ca2db5a33d3067052779aa4c2485a63bd357d5fd90ef9d4644530b37aa28b906064eed3b15729131697a2a9d6b9cc3f05bea04810fd6601e405af48110
-EBUILD tpm2-abrmd-2.4.0.ebuild 1247 BLAKE2B bcdb64e32ca8c3574dd8965154456d156b280ca5b36ef421b7d774fbccca52967234bf2a9bcc6c21fe362773fc2c261ce3c03150ae894a260482895a8d6df058 SHA512 db9395c665dbc7b66c23f84609da325f39d3518c7b618a922a311c7e713105fb193fa2dab9ede08f3de2e1d76b7e6a6acb40033b02bf2f3731f21f9354dac321
+EBUILD tpm2-abrmd-2.4.0.ebuild 1252 BLAKE2B 3796e2fe7d0e2cf08a2a0a47c6b0a9efd6e775ec22bc8212a0b0dcb86c129006752ce89196b2b04f681acfdee4ff7b6f6826f72e57a014c67340a8c7eaae16e5 SHA512 ca2fbdac35e4436e63c66c1e967adf6b5a5b3ea3f4824ae227941d8167d4f56f21470e84c1b9156b82718c4dbbb682bfa13b6f8f56344f21496b3f0f47c88813
 MISC metadata.xml 493 BLAKE2B fd3fd8c23a18d535957ac767d6f1a8cc49a91ad362d02b3df87e14040d856c7f01341561fed23090b6776937d9cb11e7015d869fc5399620e9047f1644591e9d SHA512 2f72ada33f64c867a9b0a453919d0dbd444ba072abe3212fd6a3c2fb5bd337fb38b6ff0b8474345e6843160822d6c065261881799a9598de3a57045f09208667
diff --git a/app-crypt/tpm2-abrmd/tpm2-abrmd-2.4.0.ebuild b/app-crypt/tpm2-abrmd/tpm2-abrmd-2.4.0.ebuild
index 810e70d9967d..aaeac9af33b8 100644
--- a/app-crypt/tpm2-abrmd/tpm2-abrmd-2.4.0.ebuild
+++ b/app-crypt/tpm2-abrmd/tpm2-abrmd-2.4.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/tpm2-software/${PN}/releases/download/${PV}/${P}.tar
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 IUSE="static-libs test"
 
 RESTRICT="!test? ( test )"
diff --git a/app-crypt/tpm2-tools/Manifest b/app-crypt/tpm2-tools/Manifest
index c2848242f498..68948400c880 100644
--- a/app-crypt/tpm2-tools/Manifest
+++ b/app-crypt/tpm2-tools/Manifest
@@ -4,5 +4,5 @@ AUX tpm2-tools-5.1.1-no-efivar-automagic.patch 1083 BLAKE2B 10a8299a28ee54339ac7
 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
 EBUILD tpm2-tools-4.3.2.ebuild 1052 BLAKE2B 7c6f919d4a43a7c990803e12b9f2233c018975c01fe792aa6ea49a944ec4865c57fb947803c8e4b3360fcd5933e24607b0750fe90cdc9272c261f579eecc8997 SHA512 ed36b9a1721c02268e5990b9d63721bbcf0c09eb2360e3dc02f295d83c01b2f98aeb306def7052a79de6b98e10c7edc1ec46aff2009e1babacdbc681a9e33dfd
-EBUILD tpm2-tools-5.1.1-r2.ebuild 1647 BLAKE2B 941f93a6bc1798b75b57092c728a421b9b8f1d47cb679c3bc42739779b1c99f436e41c6133227c5e5c742b0749898f5a640447a195fd74c8efb390b2cf12ea1d SHA512 7235cfb7293cc0949e4562755b675a7f8128bacf5c92d8b558bd8631c26dcaae61910520c32a80e9ba9dca33eb0011f8733a7553b1884c7bf768dcf0495c6b19
+EBUILD tpm2-tools-5.1.1-r2.ebuild 1648 BLAKE2B 73ab30ec326263a71d298d5f88046ec3379e1bb4b13e4ebaeba67ebccb83cbd126103618dac1240db8c6562ede67bd8ebd52b27378e031c4afd831fe2c513f86 SHA512 6faf487b4da7b073d79ec59475f84e3e048302596ca97988c2ada9b26e8c7ac18b0699b456f56eed8ebaef6ae161afc76371f29be1ff235c4534a97fedb5289e
 MISC metadata.xml 560 BLAKE2B fe8daaba2a7586247537f8ed7b92769676b20f2c1377f7bb582dff49e06cf3f9beba4f79e28f10ea76d67d089eb152b060b091414dd9b47c5694ca153211421f SHA512 a744fcc50c7e44b1939190150404aee9054eab8e921e6f63cafa58dc80be5f20692632509de85399b6a9633701da72fd951e8bcfbe9e5177f315fa1dcbcc9ee5
diff --git a/app-crypt/tpm2-tools/tpm2-tools-5.1.1-r2.ebuild b/app-crypt/tpm2-tools/tpm2-tools-5.1.1-r2.ebuild
index 6fe96e4e93f3..6ede7d5e055c 100644
--- a/app-crypt/tpm2-tools/tpm2-tools-5.1.1-r2.ebuild
+++ b/app-crypt/tpm2-tools/tpm2-tools-5.1.1-r2.ebuild
@@ -12,12 +12,12 @@ SRC_URI="https://github.com/tpm2-software/${PN}/releases/download/${PV}/${P}.tar
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 IUSE="+fapi test"
 
-RDEPEND=">=app-crypt/tpm2-tss-3.0.1:=[fapi?]
+RDEPEND=">=app-crypt/tpm2-tss-3.0.1[fapi?]
 	dev-libs/openssl:=
-	net-misc/curl:=
+	net-misc/curl
 	sys-libs/efivar:=
 	${PYTHON_DEPS}"
 DEPEND="${RDEPEND}
-- 
cgit v1.2.3