gentoo resync : 20.03.2022

author: V3n3RiX <venerix@koprulu.sector> 2022-03-20 00:40:44 +0000
committer: V3n3RiX <venerix@koprulu.sector> 2022-03-20 00:40:44 +0000
commit: 4cbcc855382a06088e2f016f62cafdbcb7e40665 (patch)
tree: 356496503d52354aa6d9f2d36126302fed5f3a73 /app-crypt
parent: fcc5224904648a8e6eb528d7603154160a20022f (diff)
114 files changed, 2204 insertions, 730 deletions
diff --git a/app-crypt/Manifest.gz b/app-crypt/Manifest.gz
index 9b6c708b9ec4..2a57d66bd6ab 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 75ec7c4c0df8..c1ab262f66c3 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.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
+DIST acme.sh-3.0.2.tar.gz 248581 BLAKE2B 13d13a86a904909272c271d52d579065a7c84263ef2169b282b3bf270f33c7a8405aca640724120c08d1f495ea2a39035d46e1ec7f7eecfc093ce4dfa7c33b7d SHA512 6bd40951df02e3eaa1ed0efd8767acb5245e9c26c666ec7087db2cd0a38b65ea3c79ade98be954b4fbde0e89b6a988ac1c85ce2a6bd77b33574fb3fc0266ea03
+EBUILD acme-sh-3.0.2-r1.ebuild 1176 BLAKE2B a3556e98d9a7fda0b106568bd941e0fd47b66a1bb30f4849e07e352606f486e00a91dff59ed52e93bdaf92495795c37aa7d9b4770183bf06b8acb45f7e612196 SHA512 d27105ac59311219987d5fccd61a48e5090d79bf12880fe036a282da5be270c6a48193271fd7087a469de42fffa0481f307938abc09b656807bc6b63ef8bfb4a
+EBUILD acme-sh-9999.ebuild 1068 BLAKE2B 247f340859f63dbcc5827f0b9ca531913eaec3685180d86622e027f6984e9544e0dff7450c48770325fa49b94600bdfd1bcee03b8a5ab322b8160b700186f980 SHA512 9af2ba31be6a19e89d9ee34a9f444f752743dd8284b165c7d91c051c745b136b92416c576c6d73ef1fbe460893ac399ef4cfdd1aa70ff752281e6fba1bb2ac14
 MISC metadata.xml 677 BLAKE2B 783e74dfc78dc11568fe72316c5bd100d18fd5c90987d9c21386930f98713d6be5de74d395ed919a8dd7986f0bada50d16c24a670ba856318d103b186a514046 SHA512 6a34e252d900761bc12fe5b1f8d8b8277fded6685f8495a307de4906a19d797f2a4eb9b84676ae1f5f43720c092e3f3d081ec243dff19efa626d4d538974efc1
diff --git a/app-crypt/acme-sh/acme-sh-3.0.1.ebuild b/app-crypt/acme-sh/acme-sh-3.0.2-r1.ebuild
index a6b09a058aa2..388ce2e32f48 100644
--- a/app-crypt/acme-sh/acme-sh-3.0.1.ebuild
+++ b/app-crypt/acme-sh/acme-sh-3.0.2-r1.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 MY_PN="${PN/-/.}"
 MY_P="${MY_PN}-${PV}"
diff --git a/app-crypt/acme-sh/acme-sh-9999.ebuild b/app-crypt/acme-sh/acme-sh-9999.ebuild
index 978b348479ac..2298b3aea394 100644
--- a/app-crypt/acme-sh/acme-sh-9999.ebuild
+++ b/app-crypt/acme-sh/acme-sh-9999.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 inherit git-r3 optfeature
 
diff --git a/app-crypt/acme-tiny/Manifest b/app-crypt/acme-tiny/Manifest
index 5be973824902..d2bba176d7a1 100644
--- a/app-crypt/acme-tiny/Manifest
+++ b/app-crypt/acme-tiny/Manifest
@@ -1,4 +1,6 @@
 DIST acme-tiny-4.1.0.tar.gz 12776 BLAKE2B 7efd9d1399ec3bbd98180511c9f36fbf6f9a96a0d4e0e72b9d4c85d16246118eaaad25bc26ba42f746fd4b60b498ceca5307e279d788157237ac6ad153848501 SHA512 31d69a5031c019acbc23b3f06041eae8e261766396d4a7420fd70a71cfa16de953bea4c0c2ad0c6a6e793ed61ab5331f40145352ffce69f4f062f35dd0db7519
+DIST acme-tiny-5.0.1.tar.gz 21036 BLAKE2B a09c16ca19570b48d34c919e2a361e3be5d66ed8fc0ccff7af74e4018d294f2940a552906dee45bac27a16e7b039a3567dc35e201b058015c5123baa2cbb01c1 SHA512 6e0619917b31a5795c2c7d8aa811b46231b81fc6b57227f611f7f4b9f73eb3de669676482563c33d935a4a0812498677bcbe974663a561af61abb441a880947e
 EBUILD acme-tiny-4.1.0.ebuild 1108 BLAKE2B fe306b726c732ca03b672bc2cb7668b1125868daf5758b69312ca27e4ea71a3374b9d3ac00cebfe4459c566b68ee5fd807bf3cac1a44f64dd70afb2789a7c783 SHA512 bda714125cad2d2442539691630caf3de45498e0ac6a6e95211ec0e2e3a4fefc4a3d7b2c221359a7ac0b86a7d0126e361604dfb3c8a677b2c026b3fac61016fc
-EBUILD acme-tiny-9999.ebuild 1110 BLAKE2B 15dd4d5adf387cb805ca3b35bc31cb4ea3bb36a7835ddaa090126e3fbe229e0db9cb6ea251bb0fd00b7ddce9413809d4fe080b97bded7350b81988f1433c2cf2 SHA512 71e613afa351a85093024e09ef945b118479f0c1b74516642f7d866f454eecd24a2dde87afd36de6894fb66b1f4f339514acbe3439e8cad819abd3d87da57043
+EBUILD acme-tiny-5.0.1.ebuild 1115 BLAKE2B ad6d68f9de100b37eadad44105a8d541373663f97f233a1620cebf2055e97f1be701220a772e8fb92a24e69355f8c7f7fb97213c374abecf7869b9ce6b00dcfa SHA512 23a05a75412e621c550cea4ace83c98b5e4b41c76b988cc3c93899ead5de63fdd7e4b57749d0ffd8fe1e692d7985c70284718c64b44283349c7858cdaabca74a
+EBUILD acme-tiny-9999.ebuild 1115 BLAKE2B ad6d68f9de100b37eadad44105a8d541373663f97f233a1620cebf2055e97f1be701220a772e8fb92a24e69355f8c7f7fb97213c374abecf7869b9ce6b00dcfa SHA512 23a05a75412e621c550cea4ace83c98b5e4b41c76b988cc3c93899ead5de63fdd7e4b57749d0ffd8fe1e692d7985c70284718c64b44283349c7858cdaabca74a
 MISC metadata.xml 332 BLAKE2B e5e439ca9e8a4809dc6d76d879d1d0708475d59c39c47724e2fd1375bb0026fc6d470c893abc02a5d0d2f06e0538ae024265cbd76c056d87375db02867512684 SHA512 36f47d97f15ef341b5ae81d23e85d94cf02ce71d6a20b7bdcdc16ef0c36a091c99e09ebe86f05aac789a36f1dcd71819832b53a4d835a1a12cd468e1b3f132e5
diff --git a/app-crypt/acme-tiny/acme-tiny-5.0.1.ebuild b/app-crypt/acme-tiny/acme-tiny-5.0.1.ebuild
new file mode 100644
index 000000000000..b1ca9c31e4af
--- /dev/null
+++ b/app-crypt/acme-tiny/acme-tiny-5.0.1.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python{3_7,3_8,3_9,3_10} )
+inherit distutils-r1
+
+if [[ ${PV} == 9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/diafygi/${PN}.git"
+else
+	SRC_URI="https://github.com/diafygi/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+DESCRIPTION="A tiny, auditable script for Let's Encrypt's ACME Protocol"
+HOMEPAGE="https://github.com/diafygi/acme-tiny"
+
+LICENSE="MIT"
+SLOT="0"
+IUSE=""
+
+DEPEND="dev-python/setuptools_scm[${PYTHON_USEDEP}]"
+RDEPEND="dev-libs/openssl:0"
+
+pkg_setup() {
+	if [[ ${PV} != 9999 ]]; then
+		export SETUPTOOLS_SCM_PRETEND_VERSION="${PV}"
+	fi
+}
+
+src_prepare() {
+	sed -i 's|#!/usr/bin/sh|#!/bin/sh|g' README.md || die
+
+	distutils-r1_src_prepare
+}
+
+pkg_postinst() {
+	for v in ${REPLACING_VERSIONS}; do
+		if ver_test "$v" "-lt" "4.0.3" || ver_test "$v" "-ge" "9999"; then
+			einfo "The --account-email flag has been changed to --contact and"
+			einfo "has different syntax."
+			einfo "Please update your scripts accordingly"
+		fi
+	done
+}
diff --git a/app-crypt/acme-tiny/acme-tiny-9999.ebuild b/app-crypt/acme-tiny/acme-tiny-9999.ebuild
index 5c6c1c7e6e6b..b1ca9c31e4af 100644
--- a/app-crypt/acme-tiny/acme-tiny-9999.ebuild
+++ b/app-crypt/acme-tiny/acme-tiny-9999.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python{3_7,3_8,3_9} )
+PYTHON_COMPAT=( python{3_7,3_8,3_9,3_10} )
 inherit distutils-r1
 
 if [[ ${PV} == 9999 ]]; then
diff --git a/app-crypt/acme/Manifest b/app-crypt/acme/Manifest
index 6da4dbcf9a64..ed6fadaf73af 100644
--- a/app-crypt/acme/Manifest
+++ b/app-crypt/acme/Manifest
@@ -1,6 +1,10 @@
-DIST certbot-1.21.0.tar.gz 1343180 BLAKE2B 79bbaafe96bca4cee9aabb39f4e9f1f12be4d2e1d9c1b156966061606ac3b07e5d80c5053baa03698e5513477076ca8f604aff43f77ee7f45d70d4b88429a875 SHA512 11ea781c5113cf68e3a76cafc2cf38d5ebc9cdb2f40a79eae0cdeac5d40f8dac05a4c71a269d5a6ff78027a1db0676195a8413e28a87d00aaf1602f6f2ce5b5e
 DIST certbot-1.22.0.tar.gz 1352714 BLAKE2B 213dc08d3a88e0d20d6324c026a47eb96b9e45fbde41f79e37c2e62c655d7c6df01292e110d2e78ea085dfc62ef3c7b623279224029c9ae2a59e69c5c00054a5 SHA512 9a7a0d11e9fd5bd59b526a2cc5d0029b972e34a2bf41035c2d8ab535b93fc6d985ee8ea3dd5e50a7f4af80450135b739d1297245ad21b47b8362cddb03738932
-EBUILD acme-1.21.0.ebuild 1130 BLAKE2B 0a3e35c7110e98d83ca94176a202b461797fd15bb0eac51ffc0e5983113ab1fcb4590e035ff561c918fd708415f700d42539764a9a9969097aec89a00058fdfb SHA512 14361c6e901b27f14df766830f99e1a5e9e67d278f161ff0ef9935f82a5ee1f90302572508de335c14f82b9c54ae014ae310da9ee54fecb34448427259dd3a7f
+DIST certbot-1.23.0.tar.gz 1361107 BLAKE2B a1b1e029436eb32840d56ca815478df3774a30b69552c5f7a4ca18b054a49c8ce342fe7f7ffecfb6c0fb93338bb722d57e4537e1f142ab162bb8208575ee34be SHA512 bb64139c6406e7c87571beb94d435e079368cbb249d96b522dab72a9529b3a825f9258aac70c5a582d58117c700da281fb43ed8369f40a236c0b7e6acb5237b0
+DIST certbot-1.24.0.tar.gz 1360049 BLAKE2B e1c7f4b56ac66b73f74eb8c9d6c31bc12529c2e7a1a51679e715227e61a2e72a30aa5053abe1684be9d665e399ca67f2d11afcc5c60c76bb86d1c0feb68308ca SHA512 fa2a45e650107f48da1e5d7d7469e8a23598e0e0e1127bc62a66ba2351a8fe518da6ec3e53370f7042631ee74e82c65fcc323c71e8f485911363e805ccb6f045
+DIST certbot-1.25.0.tar.gz 1362891 BLAKE2B c109f7777328dcaa2760b524a005f648f8695518a3a052a1d3ff20367f0b704c2a15c912ede091ef6f0f2faf2838caaa74d3bdac6deeb4cc069e6ca16cfb26a7 SHA512 e32cac530d7854cb626aed6d7bac7b4482b7c3634d94fbabd6fa767f9c1268ed3baed0c945362df247e4fc7d51147e5561825850d52c1a8f11b3a1fb2827bd4a
 EBUILD acme-1.22.0.ebuild 1130 BLAKE2B 686d479517c169a35bdc3daf40f17b123e639dd1406b82258f566cc7dfde4131b4ec2e269cd7339c0d20da879d065aaca0aa642049d87094c6fdc7123aa00e3c SHA512 fba7946f9741ddbffe8afcb8cb6237617b0535e225f99fd2a61e89ea4132f1d7f838948e172862f866bdfd64e0f7a0a7299041acae1a9a5944bdb51943c43fb5
-EBUILD acme-9999.ebuild 1132 BLAKE2B 3b780ac735a4cb090ed5ff957907ce84f06a547b3697988062079304c7bd2a62bfe97b2a78d1a86ac3a991f5799fd7cfdaec761a213d512471e3956c9548e0ee SHA512 44736aef064be9fdbfd90357792200ea43facf02ab74b318d4233eafce7fd2a06bc14ad37dfa8b8e2a8186efdbf88dfe5ae5a2b80366ae0c0aa6c01af4ab29c3
+EBUILD acme-1.23.0.ebuild 1131 BLAKE2B 6e845db59eae454ae90bab6d1b28fd93fbe41a7400f23d4f21cc3613066cb13de266dca8264d9cd2d669c4a5fb25fd27eac0067fa15405ddfb0fb9c9fa05079c SHA512 2880e2bde0e06bfec48bb874988ec4c7c7fe5675ae5b3f00cb36ad13d831907b7d4a93c4b4e87337fc6b8faec226ef49589342f9e7e7b4e7d060e1ced13b4f92
+EBUILD acme-1.24.0.ebuild 1142 BLAKE2B 1d2e44a6f63e7c436942cfbaa893abfd6cccc0a082ed18172a3d11ce861ca6e9404892e001c1a4cc54c31a2b8d374aebdde4502d8b6c68b3d98d3bad9243dd4e SHA512 fd160b081473becdbb9edb1d4ade5e791318c9762f0ff1a9684548866a0e2432196c62271a2e9e695b36f431901288a13d1497b253e7451c35c076ce25a57d7a
+EBUILD acme-1.25.0.ebuild 1142 BLAKE2B 53a5d26bdec0161638b21e37b8f274de986e029568ec4ac83fa92fe4ba5596f7b30b6cc07527f2c251a3009ab851ea57ff7c1c298d59defa65fde67647815c0f SHA512 dcb6317e211f649b2b4923d3912761454e72094bab3ca505194eef240deabadade81f7bf49c42e42d3b1e77398130c7dd85092ea593523b66c3ade7d82273d5b
+EBUILD acme-9999.ebuild 1142 BLAKE2B 53a5d26bdec0161638b21e37b8f274de986e029568ec4ac83fa92fe4ba5596f7b30b6cc07527f2c251a3009ab851ea57ff7c1c298d59defa65fde67647815c0f SHA512 dcb6317e211f649b2b4923d3912761454e72094bab3ca505194eef240deabadade81f7bf49c42e42d3b1e77398130c7dd85092ea593523b66c3ade7d82273d5b
 MISC metadata.xml 401 BLAKE2B 30a2ac1f03749a8e3bb98723c57f47ab6bcf7bfa58c2b6e21c309fae279feca0d3612df6c2a1dafaf27b4f0781c583a140322feac1a1cf2c13e50861cad129ea SHA512 d8e725b71ca81ce4ca6565ed58271b283c25394448f0f48f726f232122577c33d5b2d726e117419b2fae99f9dae29a8080bb9564eccbca13368c83988cf3da01
diff --git a/app-crypt/acme/acme-1.21.0.ebuild b/app-crypt/acme/acme-1.23.0.ebuild
index ea5170d5a8c6..24fb5b46fab7 100644
--- a/app-crypt/acme/acme-1.21.0.ebuild
+++ b/app-crypt/acme/acme-1.23.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -26,8 +26,8 @@ SLOT="0"
 
 RDEPEND="
 	dev-python/chardet[${PYTHON_USEDEP}]
-	>=dev-python/cryptography-2.1.4[${PYTHON_USEDEP}]
-	>=dev-python/josepy-1.9.0[${PYTHON_USEDEP}]
+	>=dev-python/cryptography-2.5.0[${PYTHON_USEDEP}]
+	>=dev-python/josepy-1.10.0[${PYTHON_USEDEP}]
 	>=dev-python/pyopenssl-17.3.0[${PYTHON_USEDEP}]
 	dev-python/pyrfc3339[${PYTHON_USEDEP}]
 	dev-python/pytz[${PYTHON_USEDEP}]
diff --git a/app-crypt/acme/acme-1.24.0.ebuild b/app-crypt/acme/acme-1.24.0.ebuild
new file mode 100644
index 000000000000..1d353f46ad14
--- /dev/null
+++ b/app-crypt/acme/acme-1.24.0.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+DISTUTILS_USE_SETUPTOOLS=rdepend
+
+inherit distutils-r1
+
+if [[ ${PV} == 9999* ]]; then
+	EGIT_REPO_URI="https://github.com/certbot/certbot.git"
+	inherit git-r3
+	S=${WORKDIR}/${P}/${PN}
+else
+	SRC_URI="https://github.com/certbot/certbot/archive/v${PV}.tar.gz -> certbot-${PV}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+	S=${WORKDIR}/certbot-${PV}/acme
+fi
+
+DESCRIPTION="An implementation of the ACME protocol"
+HOMEPAGE="https://github.com/certbot/certbot https://letsencrypt.org/"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+
+RDEPEND="
+	dev-python/chardet[${PYTHON_USEDEP}]
+	>=dev-python/cryptography-2.5.0[${PYTHON_USEDEP}]
+	>=dev-python/josepy-1.10.0[${PYTHON_USEDEP}]
+	>=dev-python/pyopenssl-17.3.0[${PYTHON_USEDEP}]
+	dev-python/pyrfc3339[${PYTHON_USEDEP}]
+	>=dev-python/pytz-2019.3[${PYTHON_USEDEP}]
+	>=dev-python/requests-2.20.0[${PYTHON_USEDEP}]
+	>=dev-python/requests-toolbelt-0.3.0[${PYTHON_USEDEP}]
+"
+
+distutils_enable_sphinx docs dev-python/sphinx_rtd_theme
+distutils_enable_tests pytest
diff --git a/app-crypt/acme/acme-1.25.0.ebuild b/app-crypt/acme/acme-1.25.0.ebuild
new file mode 100644
index 000000000000..be518d606627
--- /dev/null
+++ b/app-crypt/acme/acme-1.25.0.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+DISTUTILS_USE_SETUPTOOLS=rdepend
+
+inherit distutils-r1
+
+if [[ ${PV} == 9999* ]]; then
+	EGIT_REPO_URI="https://github.com/certbot/certbot.git"
+	inherit git-r3
+	S=${WORKDIR}/${P}/${PN}
+else
+	SRC_URI="https://github.com/certbot/certbot/archive/v${PV}.tar.gz -> certbot-${PV}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+	S=${WORKDIR}/certbot-${PV}/acme
+fi
+
+DESCRIPTION="An implementation of the ACME protocol"
+HOMEPAGE="https://github.com/certbot/certbot https://letsencrypt.org/"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+
+RDEPEND="
+	dev-python/chardet[${PYTHON_USEDEP}]
+	>=dev-python/cryptography-2.5.0[${PYTHON_USEDEP}]
+	>=dev-python/josepy-1.13.0[${PYTHON_USEDEP}]
+	>=dev-python/pyopenssl-17.3.0[${PYTHON_USEDEP}]
+	dev-python/pyrfc3339[${PYTHON_USEDEP}]
+	>=dev-python/pytz-2019.3[${PYTHON_USEDEP}]
+	>=dev-python/requests-2.20.0[${PYTHON_USEDEP}]
+	>=dev-python/requests-toolbelt-0.3.0[${PYTHON_USEDEP}]
+"
+
+distutils_enable_sphinx docs dev-python/sphinx_rtd_theme
+distutils_enable_tests pytest
diff --git a/app-crypt/acme/acme-9999.ebuild b/app-crypt/acme/acme-9999.ebuild
index 7ff144bc4928..be518d606627 100644
--- a/app-crypt/acme/acme-9999.ebuild
+++ b/app-crypt/acme/acme-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -27,11 +27,11 @@ SLOT="0"
 RDEPEND="
 	dev-python/chardet[${PYTHON_USEDEP}]
 	>=dev-python/cryptography-2.5.0[${PYTHON_USEDEP}]
-	>=dev-python/josepy-1.9.0[${PYTHON_USEDEP}]
+	>=dev-python/josepy-1.13.0[${PYTHON_USEDEP}]
 	>=dev-python/pyopenssl-17.3.0[${PYTHON_USEDEP}]
 	dev-python/pyrfc3339[${PYTHON_USEDEP}]
-	dev-python/pytz[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.14.2[${PYTHON_USEDEP}]
+	>=dev-python/pytz-2019.3[${PYTHON_USEDEP}]
+	>=dev-python/requests-2.20.0[${PYTHON_USEDEP}]
 	>=dev-python/requests-toolbelt-0.3.0[${PYTHON_USEDEP}]
 "
 
diff --git a/app-crypt/certbot-apache/Manifest b/app-crypt/certbot-apache/Manifest
index 1e5cae95688a..1bf3a58e0564 100644
--- a/app-crypt/certbot-apache/Manifest
+++ b/app-crypt/certbot-apache/Manifest
@@ -1,6 +1,10 @@
-DIST certbot-1.21.0.tar.gz 1343180 BLAKE2B 79bbaafe96bca4cee9aabb39f4e9f1f12be4d2e1d9c1b156966061606ac3b07e5d80c5053baa03698e5513477076ca8f604aff43f77ee7f45d70d4b88429a875 SHA512 11ea781c5113cf68e3a76cafc2cf38d5ebc9cdb2f40a79eae0cdeac5d40f8dac05a4c71a269d5a6ff78027a1db0676195a8413e28a87d00aaf1602f6f2ce5b5e
 DIST certbot-1.22.0.tar.gz 1352714 BLAKE2B 213dc08d3a88e0d20d6324c026a47eb96b9e45fbde41f79e37c2e62c655d7c6df01292e110d2e78ea085dfc62ef3c7b623279224029c9ae2a59e69c5c00054a5 SHA512 9a7a0d11e9fd5bd59b526a2cc5d0029b972e34a2bf41035c2d8ab535b93fc6d985ee8ea3dd5e50a7f4af80450135b739d1297245ad21b47b8362cddb03738932
-EBUILD certbot-apache-1.21.0.ebuild 945 BLAKE2B 5ec08b80fcce13df8f20cc1d2710abac4a8ed4e0847682b287c374921d2b7d301b75f34bce9090057548f5b1630f605a62fc3ffcfee3f13dff3f860350e04728 SHA512 8af41c92c60da9608015574316a2b776a8893b97e731d0bd779b200a2051708d3e6b2b98a0f140ed1c725bf697d56001cf608d51b68916c6e5fe6f19c40fb09d
+DIST certbot-1.23.0.tar.gz 1361107 BLAKE2B a1b1e029436eb32840d56ca815478df3774a30b69552c5f7a4ca18b054a49c8ce342fe7f7ffecfb6c0fb93338bb722d57e4537e1f142ab162bb8208575ee34be SHA512 bb64139c6406e7c87571beb94d435e079368cbb249d96b522dab72a9529b3a825f9258aac70c5a582d58117c700da281fb43ed8369f40a236c0b7e6acb5237b0
+DIST certbot-1.24.0.tar.gz 1360049 BLAKE2B e1c7f4b56ac66b73f74eb8c9d6c31bc12529c2e7a1a51679e715227e61a2e72a30aa5053abe1684be9d665e399ca67f2d11afcc5c60c76bb86d1c0feb68308ca SHA512 fa2a45e650107f48da1e5d7d7469e8a23598e0e0e1127bc62a66ba2351a8fe518da6ec3e53370f7042631ee74e82c65fcc323c71e8f485911363e805ccb6f045
+DIST certbot-1.25.0.tar.gz 1362891 BLAKE2B c109f7777328dcaa2760b524a005f648f8695518a3a052a1d3ff20367f0b704c2a15c912ede091ef6f0f2faf2838caaa74d3bdac6deeb4cc069e6ca16cfb26a7 SHA512 e32cac530d7854cb626aed6d7bac7b4482b7c3634d94fbabd6fa767f9c1268ed3baed0c945362df247e4fc7d51147e5561825850d52c1a8f11b3a1fb2827bd4a
 EBUILD certbot-apache-1.22.0.ebuild 945 BLAKE2B 11822156671a8a090c234685393f7a1e832f03eb168d7c65775163fbbfde98cf47e106466e68f11b0036536bd380764bc153ce7f73e9b2b1115893324ad8a621 SHA512 aa6605c150f841510e7b1eee3ef4a8a2edd4f9cccb28dd66d3c3ad9aac029c0b3c6c0aff189ca9e2621fba93ad0cb11a80a6f7ea75892d4c32876cd381752c6f
+EBUILD certbot-apache-1.23.0.ebuild 945 BLAKE2B 11822156671a8a090c234685393f7a1e832f03eb168d7c65775163fbbfde98cf47e106466e68f11b0036536bd380764bc153ce7f73e9b2b1115893324ad8a621 SHA512 aa6605c150f841510e7b1eee3ef4a8a2edd4f9cccb28dd66d3c3ad9aac029c0b3c6c0aff189ca9e2621fba93ad0cb11a80a6f7ea75892d4c32876cd381752c6f
+EBUILD certbot-apache-1.24.0.ebuild 947 BLAKE2B 57472217512ae222c82d13b4f4d9ad0298c4ecf3f177714e0fa82486e94b6f49a2db45ec125c1af349e63cd24c432f3e24d67f61e2725da031988d38aa8dfa09 SHA512 2712fed72fa6a444ec6fd048cb47760580c432eb73ae2bd6167523a7e512489b241d7f7eef567980b2d188c9755abc35b3cd304044b6e5304aa002901c5cf9b3
+EBUILD certbot-apache-1.25.0.ebuild 947 BLAKE2B 57472217512ae222c82d13b4f4d9ad0298c4ecf3f177714e0fa82486e94b6f49a2db45ec125c1af349e63cd24c432f3e24d67f61e2725da031988d38aa8dfa09 SHA512 2712fed72fa6a444ec6fd048cb47760580c432eb73ae2bd6167523a7e512489b241d7f7eef567980b2d188c9755abc35b3cd304044b6e5304aa002901c5cf9b3
 EBUILD certbot-apache-9999.ebuild 947 BLAKE2B 5da53f56cef939f37cefd63251b522b54c18e30db386a229413bcc3a02605984194d1ea4c5647fa895a9502d254fcb9b73f5575fb7096f31df51f1e0b17659a5 SHA512 79358b1fe949ee2302a2db4c72b55bce960b0ba9aafff3cc50ee86e886c80a1337f086166646cb7f9e1baa8ead34dd43188feb53516321acd297e55a7475535b
 MISC metadata.xml 359 BLAKE2B 7f8ac46ecea304579baca80978cc35905720d1950caa183b5b5b297afab8bf6ea328324bacc438e9ecd91176230e42e55deda1c15e1ba73c63b2021ac2842c0f SHA512 a50b1db5a30eac290ac6645fcb30b0d5c4d8e51d83cff284e76358ee4fe7cef9366e40b06f532ba64a2131672972ea10b73541a9bd42cc323c17f6d26f6b0197
diff --git a/app-crypt/certbot-apache/certbot-apache-1.21.0.ebuild b/app-crypt/certbot-apache/certbot-apache-1.23.0.ebuild
index 4ced4681cfbc..85b55229a0d2 100644
--- a/app-crypt/certbot-apache/certbot-apache-1.21.0.ebuild
+++ b/app-crypt/certbot-apache/certbot-apache-1.23.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
diff --git a/app-crypt/certbot-apache/certbot-apache-1.24.0.ebuild b/app-crypt/certbot-apache/certbot-apache-1.24.0.ebuild
new file mode 100644
index 000000000000..cf0c9621b1ae
--- /dev/null
+++ b/app-crypt/certbot-apache/certbot-apache-1.24.0.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{8..10} )
+DISTUTILS_USE_SETUPTOOLS=rdepend
+
+if [[ ${PV} == 9999* ]]; then
+	EGIT_REPO_URI="https://github.com/certbot/certbot.git"
+	inherit git-r3
+	S=${WORKDIR}/${P}/${PN}
+else
+	SRC_URI="https://github.com/${PN%-apache}/${PN%-apache}/archive/v${PV}.tar.gz -> ${PN%-apache}-${PV}.tar.gz"
+	KEYWORDS="~amd64 ~arm64 ~x86"
+	S=${WORKDIR}/${PN%-apache}-${PV}/${PN}
+fi
+
+inherit distutils-r1
+
+DESCRIPTION="Apache plugin for certbot (Let's Encrypt Client)"
+HOMEPAGE="https://github.com/certbot/certbot https://letsencrypt.org/"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+
+RDEPEND=">=app-crypt/acme-${PV}[${PYTHON_USEDEP}]
+	>=app-crypt/certbot-${PV}[${PYTHON_USEDEP}]
+	dev-python/python-augeas[${PYTHON_USEDEP}]
+	dev-python/zope-component[${PYTHON_USEDEP}]
+	dev-python/zope-interface[${PYTHON_USEDEP}]"
+
+distutils_enable_tests pytest
diff --git a/app-crypt/certbot-apache/certbot-apache-1.25.0.ebuild b/app-crypt/certbot-apache/certbot-apache-1.25.0.ebuild
new file mode 100644
index 000000000000..cf0c9621b1ae
--- /dev/null
+++ b/app-crypt/certbot-apache/certbot-apache-1.25.0.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{8..10} )
+DISTUTILS_USE_SETUPTOOLS=rdepend
+
+if [[ ${PV} == 9999* ]]; then
+	EGIT_REPO_URI="https://github.com/certbot/certbot.git"
+	inherit git-r3
+	S=${WORKDIR}/${P}/${PN}
+else
+	SRC_URI="https://github.com/${PN%-apache}/${PN%-apache}/archive/v${PV}.tar.gz -> ${PN%-apache}-${PV}.tar.gz"
+	KEYWORDS="~amd64 ~arm64 ~x86"
+	S=${WORKDIR}/${PN%-apache}-${PV}/${PN}
+fi
+
+inherit distutils-r1
+
+DESCRIPTION="Apache plugin for certbot (Let's Encrypt Client)"
+HOMEPAGE="https://github.com/certbot/certbot https://letsencrypt.org/"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+
+RDEPEND=">=app-crypt/acme-${PV}[${PYTHON_USEDEP}]
+	>=app-crypt/certbot-${PV}[${PYTHON_USEDEP}]
+	dev-python/python-augeas[${PYTHON_USEDEP}]
+	dev-python/zope-component[${PYTHON_USEDEP}]
+	dev-python/zope-interface[${PYTHON_USEDEP}]"
+
+distutils_enable_tests pytest
diff --git a/app-crypt/certbot-nginx/Manifest b/app-crypt/certbot-nginx/Manifest
index eb5cee12ebb8..5f6e6c804844 100644
--- a/app-crypt/certbot-nginx/Manifest
+++ b/app-crypt/certbot-nginx/Manifest
@@ -1,6 +1,10 @@
-DIST certbot-1.21.0.tar.gz 1343180 BLAKE2B 79bbaafe96bca4cee9aabb39f4e9f1f12be4d2e1d9c1b156966061606ac3b07e5d80c5053baa03698e5513477076ca8f604aff43f77ee7f45d70d4b88429a875 SHA512 11ea781c5113cf68e3a76cafc2cf38d5ebc9cdb2f40a79eae0cdeac5d40f8dac05a4c71a269d5a6ff78027a1db0676195a8413e28a87d00aaf1602f6f2ce5b5e
 DIST certbot-1.22.0.tar.gz 1352714 BLAKE2B 213dc08d3a88e0d20d6324c026a47eb96b9e45fbde41f79e37c2e62c655d7c6df01292e110d2e78ea085dfc62ef3c7b623279224029c9ae2a59e69c5c00054a5 SHA512 9a7a0d11e9fd5bd59b526a2cc5d0029b972e34a2bf41035c2d8ab535b93fc6d985ee8ea3dd5e50a7f4af80450135b739d1297245ad21b47b8362cddb03738932
-EBUILD certbot-nginx-1.21.0.ebuild 963 BLAKE2B 20859aa73cec63010791a78c32e72f719d80f707f2d0e69fde17c033cf97cd74b8924e65913d9301222ca9c4f6129328b03989f46df88200b5bf1be3f6357565 SHA512 da4806d3e91315b41f4c9fac029dc56024b3386073d706b7cc558054aa3a3614361c439e769979ae9ea1cea01b8f334596a68267dec6e96b4977b6842879e5e7
+DIST certbot-1.23.0.tar.gz 1361107 BLAKE2B a1b1e029436eb32840d56ca815478df3774a30b69552c5f7a4ca18b054a49c8ce342fe7f7ffecfb6c0fb93338bb722d57e4537e1f142ab162bb8208575ee34be SHA512 bb64139c6406e7c87571beb94d435e079368cbb249d96b522dab72a9529b3a825f9258aac70c5a582d58117c700da281fb43ed8369f40a236c0b7e6acb5237b0
+DIST certbot-1.24.0.tar.gz 1360049 BLAKE2B e1c7f4b56ac66b73f74eb8c9d6c31bc12529c2e7a1a51679e715227e61a2e72a30aa5053abe1684be9d665e399ca67f2d11afcc5c60c76bb86d1c0feb68308ca SHA512 fa2a45e650107f48da1e5d7d7469e8a23598e0e0e1127bc62a66ba2351a8fe518da6ec3e53370f7042631ee74e82c65fcc323c71e8f485911363e805ccb6f045
+DIST certbot-1.25.0.tar.gz 1362891 BLAKE2B c109f7777328dcaa2760b524a005f648f8695518a3a052a1d3ff20367f0b704c2a15c912ede091ef6f0f2faf2838caaa74d3bdac6deeb4cc069e6ca16cfb26a7 SHA512 e32cac530d7854cb626aed6d7bac7b4482b7c3634d94fbabd6fa767f9c1268ed3baed0c945362df247e4fc7d51147e5561825850d52c1a8f11b3a1fb2827bd4a
 EBUILD certbot-nginx-1.22.0.ebuild 963 BLAKE2B 20859aa73cec63010791a78c32e72f719d80f707f2d0e69fde17c033cf97cd74b8924e65913d9301222ca9c4f6129328b03989f46df88200b5bf1be3f6357565 SHA512 da4806d3e91315b41f4c9fac029dc56024b3386073d706b7cc558054aa3a3614361c439e769979ae9ea1cea01b8f334596a68267dec6e96b4977b6842879e5e7
-EBUILD certbot-nginx-9999.ebuild 965 BLAKE2B 5174d7283c5de25679baf14a22ad794df9ede6221a6abfae60b4a0fd3019be86066ac9b1adee0d6bad18c683a550ec27fa217868ab80e636a74872b705de069c SHA512 ee24e655d37d9ab56472a781d4025a649d532e2fdc5583e0a75dd9dd6c9813e8facae9af52154f6f515cf738073dc2be0718bace1d5fb3ec79afc39505fde698
+EBUILD certbot-nginx-1.23.0.ebuild 963 BLAKE2B 20859aa73cec63010791a78c32e72f719d80f707f2d0e69fde17c033cf97cd74b8924e65913d9301222ca9c4f6129328b03989f46df88200b5bf1be3f6357565 SHA512 da4806d3e91315b41f4c9fac029dc56024b3386073d706b7cc558054aa3a3614361c439e769979ae9ea1cea01b8f334596a68267dec6e96b4977b6842879e5e7
+EBUILD certbot-nginx-1.24.0.ebuild 965 BLAKE2B 7b098dd3c540c9fe96750722a696386de685db8e4bc62689e08cc298b3d53fd8561411f7e8366b93999a49aaf2f7dcca7c5b483a49ba873ef7c746f49a36001c SHA512 4acb894e4d79fd1b989cc03cc738a6bc81605eb6d889c31f73a2398aead9b46a5cfbea8c0adc07f079adc21dbcb10655135024bbe2d091fdb748d71b0ff98539
+EBUILD certbot-nginx-1.25.0.ebuild 965 BLAKE2B 7b098dd3c540c9fe96750722a696386de685db8e4bc62689e08cc298b3d53fd8561411f7e8366b93999a49aaf2f7dcca7c5b483a49ba873ef7c746f49a36001c SHA512 4acb894e4d79fd1b989cc03cc738a6bc81605eb6d889c31f73a2398aead9b46a5cfbea8c0adc07f079adc21dbcb10655135024bbe2d091fdb748d71b0ff98539
+EBUILD certbot-nginx-9999.ebuild 965 BLAKE2B 7b098dd3c540c9fe96750722a696386de685db8e4bc62689e08cc298b3d53fd8561411f7e8366b93999a49aaf2f7dcca7c5b483a49ba873ef7c746f49a36001c SHA512 4acb894e4d79fd1b989cc03cc738a6bc81605eb6d889c31f73a2398aead9b46a5cfbea8c0adc07f079adc21dbcb10655135024bbe2d091fdb748d71b0ff98539
 MISC metadata.xml 335 BLAKE2B 048854ec6bc919f9bf9b0bc74e7c291841cbfea0e571f43437937c5dd78cc65f9df53463adcf313441e01323491709b462bd9bc364876eb1508a83b3426b6b78 SHA512 25ac45574a568e362c419dfbeade4a977afa2885e7b32fb4c3d4c765450b09aa98cf419df1a39ab194518ad6f2b582e162d4dd4eec14f278635d63bf66352523
diff --git a/app-crypt/certbot-nginx/certbot-nginx-1.21.0.ebuild b/app-crypt/certbot-nginx/certbot-nginx-1.23.0.ebuild
index 89ab14446617..89ab14446617 100644
--- a/app-crypt/certbot-nginx/certbot-nginx-1.21.0.ebuild
+++ b/app-crypt/certbot-nginx/certbot-nginx-1.23.0.ebuild
diff --git a/app-crypt/certbot-nginx/certbot-nginx-1.24.0.ebuild b/app-crypt/certbot-nginx/certbot-nginx-1.24.0.ebuild
new file mode 100644
index 000000000000..e66a6b39887e
--- /dev/null
+++ b/app-crypt/certbot-nginx/certbot-nginx-1.24.0.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{8..10} )
+DISTUTILS_USE_SETUPTOOLS=rdepend
+
+if [[ ${PV} == 9999* ]]; then
+	EGIT_REPO_URI="https://github.com/certbot/certbot.git"
+	inherit git-r3
+	S=${WORKDIR}/${P}/${PN}
+else
+	SRC_URI="https://github.com/${PN%-nginx}/${PN%-nginx}/archive/v${PV}.tar.gz -> ${PN%-nginx}-${PV}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+	S=${WORKDIR}/${PN%-nginx}-${PV}/${PN}
+fi
+
+inherit distutils-r1
+
+DESCRIPTION="Nginx plugin for certbot (Let's Encrypt Client)"
+HOMEPAGE="https://github.com/certbot/certbot https://letsencrypt.org/"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	>=app-crypt/acme-${PV}[${PYTHON_USEDEP}]
+	>=app-crypt/certbot-${PV}[${PYTHON_USEDEP}]
+	>=dev-python/pyopenssl-17.3.0[${PYTHON_USEDEP}]
+	>=dev-python/pyparsing-2.2.1[${PYTHON_USEDEP}]
+	dev-python/zope-interface[${PYTHON_USEDEP}]"
+
+distutils_enable_tests pytest
diff --git a/app-crypt/certbot-nginx/certbot-nginx-1.25.0.ebuild b/app-crypt/certbot-nginx/certbot-nginx-1.25.0.ebuild
new file mode 100644
index 000000000000..e66a6b39887e
--- /dev/null
+++ b/app-crypt/certbot-nginx/certbot-nginx-1.25.0.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{8..10} )
+DISTUTILS_USE_SETUPTOOLS=rdepend
+
+if [[ ${PV} == 9999* ]]; then
+	EGIT_REPO_URI="https://github.com/certbot/certbot.git"
+	inherit git-r3
+	S=${WORKDIR}/${P}/${PN}
+else
+	SRC_URI="https://github.com/${PN%-nginx}/${PN%-nginx}/archive/v${PV}.tar.gz -> ${PN%-nginx}-${PV}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+	S=${WORKDIR}/${PN%-nginx}-${PV}/${PN}
+fi
+
+inherit distutils-r1
+
+DESCRIPTION="Nginx plugin for certbot (Let's Encrypt Client)"
+HOMEPAGE="https://github.com/certbot/certbot https://letsencrypt.org/"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	>=app-crypt/acme-${PV}[${PYTHON_USEDEP}]
+	>=app-crypt/certbot-${PV}[${PYTHON_USEDEP}]
+	>=dev-python/pyopenssl-17.3.0[${PYTHON_USEDEP}]
+	>=dev-python/pyparsing-2.2.1[${PYTHON_USEDEP}]
+	dev-python/zope-interface[${PYTHON_USEDEP}]"
+
+distutils_enable_tests pytest
diff --git a/app-crypt/certbot-nginx/certbot-nginx-9999.ebuild b/app-crypt/certbot-nginx/certbot-nginx-9999.ebuild
index 85fd0214055e..e66a6b39887e 100644
--- a/app-crypt/certbot-nginx/certbot-nginx-9999.ebuild
+++ b/app-crypt/certbot-nginx/certbot-nginx-9999.ebuild
@@ -29,7 +29,7 @@ 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/pyparsing-2.2.1[${PYTHON_USEDEP}]
 	dev-python/zope-interface[${PYTHON_USEDEP}]"
 
 distutils_enable_tests pytest
diff --git a/app-crypt/certbot/Manifest b/app-crypt/certbot/Manifest
index ca22241ba70c..3f0e2cf67d04 100644
--- a/app-crypt/certbot/Manifest
+++ b/app-crypt/certbot/Manifest
@@ -1,6 +1,10 @@
-DIST certbot-1.21.0.tar.gz 1343180 BLAKE2B 79bbaafe96bca4cee9aabb39f4e9f1f12be4d2e1d9c1b156966061606ac3b07e5d80c5053baa03698e5513477076ca8f604aff43f77ee7f45d70d4b88429a875 SHA512 11ea781c5113cf68e3a76cafc2cf38d5ebc9cdb2f40a79eae0cdeac5d40f8dac05a4c71a269d5a6ff78027a1db0676195a8413e28a87d00aaf1602f6f2ce5b5e
 DIST certbot-1.22.0.tar.gz 1352714 BLAKE2B 213dc08d3a88e0d20d6324c026a47eb96b9e45fbde41f79e37c2e62c655d7c6df01292e110d2e78ea085dfc62ef3c7b623279224029c9ae2a59e69c5c00054a5 SHA512 9a7a0d11e9fd5bd59b526a2cc5d0029b972e34a2bf41035c2d8ab535b93fc6d985ee8ea3dd5e50a7f4af80450135b739d1297245ad21b47b8362cddb03738932
-EBUILD certbot-1.21.0.ebuild 1187 BLAKE2B 30decf00d4fdf50a058a243f996a0e0f5a6ce5f72134ad22df8d4c46425122ed9da41d6242d149209a85710c7f358351f994a0261365f04e6b0aaba92db94dee SHA512 81e5770fbc0f731f0058dde4ffd501f1bdc54d697842009847d0ccfa49bdc6e9e01795824eb9a8fbf7995a7cbd2707d476c6d4f2f96f43b727eea2d17e658265
+DIST certbot-1.23.0.tar.gz 1361107 BLAKE2B a1b1e029436eb32840d56ca815478df3774a30b69552c5f7a4ca18b054a49c8ce342fe7f7ffecfb6c0fb93338bb722d57e4537e1f142ab162bb8208575ee34be SHA512 bb64139c6406e7c87571beb94d435e079368cbb249d96b522dab72a9529b3a825f9258aac70c5a582d58117c700da281fb43ed8369f40a236c0b7e6acb5237b0
+DIST certbot-1.24.0.tar.gz 1360049 BLAKE2B e1c7f4b56ac66b73f74eb8c9d6c31bc12529c2e7a1a51679e715227e61a2e72a30aa5053abe1684be9d665e399ca67f2d11afcc5c60c76bb86d1c0feb68308ca SHA512 fa2a45e650107f48da1e5d7d7469e8a23598e0e0e1127bc62a66ba2351a8fe518da6ec3e53370f7042631ee74e82c65fcc323c71e8f485911363e805ccb6f045
+DIST certbot-1.25.0.tar.gz 1362891 BLAKE2B c109f7777328dcaa2760b524a005f648f8695518a3a052a1d3ff20367f0b704c2a15c912ede091ef6f0f2faf2838caaa74d3bdac6deeb4cc069e6ca16cfb26a7 SHA512 e32cac530d7854cb626aed6d7bac7b4482b7c3634d94fbabd6fa767f9c1268ed3baed0c945362df247e4fc7d51147e5561825850d52c1a8f11b3a1fb2827bd4a
 EBUILD certbot-1.22.0.ebuild 1189 BLAKE2B 48787ae31f36e63f29778acd2065e7415ae8b5d567d91560ebd000efa5d9fa31e4c2011c195587013ffc86c0c0adc2a318c7477330e01f3829b46043b34f7ecf SHA512 88734a7665c33ce553b63fb7473a2687e2e305984fb1eb4288402fc1a7d01b3099d2c081f884d5da2768476ff8b02eeab42be46fe8bb2599e120e8095837a24b
-EBUILD certbot-9999.ebuild 1191 BLAKE2B 05e3e153929cea53c3d909a88469e65b6921db2cc8592a73fc10869cbbe59a542ffc6852fc8c2d93ab059cea9ced7c5a157662b672e846d96d7fda050eb9f149 SHA512 59b254a68ac117cf50c27db041f6ad0f81bd256364bc10d1480ba3c5ec406fcc57896073b4a55e36659b7a6f9a2cadd282c6fcbaa7e6f52aed236707bf6ce5ac
+EBUILD certbot-1.23.0.ebuild 1189 BLAKE2B 48787ae31f36e63f29778acd2065e7415ae8b5d567d91560ebd000efa5d9fa31e4c2011c195587013ffc86c0c0adc2a318c7477330e01f3829b46043b34f7ecf SHA512 88734a7665c33ce553b63fb7473a2687e2e305984fb1eb4288402fc1a7d01b3099d2c081f884d5da2768476ff8b02eeab42be46fe8bb2599e120e8095837a24b
+EBUILD certbot-1.24.0.ebuild 1200 BLAKE2B 27adf3eb297f285391f215a85e256415502022c664a667174bd860a44ec47f1c3a83c52a9b52bdb2196c32a2d9a91a1ac786455e1de65c302937a3a1b072d105 SHA512 f567319654a632dad0fb186e4f182a6261cf2297916171a1f1a405e8fec4c5ef4ec95a3585c0c531953952ef3034e93b19dfeb89f2d949d56ab80eac2d623f5b
+EBUILD certbot-1.25.0.ebuild 1201 BLAKE2B ad7fab99d0f48ee39b4e5a3a730e02b38cac87f88e491afe2a094eafefd2458aa90c7e54f9ee2f892952d872d1f224034efa3497bd31ad74d1e8c03f6c2301ed SHA512 ed209dfe4b42ba1b2a8d839ad40dab0a18a690b0db1e8388f647b3e1b8e67876015f6d34ee0448d1ab5236f4bfb91a907deb00af0fc43fb8e170152bb5831f49
+EBUILD certbot-9999.ebuild 1201 BLAKE2B ad7fab99d0f48ee39b4e5a3a730e02b38cac87f88e491afe2a094eafefd2458aa90c7e54f9ee2f892952d872d1f224034efa3497bd31ad74d1e8c03f6c2301ed SHA512 ed209dfe4b42ba1b2a8d839ad40dab0a18a690b0db1e8388f647b3e1b8e67876015f6d34ee0448d1ab5236f4bfb91a907deb00af0fc43fb8e170152bb5831f49
 MISC metadata.xml 359 BLAKE2B 7f8ac46ecea304579baca80978cc35905720d1950caa183b5b5b297afab8bf6ea328324bacc438e9ecd91176230e42e55deda1c15e1ba73c63b2021ac2842c0f SHA512 a50b1db5a30eac290ac6645fcb30b0d5c4d8e51d83cff284e76358ee4fe7cef9366e40b06f532ba64a2131672972ea10b73541a9bd42cc323c17f6d26f6b0197
diff --git a/app-crypt/certbot/certbot-1.21.0.ebuild b/app-crypt/certbot/certbot-1.23.0.ebuild
index 6ade5ca6e219..08785c973b2a 100644
--- a/app-crypt/certbot/certbot-1.21.0.ebuild
+++ b/app-crypt/certbot/certbot-1.23.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -27,7 +27,7 @@ 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/cryptography-2.5.0[${PYTHON_USEDEP}]
 	>=dev-python/distro-1.0.1[${PYTHON_USEDEP}]
 	>=dev-python/josepy-1.9.0[${PYTHON_USEDEP}]
 	>=dev-python/parsedatetime-2.4[${PYTHON_USEDEP}]
diff --git a/app-crypt/certbot/certbot-1.24.0.ebuild b/app-crypt/certbot/certbot-1.24.0.ebuild
new file mode 100644
index 000000000000..c1e5739445d8
--- /dev/null
+++ b/app-crypt/certbot/certbot-1.24.0.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{8..10} )
+DISTUTILS_USE_SETUPTOOLS=rdepend
+
+if [[ ${PV} == 9999* ]]; then
+	EGIT_REPO_URI="https://github.com/certbot/certbot.git"
+	inherit git-r3
+else
+	SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+fi
+S=${WORKDIR}/${P}/${PN}
+
+inherit distutils-r1
+
+DESCRIPTION="Let's encrypt client to automate deployment of X.509 certificates"
+HOMEPAGE="https://github.com/certbot/certbot https://letsencrypt.org/"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+
+RDEPEND="
+	>=app-crypt/acme-${PV}[${PYTHON_USEDEP}]
+	>=dev-python/configargparse-0.9.3[${PYTHON_USEDEP}]
+	>=dev-python/configobj-5.0.6[${PYTHON_USEDEP}]
+	>=dev-python/cryptography-2.5.0[${PYTHON_USEDEP}]
+	>=dev-python/distro-1.0.1[${PYTHON_USEDEP}]
+	>=dev-python/josepy-1.9.0[${PYTHON_USEDEP}]
+	>=dev-python/parsedatetime-2.4[${PYTHON_USEDEP}]
+	dev-python/pyrfc3339[${PYTHON_USEDEP}]
+	>=dev-python/pytz-2019.3[${PYTHON_USEDEP}]
+	dev-python/zope-component[${PYTHON_USEDEP}]
+	dev-python/zope-interface[${PYTHON_USEDEP}]"
+
+distutils_enable_tests pytest
diff --git a/app-crypt/certbot/certbot-1.25.0.ebuild b/app-crypt/certbot/certbot-1.25.0.ebuild
new file mode 100644
index 000000000000..0040de76755a
--- /dev/null
+++ b/app-crypt/certbot/certbot-1.25.0.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{8..10} )
+DISTUTILS_USE_SETUPTOOLS=rdepend
+
+if [[ ${PV} == 9999* ]]; then
+	EGIT_REPO_URI="https://github.com/certbot/certbot.git"
+	inherit git-r3
+else
+	SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+fi
+S=${WORKDIR}/${P}/${PN}
+
+inherit distutils-r1
+
+DESCRIPTION="Let's encrypt client to automate deployment of X.509 certificates"
+HOMEPAGE="https://github.com/certbot/certbot https://letsencrypt.org/"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+
+RDEPEND="
+	>=app-crypt/acme-${PV}[${PYTHON_USEDEP}]
+	>=dev-python/configargparse-0.9.3[${PYTHON_USEDEP}]
+	>=dev-python/configobj-5.0.6[${PYTHON_USEDEP}]
+	>=dev-python/cryptography-2.5.0[${PYTHON_USEDEP}]
+	>=dev-python/distro-1.0.1[${PYTHON_USEDEP}]
+	>=dev-python/josepy-1.13.0[${PYTHON_USEDEP}]
+	>=dev-python/parsedatetime-2.4[${PYTHON_USEDEP}]
+	dev-python/pyrfc3339[${PYTHON_USEDEP}]
+	>=dev-python/pytz-2019.3[${PYTHON_USEDEP}]
+	dev-python/zope-component[${PYTHON_USEDEP}]
+	dev-python/zope-interface[${PYTHON_USEDEP}]"
+
+distutils_enable_tests pytest
diff --git a/app-crypt/certbot/certbot-9999.ebuild b/app-crypt/certbot/certbot-9999.ebuild
index 3c75588e8c44..0040de76755a 100644
--- a/app-crypt/certbot/certbot-9999.ebuild
+++ b/app-crypt/certbot/certbot-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -29,10 +29,10 @@ RDEPEND="
 	>=dev-python/configobj-5.0.6[${PYTHON_USEDEP}]
 	>=dev-python/cryptography-2.5.0[${PYTHON_USEDEP}]
 	>=dev-python/distro-1.0.1[${PYTHON_USEDEP}]
-	>=dev-python/josepy-1.9.0[${PYTHON_USEDEP}]
+	>=dev-python/josepy-1.13.0[${PYTHON_USEDEP}]
 	>=dev-python/parsedatetime-2.4[${PYTHON_USEDEP}]
 	dev-python/pyrfc3339[${PYTHON_USEDEP}]
-	dev-python/pytz[${PYTHON_USEDEP}]
+	>=dev-python/pytz-2019.3[${PYTHON_USEDEP}]
 	dev-python/zope-component[${PYTHON_USEDEP}]
 	dev-python/zope-interface[${PYTHON_USEDEP}]"
 
diff --git a/app-crypt/codecrypt/Manifest b/app-crypt/codecrypt/Manifest
index 06cb1019c7c7..67543b3c808c 100644
--- a/app-crypt/codecrypt/Manifest
+++ b/app-crypt/codecrypt/Manifest
@@ -1,5 +1,3 @@
-DIST codecrypt-1.7.2.tar.gz 446975 BLAKE2B 40b7f97dae84a0fd621ee19c6bfeba47b781a7f856ce9c077445d6387b75b97dce0fc02ee9481241b246b0eb7de6b44ac014a708a8ceba629828ca9d63b8e24c SHA512 4ad2ad9e665e486e353b48efff344436b276eac2dcbddcf4330796b8f1f06284eaeec9c4f4ef63f61e4477c3bce0973f60f76291dce11bee31a75658bee6a3a0
 DIST codecrypt-1.8.tar.gz 471273 BLAKE2B 30547c299689547b50e2742e12dbfd32f420217a81813446b36bf5ea52929ca1f3b1968d76937de17e0f003c82186abfa683a6e30dc1fa5dc2ffe89594827ae4 SHA512 0e452f4e93498faa671a5927a3dd93b6dc66cbda7eb71cb33a509f8608573eff5ac8fed0d5e09911e03c153b88c9cb1bb54f7b2aeeb7b6c31eec918ad9685102
-EBUILD codecrypt-1.7.2-r1.ebuild 672 BLAKE2B 8eff53eb6794460747a520d5a3846bc7c732f27105ecb472a1391a67ea8425f3a8c68797fb2fe1460073c586c757433bc98aa46bbc6a4c5fd1e09165f70c94f3 SHA512 a7678a94eb1240c5fe2deed6e1e5717dabd91f4a1fa6e1b279caed274e2cbb3ee61a8dd179590a3b5dd23c44366cff738fae3614feaea6d972aaedcaa6fed788
-EBUILD codecrypt-1.8-r2.ebuild 713 BLAKE2B 278aca073a6bf1d154ebf810b8c80bd49393f63354805d779bf16bf6b23be79661b1d029922217cc3d750a0709a53a05b0cde6dbc8e97279713cda9fabc4dcb4 SHA512 03d85d58d7c3bf3111853b6bd9b0c961ef9accf31fbac64ccf2051034c16e2ef634cc5481844ad6f1ae238537398b3de7d01fc70d50d24e95760d21b4a4d6511
+EBUILD codecrypt-1.8-r2.ebuild 712 BLAKE2B 679e061c9f26729dd5b9e977ebff4a19ba296d658f38da11f5179f94a27511d8be8fd4b9397c96c07809f46eab52b76de53ab32e6bae6e77e30d5baab43123ba SHA512 b66103a696892cc6fb988ef1dd6615561fa2cb06746f532ee78613d1df10517c4bc45ff7b79068929b13f18693b3ae2d0019fd8bacc9a011f0aea0b3a39b0a75
 MISC metadata.xml 787 BLAKE2B c0215be83f8e6e65106edf465677c0904b9bf5f6bf08628db18e2a5ce1f0410161b08fbca451d3e9799314333012dc5aca113691e0d40bc96fb4533b912d7140 SHA512 ee9dbbcbfd211ead99d814cbc738cf657568178358eba7132bd4d8150b4f5286848bf9fbb2d1251a3de9b2221719c590633efd713e7d6fd97a165246b3da0e53
diff --git a/app-crypt/codecrypt/codecrypt-1.7.2-r1.ebuild b/app-crypt/codecrypt/codecrypt-1.7.2-r1.ebuild
deleted file mode 100644
index fa8f1c6527be..000000000000
--- a/app-crypt/codecrypt/codecrypt-1.7.2-r1.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="Post-quantum cryptography tool"
-HOMEPAGE="http://e-x-a.org/codecrypt/"
-SRC_URI="http://e-x-a.org/codecrypt/files/${P}.tar.gz"
-
-LICENSE="LGPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="+cryptopp"
-
-DEPEND="dev-libs/gmp:=
-	cryptopp? ( dev-libs/crypto++:= )
-	sci-libs/fftw:3.0="
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	eapply_user
-	# workaround -- gentoo is missing crypto++ pkg-config file
-	sed -i -e 's/PKG_CHECK_MODULES(\[CRYPTOPP\],.*/LDFLAGS="$LDFLAGS -lcrypto++"/' configure.ac
-	./autogen.sh
-}
-
-src_configure() {
-	econf \
-		$(use_with cryptopp )
-}
diff --git a/app-crypt/codecrypt/codecrypt-1.8-r2.ebuild b/app-crypt/codecrypt/codecrypt-1.8-r2.ebuild
index 93d82f35a94e..d0a857db8986 100644
--- a/app-crypt/codecrypt/codecrypt-1.8-r2.ebuild
+++ b/app-crypt/codecrypt/codecrypt-1.8-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -27,5 +27,5 @@ src_prepare() {
 
 src_configure() {
 	econf \
-		$(use_with cryptopp )
+		$(use_with cryptopp)
 }
diff --git a/app-crypt/glep63-check/Manifest b/app-crypt/glep63-check/Manifest
index d4fd326b89d1..dd41af5215a9 100644
--- a/app-crypt/glep63-check/Manifest
+++ b/app-crypt/glep63-check/Manifest
@@ -1,5 +1,5 @@
 DIST glep63-check-10.tar.gz 73550 BLAKE2B af45dce2a89e4af31a81e979659494c47b9c24f3fb71cccc33e84d6fc2900339ecefcafb1b6186b1e19e9fce7a2f17df754005c91828d27d0d2d9fe67586661e SHA512 d2fbfdb1b60250897b5d9582111573b6ed78f02b30d66cffc0fa94e0a1136dc0f3561e808b66d9b8ce43fca9fbdaf1548790c7c2395929308ff24d42d18ecf03
-DIST glep63-check-9.tar.gz 73445 BLAKE2B cd229065da9a4663491a891787d2a9e719cd9d61ea5974393199ca418413e7e1c6b73a3146577b26029ceb3302f430ed1051c9d050278b098b18407e95c1cac3 SHA512 86c49ffe2b8dde3735b85ff4808862c460b1e832fa9c3fca4fc2ea776d314c29ed2442adef2e1dbca1cec81b6ea29bbb417b123306602dfaa611b5153dddb7ac
-EBUILD glep63-check-10.ebuild 578 BLAKE2B 55866cf4987dbca5a6f4b7fe1e6321f6c659ca5eabb5c8108fa3dde8089c3685b411fb1e62c5e441fd2116c53e02ab4b2ae2e96d50c40ad219f599eaf1524d67 SHA512 a46d1b4c7807a60b582b0f202fc1b7d5576f165ce53dff6557fbb47e89982cf392abd968fcb7584ed236a7567796ed67941b6318d58e74bd656f18951c4bd5de
-EBUILD glep63-check-9.ebuild 686 BLAKE2B f3e108b7e17d3c2e63d56641306c4b5c3a39cdf4da469921d0fef3f7f0b1be0e753b07c4dc049d08710d5952117437ac1ae80424f56a56243016a42c25d0e00e SHA512 493c8cf0ce6feaa44b7212ebe10abb93169accbd6f4542cf99c32512871c0d47143ff64cc0ad705a154140918eb0a160e885ccf008f5da45d8ad9efb490f3012
+DIST glep63-check-11.tar.gz 73765 BLAKE2B f1893397c18458d1a9abb0236334f2acf9adcb4cf13229f49887cd1381db4e68c470f604b76b339c5481207c63522a3f99256e00cba820e3a15c412a8e52ec2d SHA512 6ee9ed33ee259eaa14d6fb1d914e555aae5b622d04f08a2eef094e7ff20ce9368a3af105a55cbc2c37ced5b51846f17651b20a2c0644f0efcc883eea49f0310b
+EBUILD glep63-check-10.ebuild 576 BLAKE2B 3bf7ed27c9ba2de6dfabaa7dd6ab67198fc85d08cdebb2fac279eba08de740cbec942977e345431ebe904a6478fb77e4a28a10d2aab12518f291e252494a5a27 SHA512 af911dff7509fdc3c1eac81c33f57bd80ad0b506d7ecc3eb1887db5ff9852c821b05a0f435f8afee9a1327b5755eff2400741eda1f88c3f5a057bfcd84a96cdb
+EBUILD glep63-check-11.ebuild 575 BLAKE2B fea1ba358a9516f61328e3e1daa8b301a6507cf1db9c9ee976ed671bd2af2ab7603a7363e22d7d10dc27de7d5bb9b34df54781264782cf03aee35c6d27d83322 SHA512 4822e781a6d4f4f81053028cfa41fc53bbb5d46ec3d141935ddce4afa261f92c16c8efebb740aec0bc47a00d039b6d521add0ec3e0defb37636b3234252d8b0e
 MISC metadata.xml 538 BLAKE2B f8b4385968fe1f9504666398550baf1c13a0f840e9d0d9c1f80caa7bca9001ed679a22bfba1e8b62064d0d5e6507e0eb8f40cf1e44b57f4e4a0830b1aae36c74 SHA512 6dbcbf2413392f6bc587cb96f6f127af72f5412d07c4c7a40472304470fb90390d05057010ad383d8431481b09d54df972f5873d69c2908dd6f80b27e52e75ba
diff --git a/app-crypt/glep63-check/glep63-check-10.ebuild b/app-crypt/glep63-check/glep63-check-10.ebuild
index c11a81b67fe5..ad32f1258df6 100644
--- a/app-crypt/glep63-check/glep63-check-10.ebuild
+++ b/app-crypt/glep63-check/glep63-check-10.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -16,7 +16,7 @@ SRC_URI="
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 RDEPEND="app-crypt/gnupg"
 DEPEND="
diff --git a/app-crypt/glep63-check/glep63-check-11.ebuild b/app-crypt/glep63-check/glep63-check-11.ebuild
new file mode 100644
index 000000000000..cc39349f46f0
--- /dev/null
+++ b/app-crypt/glep63-check/glep63-check-11.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=flit
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit distutils-r1
+
+DESCRIPTION="GLEP 63 compliance checker for OpenPGP keys"
+HOMEPAGE="https://github.com/mgorny/glep63-check/"
+SRC_URI="
+	https://github.com/mgorny/glep63-check/archive/v${PV}.tar.gz
+		-> ${P}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="app-crypt/gnupg"
+DEPEND="
+	test? (
+		>=app-crypt/gnupg-2.3.3
+		sys-libs/libfaketime
+	)"
+
+distutils_enable_tests unittest
diff --git a/app-crypt/glep63-check/glep63-check-9.ebuild b/app-crypt/glep63-check/glep63-check-9.ebuild
deleted file mode 100644
index 2d5751e69477..000000000000
--- a/app-crypt/glep63-check/glep63-check-9.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_{7,8,9} )
-DISTUTILS_USE_SETUPTOOLS=no
-
-inherit distutils-r1
-
-DESCRIPTION="GLEP 63 compliance checker for OpenPGP keys"
-HOMEPAGE="https://github.com/mgorny/glep63-check/"
-SRC_URI="https://github.com/mgorny/glep63-check/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="test"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-RESTRICT="!test? ( test )"
-
-RDEPEND="app-crypt/gnupg"
-DEPEND="
-	test? (
-		${RDEPEND}
-		sys-libs/libfaketime
-	)"
-
-python_test() {
-	"${EPYTHON}" -m unittest -v || die "Tests fail with ${EPYTHON}"
-}
diff --git a/app-crypt/gnupg/Manifest b/app-crypt/gnupg/Manifest
index 67bb0cf0887e..6202fa6a19d3 100644
--- a/app-crypt/gnupg/Manifest
+++ b/app-crypt/gnupg/Manifest
@@ -1,10 +1,12 @@
 AUX gnupg-2.1.20-gpgscm-Use-shorter-socket-path-lengts-to-improve-tes.patch 1048 BLAKE2B 36f37b74da309100191f4d8f9c27d08a1b00d2d30fbaf169dbb74ebbe42293357a4fb62332e286fe5725dcfdc30645a602dc2a51c51924b06215b68fd5235658 SHA512 fd12827150e96cd7979ea9611d64ed4ab9e6c61cfecdd697b8fb4d162f20985b734c2bfc365a921809b9029e86a85a9b36c10ec472b3dd49c25ea18f5aef56ce
 DIST gnupg-2.2.32.tar.bz2 7212625 BLAKE2B 8e1feba83a0d8fa1c154c814e26b41aa252cef4af53937e4e8954860249c180c1d6910356b0c46dfefde094846b02bd5375f17c8b6fdcc9138281d0daa292d42 SHA512 76b75d3688561ce65a8014812656aa87c9722c898d7e186fdb1331dee6af32f886a6b0a4806975c348a22ad6dda60f956ece56076d00153b9706aad4c934c6a1
 DIST gnupg-2.2.33.tar.bz2 7238439 BLAKE2B 9655ab8733f79c56c706502ddeeb41a2841467146753965898528d53a95ba77c51bcaf7fb93c51fb1c36953253ef993e67ce3c9ec756c9eece1042dcd17aa455 SHA512 0e6382ebb78425dc81b280a3b453111fb4a764b3fb0565ac09ac24cec2ecd571079617e263d9fce077ba6ce8d202fb43425b51c26f9ec6e8c61706a1ca5f8c78
-DIST gnupg-2.3.3.tar.bz2 7590874 BLAKE2B a80a84b4f6691815550de6125f4f24aa9c901b8ca8eeb6bc91c90ccd3d285a5ddb15688c7ab870aa6a6c418eb98b969e7b958120c3976b5aaea55188f39b67b0 SHA512 12d500e6b45910d5f7bfd4916bcee37ac988a58a35563fcf425a65b88c0cf92c2af2e94d3e31e9e5e19094c8beb5ec3779cf90bfe43d1555c4196f69eee2f102
+DIST gnupg-2.2.34.tar.bz2 7252882 BLAKE2B f42fd8c4019a051c9f087ae1806ce61c831e0aa552baf7372fd26f2e81d612b919590b698e512343644b68ba220f8f4f751cb66a7f4966df5ba7819563d5351a SHA512 2232e2df58a8470f152d5d91816e14017bcc702bf56c7ae6210f8f42069b2117172b9eabc8fcc1d1174aa7a1068ff444c98335f6c503c2e17137c76fe2602b8b
+DIST gnupg-2.2.34.tar.bz2.sig 119 BLAKE2B 38d384f215f02bb45ab7c77bb7ad434d9038d8ed19610210ebf84e43e1548c2e938f1f45a1047a9c161c3a88308b83c21fb2bc254a77e68fcf00c7f0cf72e5f9 SHA512 220436aa2387376d4af41ee84dbac9a9e4fda2904024d81da9af6f8c704700c5c6f9da98cfa7e4a9f188ad2739189b905473cfd88747978300829ec382771745
 DIST gnupg-2.3.4.tar.bz2 7589561 BLAKE2B 6e04a90a5ffac7d4701202e35071a48530ba86d8c64cab3ed1617df23358f4d564ddf6cdbc6c861890725344a19619e0f6791ccabd97b18b28dc4e6e01f7837b SHA512 a3cf1c759512ec561c6f01cec72d533fc099dccf8c03b3a3e4a930862ae4c6815ecb856edd41884a65f058b65553cb69519e53e134d652353a7a76144bd99758
+DIST gnupg-2.3.4.tar.bz2.sig 238 BLAKE2B e384c1528d015b4470eabfeffbe59db82cfc6522d739d6017f72f60a55959ded9cf031fec7b9b286f8020cdd429b2d07780205633d6fb459521ba96374fb3b3f SHA512 be43535068b1ad33458ad320e3ec37fad49341ebfb0846a2b21d2b87fd55696567df91abcea0b83e70ad1322832635279a4d0bf1f736ae6dd70e255c951bf0b3
 EBUILD gnupg-2.2.32-r1.ebuild 4786 BLAKE2B 6e81532e958f0454d6ef5f56f381c794ba75378a136a396660ed32722842fa4b14017c74df05f6e8098db2a8ad57701309e36a4704088bc1109125a063e96b70 SHA512 71ea3bebf26b75f77abb79e4285f2d40bd021db819a975c5e29cb620eb95d801b62c0bad8ccf5726948eef3d0fb00b3aa8a31da7a036d50dcfb0496eff4e07c6
-EBUILD gnupg-2.2.33-r1.ebuild 4794 BLAKE2B 67398864ea884a87548d1bb5fb69899567a831f3ad0db749a7815bac2a34e6573da0eb60b755a25beac86e00639f0ce26de032e88b84e0e1f567aa562fb64027 SHA512 e3929982e9ae323839cb11d5acfe170f9f4b99fc28cc56f5aaac1825536de84f22e6638b0e6b05e3a749386f849c22caaac1cd9cd34396a2e177c36a167daad9
-EBUILD gnupg-2.3.3-r1.ebuild 4892 BLAKE2B 096437f8c9b84cbccda57b577171fe9c4c4d185f2f42b2bd90e7e31ff43603820061711895a63850be5584304f14e77faba8b25b0cd02de6b4d40e9a60f1d373 SHA512 a8607182c3a2e645207258cd5770a5797997d1888ba67d98fec7d0363e6071262b06f9fbb9855b1e0044861daa27f4d7058cf516e786e6306267a7018410e39f
-EBUILD gnupg-2.3.4.ebuild 4892 BLAKE2B 096437f8c9b84cbccda57b577171fe9c4c4d185f2f42b2bd90e7e31ff43603820061711895a63850be5584304f14e77faba8b25b0cd02de6b4d40e9a60f1d373 SHA512 a8607182c3a2e645207258cd5770a5797997d1888ba67d98fec7d0363e6071262b06f9fbb9855b1e0044861daa27f4d7058cf516e786e6306267a7018410e39f
-MISC metadata.xml 1307 BLAKE2B 3c9f597e695e8dc4a1aebb7a42186fbdc47c7836f837429c8e341b8e991ea18f82171476d8b8f95adbc1e0d92dba5941b2af1d1f44c6efcf9a67d39caaf43187 SHA512 d1a72ac876af1678cfb01da22ace33c87c79266fe7d25ff722d61950ce81a05431e529672db019abe3566084b5fa36649b882a7edabc1d9796a670c12406fa74
+EBUILD gnupg-2.2.33-r1.ebuild 4786 BLAKE2B 48921a772a483c2335bb22dc75612ddafd22c1ec312cc7a9f928721149b8ebe7ad64cb11cc161b2e3e9fcc3a49142d67151a05b4cee7f2cc2cf173096f497878 SHA512 04a7e068a9a08391ee90180dd2d8933dcee99e5b43379463d69988aa3dee9698c68acdf926322f34aab599bca21d5a7dfdadbb72b8e90e8f1c47b99f08cd5c43
+EBUILD gnupg-2.2.34.ebuild 4980 BLAKE2B 164a46c1ba36ddab25e9ddeb3f66f72685168566c2dd3ca8efa8db8f3aab00911aa8cdca61cafbc6d3152699fa1d518c40fe425458d4098d90ad6b14d43b8eae SHA512 b4e71302bc1131388029d931d859002f542878273a2b4f6c530256d130f1719e4963bba484be3da4f09cb7fa74acbbc1bf69e60c8cf7e249ce8b4c375bcdb25b
+EBUILD gnupg-2.3.4-r1.ebuild 5178 BLAKE2B b615134041bde1f91e504fdd6d348192770d81148dd5c2a7c222a49bd1d24960dc6aab93f3000bfc45c256a9fc56c6e4c72ede67884affb0918471ad63b75d0f SHA512 22ed8562991971fc276893d2d44f517e411864e2f448c782903d6d8684edd89c913cc5ffdede420f9ef8c0bf79f18077ef382411c67bbf1bf441b4f1d2a756de
+MISC metadata.xml 1297 BLAKE2B 2d1b2b6f7e6fdf5b73797347e9a3bf7758f1efc86e53d0d0f4b2c0012152ebc50630ff4f3b2c965063f608cf03b3da2794978a3e3659957970d91d3a735ad604 SHA512 0e9f3d5255ac70d6a08b251bfd20f13ff25f63e763ab9385924fb2cb5ac233b0ae97cc43e8a2d950b9662f088ef65af87f9af4dbb355e122e3fcb118bee1c0de
diff --git a/app-crypt/gnupg/gnupg-2.2.33-r1.ebuild b/app-crypt/gnupg/gnupg-2.2.33-r1.ebuild
index fb9711a1074b..eee1b3922bec 100644
--- a/app-crypt/gnupg/gnupg-2.2.33-r1.ebuild
+++ b/app-crypt/gnupg/gnupg-2.2.33-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -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.3.4.ebuild b/app-crypt/gnupg/gnupg-2.2.34.ebuild
index dc083b09c42e..e1a5ef3e6383 100644
--- a/app-crypt/gnupg/gnupg-2.3.4.ebuild
+++ b/app-crypt/gnupg/gnupg-2.2.34.ebuild
@@ -1,40 +1,39 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-inherit flag-o-matic systemd toolchain-funcs
+VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/gnupg.asc
+inherit flag-o-matic systemd toolchain-funcs verify-sig
 
 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"
+SRC_URI+=" verify-sig? ( mirror://gnupg/gnupg/${P}.tar.bz2.sig )"
 S="${WORKDIR}/${MY_P}"
 
 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 test +tofu tools usb user-socket wks-server"
-RESTRICT="!test? ( test )"
-REQUIRED_USE="test? ( tofu )"
+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.
 # Note: On each bump, update dep bounds on each version from configure.ac!
 DEPEND=">=dev-libs/libassuan-2.5.0
-	>=dev-libs/libgcrypt-1.9.1:=
-	>=dev-libs/libgpg-error-1.41
-	>=dev-libs/libksba-1.3.4
+	>=dev-libs/libgcrypt-1.8.0:=
+	>=dev-libs/libgpg-error-1.29
+	>=dev-libs/libksba-1.3.5
 	>=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 ) )
-	tofu? ( >=dev-db/sqlite-3.27 )
 	ssl? ( >=net-libs/gnutls-3.0:0= )
 	sys-libs/zlib
-"
+	tofu? ( >=dev-db/sqlite-3.7 )"
 
 RDEPEND="${DEPEND}
 	app-crypt/pinentry
@@ -44,7 +43,8 @@ RDEPEND="${DEPEND}
 
 BDEPEND="virtual/pkgconfig
 	doc? ( sys-apps/texinfo )
-	nls? ( sys-devel/gettext )"
+	nls? ( sys-devel/gettext )
+	verify-sig? ( sec-keys/openpgp-keys-gnupg )"
 
 DOCS=(
 	ChangeLog NEWS README THANKS TODO VERSION
@@ -75,8 +75,6 @@ src_configure() {
 		$(use_enable smartcard scdaemon)
 		$(use_enable ssl gnutls)
 		$(use_enable tofu)
-		$(use_enable tofu keyboxd)
-		$(use_enable tofu sqlite)
 		$(use smartcard && use_enable usb ccid-driver || echo '--disable-ccid-driver')
 		$(use_enable wks-server wks-tools)
 		$(use_with ldap)
@@ -84,6 +82,7 @@ src_configure() {
 		--with-mailprog=/usr/libexec/sendmail
 		--disable-ntbtls
 		--enable-all-tests
+		--enable-gpg
 		--enable-gpgsm
 		--enable-large-secmem
 		CC_FOR_BUILD="$(tc-getBUILD_CC)"
@@ -139,7 +138,7 @@ src_install() {
 	use tools &&
 		dobin \
 			tools/{convert-from-106,gpg-check-pattern} \
-			tools/{gpgconf,gpgsplit,lspgpot,mail-signed-keys} \
+			tools/{gpg-zip,gpgconf,gpgsplit,lspgpot,mail-signed-keys} \
 			tools/make-dns-cert
 
 	dosym gpg /usr/bin/gpg2
diff --git a/app-crypt/gnupg/gnupg-2.3.3-r1.ebuild b/app-crypt/gnupg/gnupg-2.3.4-r1.ebuild
index dc083b09c42e..48bc251e6c0f 100644
--- a/app-crypt/gnupg/gnupg-2.3.3-r1.ebuild
+++ b/app-crypt/gnupg/gnupg-2.3.4-r1.ebuild
@@ -1,21 +1,23 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-inherit flag-o-matic systemd toolchain-funcs
+VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/gnupg.asc
+inherit flag-o-matic systemd toolchain-funcs verify-sig
 
 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"
+SRC_URI+=" verify-sig? ( mirror://gnupg/gnupg/${P}.tar.bz2.sig )"
 S="${WORKDIR}/${MY_P}"
 
 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 test +tofu tools usb user-socket wks-server"
+IUSE="bzip2 doc ldap nls readline selinux +smartcard ssl test +tofu tpm tools usb user-socket wks-server"
 RESTRICT="!test? ( test )"
 REQUIRED_USE="test? ( tofu )"
 
@@ -32,6 +34,7 @@ DEPEND=">=dev-libs/libassuan-2.5.0
 	readline? ( sys-libs/readline:0= )
 	smartcard? ( usb? ( virtual/libusb:1 ) )
 	tofu? ( >=dev-db/sqlite-3.27 )
+	tpm? ( >=app-crypt/tpm2-tss-2.4.0 )
 	ssl? ( >=net-libs/gnutls-3.0:0= )
 	sys-libs/zlib
 "
@@ -44,7 +47,8 @@ RDEPEND="${DEPEND}
 
 BDEPEND="virtual/pkgconfig
 	doc? ( sys-apps/texinfo )
-	nls? ( sys-devel/gettext )"
+	nls? ( sys-devel/gettext )
+	verify-sig? ( sec-keys/openpgp-keys-gnupg )"
 
 DOCS=(
 	ChangeLog NEWS README THANKS TODO VERSION
@@ -77,6 +81,7 @@ src_configure() {
 		$(use_enable tofu)
 		$(use_enable tofu keyboxd)
 		$(use_enable tofu sqlite)
+		$(usex tpm '--with-tss=intel' '--disable-tpm2d')
 		$(use smartcard && use_enable usb ccid-driver || echo '--disable-ccid-driver')
 		$(use_enable wks-server wks-tools)
 		$(use_with ldap)
diff --git a/app-crypt/gnupg/metadata.xml b/app-crypt/gnupg/metadata.xml
index b8002cbca7e5..9704490d3e88 100644
--- a/app-crypt/gnupg/metadata.xml
+++ b/app-crypt/gnupg/metadata.xml
@@ -5,10 +5,6 @@
 		<email>zlogene@gentoo.org</email>
 		<name>Mikle Kolyada</name>
 	</maintainer>
-	<maintainer type="person">
-		<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>
@@ -31,6 +27,9 @@
 		<flag name="tools">
 		Install extra tools (including gpgsplit and gpg-zip).
 		</flag>
+		<flag name="tpm">
+		Enable TPM support via <pkg>app-crypt/tpm2-tss</pkg> and build tpm2d.
+		</flag>
 		<flag name="wks-server">
 		Install the wks-server
 		</flag>
diff --git a/app-crypt/gpgme/Manifest b/app-crypt/gpgme/Manifest
index 8b16c7f4a566..8226bebd982f 100644
--- a/app-crypt/gpgme/Manifest
+++ b/app-crypt/gpgme/Manifest
@@ -1,6 +1,11 @@
+AUX gpgme-1.16.0-fix-t-edit-sign-test.patch 3496 BLAKE2B 940ccb35979ff8de68461444e6a8643565d4c5715211459c13d9811b8cc152629c93f7c80715e3243e48a939c066f55d25e8f0c0bd0e3cc83352d381c1cb9236 SHA512 d136da51011bc18a3c4c0b51618633cc98658aa489e9f13e02b786d65a4d32ccd94eb08f8b4afc510aee9a2db0a274568c372d33219c8b8ab3792ef599ed3fd5
 AUX gpgme-1.16.0-glibc-2.34.patch 1259 BLAKE2B 28ced8db5bc6010eeb0b870b927dba3baca3c1c1beda563263ebbf938fee37d56599e6f4816d3e701bed3b2734e68ec4bff8c4134af5a3c7891c5cdc8f1678ca SHA512 46900e8d2f816b3c1cc9e222b7f11d2ef89684a6d43b2dd84cb0e7ed5becd539f28654a3d3c0bac83e970c66a2079dc5263ab5d131a52be0719cbc595cbf7a76
 DIST gpgme-1.15.1.tar.bz2 1699349 BLAKE2B d3a6ccaa35360ed3fc79364dfcc3f2fdcb70e5e41ac72ef011373a39d5def9be9ce1be45843ab65a87630d3fc570d29db5f40b9a273aa8e281464c9d1d3477de SHA512 1d75a848cce6389f7cb8896b57a28dfe1dc5a447bfb4f128b0994a43e04134343400a3be063e971f03dfd595474cfd558519741d5d56afb3e84853ad4f2a45c2
 DIST gpgme-1.16.0.tar.bz2 1718913 BLAKE2B da55e695b148e949a1c0770d0298d7a8c9f87d7a1f9e45d380f8c13c472bd44cb4266adb9a113e2b1dcc2596291744f48fdf998ff2de876059d89d184dc87f3a SHA512 69487be69612e9bf0221ff56ae687248bd13635db1b7087130e93c1670e38f3c810bbca17723555c04fe207976c35871bbc3da005179ce099504321cf33636e4
-EBUILD gpgme-1.15.1.ebuild 2746 BLAKE2B 9d801a0d79d2acdf81027e4ac511c7f60df3a2db47b6a28e61f9bd881478b07237d5d87bb1ac54cbdb306708e55b51456b3b3b1283bb5f164d49776a052f9a56 SHA512 dc74be1ae8fb89b9cd449ab86ec95b5fd6b766be4c813083ce08a94297ab3700fb1ab16d3bc73baa11c0aa6951fc5e8f6e4718ebf36b9ec33de40886e1b00620
-EBUILD gpgme-1.16.0.ebuild 2804 BLAKE2B a9d58a8b7eea2fa3b24a5edbb9cc2de81a1c65f8a638a04d80896848c07250f9503695fe353d0cdb9230bc193717656f38c00a2f441e8609fc2f3ca3fbd995a9 SHA512 9e6ae0ea746252c46b4357c6d6a4f148a7302d4bb7a9522ce33549115dee0d119ee8d6b6d501a934a27f3eda548f6f2b3ece6754e27917ded113cffe737c3aaa
-MISC metadata.xml 327 BLAKE2B b81e8fb75326ade6f0c2fff8e2b542631ec799d7881e0b1d5c11749ed2dd0cbc0c157d137782c05d26b18adb1a3c7d598dabee1a7464685cf1b0be94a1c86d2b SHA512 84ee5946f52200c1484bbe23ba5f3d1e423b2d6f85b68522906948baf44bd6904453c5a6d4024e8425f3d874c29d2710dfb9a48cc3598932dbfcb54cdcfe0703
+DIST gpgme-1.17.0.tar.bz2 1748416 BLAKE2B 32df1e3e579275d39507cb013ab7eded12149735f27a5eb1f4c3142df6b97864947a64c7fa58736e6cdea4ae623fb42eeb007596ec08ac5fdfb2af7826447550 SHA512 7ab379c6be2031ff24334a636e596f01c9d491627b695cc6cce7a361e78c6054b7891c521f07becea3c5da10c58043c1acffbba6058bbbfaa515241d75dd6c46
+DIST gpgme-1.17.1.tar.bz2 1747692 BLAKE2B 44cf9309cbad038f23aa7c5c77fd85be23faf3d8e1eb7abdb87a737ad1ade1ee269a95ce618dba327bbd06e6f4b2a91e2446744ee08f09ea6fb3b2dad44431c5 SHA512 e6399c3de1e430e38f2692bf5ec0c02ecb36ea3dbb56ff29dc3a438a5be4900a77a0559dc5b673dc1ffbff5e7f589e548e19176b2644fe8f63e00c6b9181b920
+EBUILD gpgme-1.15.1.ebuild 2748 BLAKE2B 8c43c756320c7bfd43391c568dca2e873a452165707a4e774f92fa3cdcce4081718a667f4e29ce1cf64ddf5859bdcadc368d4fae6f2bf34f391e705b90b305ed SHA512 643c8ecb47ea4d36b605bad8bc754b7fe489f3619478398cf49fc8664cc4cc6a5f717d0a32f739d7666b68b82f41e5c97070e23fe4d3ee1acb0c820de15181c7
+EBUILD gpgme-1.16.0.ebuild 2851 BLAKE2B 0f502d7c5b80f67363ec7f6728ee3012e0eb524a9850af952bba00e5dedc1cb5254f2c27d5ea84d35c66e50e8b2ab718d732c638d304a9903ff9921315f40ac6 SHA512 df5da096dd7e5695922eb5b1853c61c174731f812f1d1b6c342eda0a094e0319e3b664cd143a1f8916a2d99941e0477c0c75b134ba59714d90bd7e2e2477ee5d
+EBUILD gpgme-1.17.0-r1.ebuild 2965 BLAKE2B 0d1849d52b3ad94a76f5f9b521a46307a6c9405ba2e60b75351dfae4f9a370db54bacc9ae310f8eca3ba73b5af498c9eceb9c3287928ae40e00934b591404e37 SHA512 6d41e730fdea10fe399b3b4654a7be41e6cfa9f4df3b52beb2a7db14963621620027ce907c0de468a97fbc49770d340fa68d6a2a4ad6414391fbd7b11106be65
+EBUILD gpgme-1.17.1.ebuild 3035 BLAKE2B 17facd6faef8e8d937975858bad352ce57328607c0a244c9159f968ab7b01553144789406152e24655acacda118cd3410f1610598c3fc4beaff630cf49167a65 SHA512 f113a6edd6d8f734cb1cdf8413d1b2023305e0b9419b2f400a8437bf806b2441ada0fddce338d1246e117a8d6ac8ca7426b3260b84a98a5bea3594ac809e6bc2
+MISC metadata.xml 333 BLAKE2B 6dd18b63ec1f7656ab8bd705242bec45d7820db8be31f326172cad400711e6d7268c156d6b81facfdfa79118c04728ac910a8f8de36a11454227a1399235a582 SHA512 21b8d7bf3f14b5ab7e2ea587027395cdd881ecddd5a4f70237cafc70dc904b396a33f70dd7ef37519df5a204f4e3a89d9ea6ffc221df41bd9cbf23e69863f12f
diff --git a/app-crypt/gpgme/files/gpgme-1.16.0-fix-t-edit-sign-test.patch b/app-crypt/gpgme/files/gpgme-1.16.0-fix-t-edit-sign-test.patch
new file mode 100644
index 000000000000..6a5a7c0707c4
--- /dev/null
+++ b/app-crypt/gpgme/files/gpgme-1.16.0-fix-t-edit-sign-test.patch
@@ -0,0 +1,120 @@
+https://git.gnupg.org/cgi-bin/gitweb.cgi?p=gpgme.git;a=commitdiff;h=81a33ea5e1b86d586b956e893a5b25c4cd41c969;hp=e8e055e682f8994d62012574e1c8d862ca72a35d
+https://dev.gnupg.org/T5509
+https://bugs.gentoo.org/827898
+
+From: =?utf8?q?Ingo=20Kl=C3=B6cker?= <dev@ingo-kloecker.de>
+Date: Sat, 26 Jun 2021 18:02:47 +0200
+Subject: [PATCH 1/1] core: Fix use-after-free issue in test
+
+* tests/gpg/t-edit-sign.c (sign_key, verify_key_signature): New.
+(main): Factored out signing and verifying the result.
+--
+
+Factoring the two steps of the test into different functions fixes the
+use-after-free issue that was caused by accidentaly using a variable
+of the first step in the second step.
+
+GnuPG-bug-id: 5509
+--- a/tests/gpg/t-edit-sign.c
++++ b/tests/gpg/t-edit-sign.c
+@@ -107,31 +107,19 @@ interact_fnc (void *opaque, const char *status, const char *args, int fd)
+ }
+ 
+ 
+-int
+-main (int argc, char **argv)
++void
++sign_key (const char *key_fpr, const char *signer_fpr)
+ {
+   gpgme_ctx_t ctx;
+   gpgme_error_t err;
+   gpgme_data_t out = NULL;
+-  const char *signer_fpr = "A0FF4590BB6122EDEF6E3C542D727CC768697734"; /* Alpha Test */
+   gpgme_key_t signing_key = NULL;
+-  const char *key_fpr = "D695676BDCEDCC2CDD6152BCFE180B1DA9E3B0B2"; /* Bravo Test */
+   gpgme_key_t key = NULL;
+-  gpgme_key_t signed_key = NULL;
+-  gpgme_user_id_t signed_uid = NULL;
+-  gpgme_key_sig_t key_sig = NULL;
+   char *agent_info;
+-  int mode;
+-
+-  (void)argc;
+-  (void)argv;
+-
+-  init_gpgme (GPGME_PROTOCOL_OpenPGP);
+ 
+   err = gpgme_new (&ctx);
+   fail_if_err (err);
+ 
+-  /* Sign the key */
+   agent_info = getenv("GPG_AGENT_INFO");
+   if (!(agent_info && strchr (agent_info, ':')))
+     gpgme_set_passphrase_cb (ctx, passphrase_cb, 0);
+@@ -159,8 +147,23 @@ main (int argc, char **argv)
+   gpgme_data_release (out);
+   gpgme_key_unref (key);
+   gpgme_key_unref (signing_key);
++  gpgme_release (ctx);
++}
++
++
++void
++verify_key_signature (const char *key_fpr, const char *signer_keyid)
++{
++  gpgme_ctx_t ctx;
++  gpgme_error_t err;
++  gpgme_key_t signed_key = NULL;
++  gpgme_user_id_t signed_uid = NULL;
++  gpgme_key_sig_t key_sig = NULL;
++  int mode;
++
++  err = gpgme_new (&ctx);
++  fail_if_err (err);
+ 
+-  /* Verify the key signature */
+   mode  = gpgme_get_keylist_mode (ctx);
+   mode |= GPGME_KEYLIST_MODE_SIGS;
+   err = gpgme_set_keylist_mode (ctx, mode);
+@@ -168,7 +171,7 @@ main (int argc, char **argv)
+   err = gpgme_get_key (ctx, key_fpr, &signed_key, 0);
+   fail_if_err (err);
+ 
+-  signed_uid = key->uids;
++  signed_uid = signed_key->uids;
+   if (!signed_uid)
+     {
+       fprintf (stderr, "Signed key has no user IDs\n");
+@@ -180,7 +183,7 @@ main (int argc, char **argv)
+       exit (1);
+     }
+   key_sig = signed_uid->signatures->next;
+-  if (strcmp ("2D727CC768697734", key_sig->keyid))
++  if (strcmp (signer_keyid, key_sig->keyid))
+     {
+       fprintf (stderr, "Unexpected key ID in second user ID sig: %s\n",
+                 key_sig->keyid);
+@@ -196,6 +199,23 @@ main (int argc, char **argv)
+ 
+   gpgme_key_unref (signed_key);
+   gpgme_release (ctx);
++}
++
++
++int
++main (int argc, char **argv)
++{
++  const char *signer_fpr = "A0FF4590BB6122EDEF6E3C542D727CC768697734"; /* Alpha Test */
++  const char *signer_keyid = signer_fpr + strlen(signer_fpr) - 16;
++  const char *key_fpr = "D695676BDCEDCC2CDD6152BCFE180B1DA9E3B0B2"; /* Bravo Test */
++
++  (void)argc;
++  (void)argv;
++
++  init_gpgme (GPGME_PROTOCOL_OpenPGP);
++
++  sign_key (key_fpr, signer_fpr);
++  verify_key_signature (key_fpr, signer_keyid);
+ 
+   return 0;
+ }
diff --git a/app-crypt/gpgme/gpgme-1.15.1.ebuild b/app-crypt/gpgme/gpgme-1.15.1.ebuild
index b4cc775f0009..c4d0ad552ea2 100644
--- a/app-crypt/gpgme/gpgme-1.15.1.ebuild
+++ b/app-crypt/gpgme/gpgme-1.15.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -33,7 +33,7 @@ REQUIRED_USE="qt5? ( cxx ) python? ( ${PYTHON_REQUIRED_USE} )"
 do_python() {
 	if use python; then
 		pushd "lang/python" > /dev/null || die
-		top_builddir="../.." srcdir="." CPP=$(tc-getCPP) distutils-r1_src_${EBUILD_PHASE}
+		top_builddir="../.." srcdir="." CPP="$(tc-getCPP)" distutils-r1_src_${EBUILD_PHASE}
 		popd > /dev/null
 	fi
 }
diff --git a/app-crypt/gpgme/gpgme-1.16.0.ebuild b/app-crypt/gpgme/gpgme-1.16.0.ebuild
index e728a4e493cd..098664d90e4f 100644
--- a/app-crypt/gpgme/gpgme-1.16.0.ebuild
+++ b/app-crypt/gpgme/gpgme-1.16.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -14,7 +14,7 @@ SRC_URI="mirror://gnupg/gpgme/${P}.tar.bz2"
 
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="1/11" # subslot = soname major version
-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="common-lisp static-libs +cxx python qt5"
 
 # Note: On each bump, update dep bounds on each version from configure.ac!
@@ -32,12 +32,13 @@ REQUIRED_USE="qt5? ( cxx ) python? ( ${PYTHON_REQUIRED_USE} )"
 
 PATCHES=(
 	"${FILESDIR}"/${P}-glibc-2.34.patch
+	"${FILESDIR}"/${P}-fix-t-edit-sign-test.patch
 )
 
 do_python() {
 	if use python; then
 		pushd "lang/python" > /dev/null || die
-		top_builddir="../.." srcdir="." CPP=$(tc-getCPP) distutils-r1_src_${EBUILD_PHASE}
+		top_builddir="../.." srcdir="." CPP="$(tc-getCPP)" distutils-r1_src_${EBUILD_PHASE}
 		popd > /dev/null
 	fi
 }
diff --git a/app-crypt/gpgme/gpgme-1.17.0-r1.ebuild b/app-crypt/gpgme/gpgme-1.17.0-r1.ebuild
new file mode 100644
index 000000000000..d797fd48b232
--- /dev/null
+++ b/app-crypt/gpgme/gpgme-1.17.0-r1.ebuild
@@ -0,0 +1,114 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+DISTUTILS_OPTIONAL=1
+
+inherit distutils-r1 flag-o-matic libtool qmake-utils toolchain-funcs
+
+DESCRIPTION="GnuPG Made Easy is a library for making GnuPG easier to use"
+HOMEPAGE="http://www.gnupg.org/related_software/gpgme"
+SRC_URI="mirror://gnupg/gpgme/${P}.tar.bz2"
+
+LICENSE="GPL-2 LGPL-2.1"
+# Please check ABI on each bump, even if SONAMEs didn't change: bug #833355
+# Use e.g. app-portage/iwdevtools integration with dev-libs/libabigail's abidiff.
+# Subslot: SONAME of each: <libgpgme.libgpgmepp.libqgpgme>
+SLOT="1/11.6.7"
+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="common-lisp static-libs +cxx python qt5"
+
+# Note: On each bump, update dep bounds on each version from configure.ac!
+RDEPEND=">=app-crypt/gnupg-2
+	>=dev-libs/libassuan-2.5.3:=
+	>=dev-libs/libgpg-error-1.36:=
+	python? ( ${PYTHON_DEPS} )
+	qt5? ( dev-qt/qtcore:5 )"
+	#doc? ( app-doc/doxygen[dot] )
+DEPEND="${RDEPEND}
+	qt5? ( dev-qt/qttest:5 )"
+BDEPEND="python? ( dev-lang/swig )"
+
+REQUIRED_USE="qt5? ( cxx ) python? ( ${PYTHON_REQUIRED_USE} )"
+
+do_python() {
+	if use python; then
+		pushd "lang/python" > /dev/null || die
+		top_builddir="../.." srcdir="." CPP="$(tc-getCPP)" distutils-r1_src_${EBUILD_PHASE}
+		popd > /dev/null || die
+	fi
+}
+
+pkg_setup() {
+	addpredict /run/user/$(id -u)/gnupg
+
+	local MAX_WORKDIR=66
+	if [[ "${#WORKDIR}" -gt "${MAX_WORKDIR}" ]]; then
+		ewarn "Disabling tests as WORKDIR '${WORKDIR}' is longer than ${MAX_WORKDIR} which will fail tests"
+		SKIP_TESTS=1
+	fi
+}
+
+src_prepare() {
+	default
+	elibtoolize
+
+	# Make best effort to allow longer PORTAGE_TMPDIR
+	# as usock limitation fails build/tests
+	ln -s "${P}" "${WORKDIR}/b" || die
+	S="${WORKDIR}/b"
+}
+
+src_configure() {
+	local languages=()
+	use common-lisp && languages+=( "cl" )
+	use cxx && languages+=( "cpp" )
+	if use qt5; then
+		languages+=( "qt" )
+		#use doc ||
+		export DOXYGEN=true
+		export MOC="$(qt5_get_bindir)/moc"
+	fi
+
+	econf \
+		$([[ -n "${SKIP_TESTS}" ]] && echo "--disable-gpg-test --disable-gpgsm-test") \
+		--enable-languages="${languages[*]}" \
+		$(use_enable static-libs static)
+
+	use python && emake -C lang/python prepare
+
+	do_python
+}
+
+src_compile() {
+	default
+	do_python
+}
+
+src_test() {
+	[[ -z "${SKIP_TESTS}" ]] || return
+
+	default
+	if use python; then
+		test_python() {
+			emake -C lang/python/tests check \
+				PYTHON=${EPYTHON} \
+				PYTHONS=${EPYTHON} \
+				TESTFLAGS="--python-libdir=${BUILD_DIR}/lib"
+		}
+		python_foreach_impl test_python
+	fi
+}
+
+src_install() {
+	default
+	do_python
+	find "${ED}" -type f -name '*.la' -delete || die
+
+	# backward compatibility for gentoo
+	# in the past we had slots
+	dodir /usr/include/gpgme
+	dosym ../gpgme.h /usr/include/gpgme/gpgme.h
+}
diff --git a/app-crypt/gpgme/gpgme-1.17.1.ebuild b/app-crypt/gpgme/gpgme-1.17.1.ebuild
new file mode 100644
index 000000000000..8d6d21d828ce
--- /dev/null
+++ b/app-crypt/gpgme/gpgme-1.17.1.ebuild
@@ -0,0 +1,116 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+DISTUTILS_OPTIONAL=1
+
+inherit distutils-r1 libtool qmake-utils toolchain-funcs
+
+DESCRIPTION="GnuPG Made Easy is a library for making GnuPG easier to use"
+HOMEPAGE="http://www.gnupg.org/related_software/gpgme"
+SRC_URI="mirror://gnupg/gpgme/${P}.tar.bz2"
+
+LICENSE="GPL-2 LGPL-2.1"
+# Please check ABI on each bump, even if SONAMEs didn't change: bug #833355
+# Use e.g. app-portage/iwdevtools integration with dev-libs/libabigail's abidiff.
+# Subslot: SONAME of each: <libgpgme.libgpgmepp.libqgpgme>
+SLOT="1/11.6.15"
+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="common-lisp static-libs +cxx python qt5"
+
+# Note: On each bump, update dep bounds on each version from configure.ac!
+RDEPEND=">=app-crypt/gnupg-2
+	>=dev-libs/libassuan-2.5.3:=
+	>=dev-libs/libgpg-error-1.36:=
+	python? ( ${PYTHON_DEPS} )
+	qt5? ( dev-qt/qtcore:5 )"
+	#doc? ( app-doc/doxygen[dot] )
+DEPEND="${RDEPEND}
+	qt5? ( dev-qt/qttest:5 )"
+BDEPEND="python? ( dev-lang/swig )"
+
+REQUIRED_USE="qt5? ( cxx ) python? ( ${PYTHON_REQUIRED_USE} )"
+
+do_python() {
+	if use python; then
+		pushd "lang/python" > /dev/null || die
+		top_builddir="../.." srcdir="." CPP="$(tc-getCPP)" distutils-r1_src_${EBUILD_PHASE}
+		popd > /dev/null || die
+	fi
+}
+
+src_prepare() {
+	default
+
+	elibtoolize
+
+	# bug #697456
+	addpredict /run/user/$(id -u)/gnupg
+
+	local MAX_WORKDIR=66
+	if [[ "${#WORKDIR}" -gt "${MAX_WORKDIR}" ]]; then
+		ewarn "Disabling tests as WORKDIR '${WORKDIR}' is longer than ${MAX_WORKDIR} which will fail tests"
+		SKIP_TESTS=1
+	fi
+
+	# Make best effort to allow longer PORTAGE_TMPDIR
+	# as usock limitation fails build/tests
+	ln -s "${P}" "${WORKDIR}/b" || die
+	S="${WORKDIR}/b"
+}
+
+src_configure() {
+	local languages=()
+	use common-lisp && languages+=( "cl" )
+	use cxx && languages+=( "cpp" )
+	if use qt5; then
+		languages+=( "qt" )
+		#use doc ||
+		export DOXYGEN=true
+		export MOC="$(qt5_get_bindir)/moc"
+	fi
+
+	# bug #811933 for libassuan prefix
+	econf \
+		$([[ -n "${SKIP_TESTS}" ]] && echo "--disable-gpg-test --disable-gpgsm-test") \
+		--enable-languages="${languages[*]}" \
+		--with-libassuan-prefix="${ESYSROOT}"/usr \
+		$(use_enable static-libs static)
+
+	use python && emake -C lang/python prepare
+
+	do_python
+}
+
+src_compile() {
+	default
+	do_python
+}
+
+src_test() {
+	[[ -z "${SKIP_TESTS}" ]] || return
+
+	default
+	if use python; then
+		test_python() {
+			emake -C lang/python/tests check \
+				PYTHON=${EPYTHON} \
+				PYTHONS=${EPYTHON} \
+				TESTFLAGS="--python-libdir=${BUILD_DIR}/lib"
+		}
+		python_foreach_impl test_python
+	fi
+}
+
+src_install() {
+	default
+	do_python
+	find "${ED}" -type f -name '*.la' -delete || die
+
+	# backward compatibility for gentoo
+	# in the past we had slots
+	dodir /usr/include/gpgme
+	dosym ../gpgme.h /usr/include/gpgme/gpgme.h
+}
diff --git a/app-crypt/gpgme/metadata.xml b/app-crypt/gpgme/metadata.xml
index b051a2c89017..12645d415e43 100644
--- a/app-crypt/gpgme/metadata.xml
+++ b/app-crypt/gpgme/metadata.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<name>Lars Wendler</name>
-		<email>polynomial-c@gentoo.org</email>
+	<maintainer type="project">
+		<email>base-system@gentoo.org</email>
+		<name>Gentoo Base System</name>
 	</maintainer>
 	<use>
 		<flag name="common-lisp">Install common-lisp files</flag>
diff --git a/app-crypt/gpgstats/Manifest b/app-crypt/gpgstats/Manifest
index 20549c6ccc31..31c2996b81cf 100644
--- a/app-crypt/gpgstats/Manifest
+++ b/app-crypt/gpgstats/Manifest
@@ -1,4 +1,4 @@
 AUX gpgstats-0.5-flags.patch 668 BLAKE2B 5436cbb050c6f52edf74182127f2fc5e50c22808f3f8b80600c362ba652fd3b0ce927d9ead7f4ca28425046021b3e477e56a719bc63ab4a45b6e0025b259a00a SHA512 8f54993f957d8d93da495530dea25734f9e5fedc1d5dc17aa4b517daabc88f8162ab2565159a51daa203ef2b039e80122e009bd23dab862be87ad5a75e072546
 DIST gpgstats-0.5.tgz 6691 BLAKE2B 681a4bb06b4ab7156c35d81510238420121d1854d3f8f678fce6017331e2f9c6db9ea413f45dcce1570f917fd636a586ee816f998dbd17347473e1da964bd617 SHA512 273f08af37089eb43cee65fa06ff8023e1951fa4649bf208e01d6bc453e4131c11128b511c6cbd8396a7bd93722904e8930168656994e3d4d055024c3d5fb649
-EBUILD gpgstats-0.5-r1.ebuild 573 BLAKE2B 01cb2a505f6baec4ac7e40b42bb4b98f4bdd45cca677764f5a68c2e8fb880615c41cbe66bc1bd47ddfd850227beb6e9f08b970b82480d9ab8cdc4ff3f7a9b213 SHA512 843c09ba4fa5ee2943fae404384141bb13608a77d7a8105416b40da5b3f362e7ff6ef9d8c1f6166e51e754e70c217efca2f8d3337202b62ca8915c4a7571315c
+EBUILD gpgstats-0.5-r2.ebuild 573 BLAKE2B 9220faf47449ef822c4ade0eb9a94846353cac8b562b4f115c4b18fe281a3afaa07841087f828fd949364cb6f3d02c9c5b255f7799601ee62978d1888e916b14 SHA512 609d011108d5282f31a6d381ee5e1d3ea6549decc6b6a6c94777ad3aaeeb37524cc385f6d03b8db1560254f578ee5076cdae32a93197641a2deae117fa1a7609
 MISC metadata.xml 217 BLAKE2B fbec54484edc2603e95c90cb231985ef0f5f8d2cd48632ac8a097a4dac165499ff4cc087b1ca9ba6a4368bbb73b3af1ee99622a80df17072e1a340c345a2ee64 SHA512 7d3fc456b183fe7bdea26fb6edce39f702741a762b74cd7d2159a0ba85af50ebc87fbd921c926692a6164d50c9faf6b19680ab96528819bb06aaeac679e42de2
diff --git a/app-crypt/gpgstats/gpgstats-0.5-r1.ebuild b/app-crypt/gpgstats/gpgstats-0.5-r2.ebuild
index aaf6c2ee7add..85f24aeaccea 100644
--- a/app-crypt/gpgstats/gpgstats-0.5-r1.ebuild
+++ b/app-crypt/gpgstats/gpgstats-0.5-r2.ebuild
@@ -1,28 +1,28 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 inherit toolchain-funcs
 
 DESCRIPTION="GPGstats calculates statistics on the keys in your key-ring"
 HOMEPAGE="http://www.vanheusden.com/gpgstats/"
 SRC_URI="http://www.vanheusden.com/gpgstats/${P}.tgz"
+
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-RDEPEND="app-crypt/gpgme"
+
+RDEPEND="app-crypt/gpgme:="
 DEPEND="${RDEPEND}"
 
-PATCHES=(
-	"${FILESDIR}/${P}-flags.patch"
-)
+PATCHES=( "${FILESDIR}"/${P}-flags.patch )
 
 src_compile() {
 	emake CC="$(tc-getCC)" CXX="$(tc-getCXX)" DEBUG=
 }
 
 src_install() {
-	einstalldocs
 	dobin gpgstats
+	einstalldocs
 }
diff --git a/app-crypt/heimdal/Manifest b/app-crypt/heimdal/Manifest
index 38cba01e6831..cc5d37e4aa2c 100644
--- a/app-crypt/heimdal/Manifest
+++ b/app-crypt/heimdal/Manifest
@@ -14,5 +14,5 @@ AUX heimdal_hcrypto.patch 1522 BLAKE2B 3a66fe288a7bede24a6aa124fde058d5ea891a4f8
 AUX heimdal_tinfo.patch 711 BLAKE2B 730ef4b1ba79d80c7257d1bd04783584cf616b2e51d6028fe3160dfdc113b6243c7af8c116ff969de439ebb79bab9091f8e5d6e9037c2b48541e6cbc83ba1026 SHA512 b4c63c9e945b914009569e62fd53229032ffaecde11dc4d02a89d5ba65f2c28020d43af8f2c26d87e2b383ba6dd3c3f4c4b69529471bc1928b45a9b5c437958d
 AUX krb5.conf 424 BLAKE2B 49b8a0aab6e0dacb70b91e030bb5f2b8bdfe4253026f85e2c9d16bdf6f554c585572ed9d3835bed976c8953fc92d0f42270c6a0767e943ec5efa5b79f6f4cf89 SHA512 4dad6837344e30c6988355551b5b82bce748dad7aa7648204ba7852540ad3a546b5344926789d60e78d57ff20dff87b680b790dc8d86c8dec1008feb0d809e38
 DIST heimdal-7.7.0.tar.gz 10189293 BLAKE2B db9cdd1861dc9214a7f76b3d8b9656cfc0bad11cb6eadffa4fa29ea7f9aabd4c3d1b628c510644ec9abe1b3bf27a413ccf8cd590d602c4a4ac54ba3deb4cedc4 SHA512 6660939b5a36ce36310721a08a089fb671d1e3d2e8ac74ea4775bfa5f8f772d32de805551456200fe96cc486c092c44beb84f5dd877008bc305490ee971bbf99
-EBUILD heimdal-7.7.0-r3.ebuild 4592 BLAKE2B 41de423c53ecc600c1f97dabba9d479bf3c94ce984aa4c850a9af392d141eea8809265aa4cf550d953abe5194045c079cfa7e5f3c7a8274bc98d85c1aa3728a4 SHA512 a807942e5d2981ca44728c4bc14f5c8747d6131157a32d5cae46163c450f0976ebe5148c6aaaefa5fe0bb8f1e5a93e17a1c47b9d77dd3a8c0e90f32dc9c7d82d
+EBUILD heimdal-7.7.0-r3.ebuild 4593 BLAKE2B 2b53d451ab63ab18ed7a8f10e8211d07258d433d79f97df474e61ecf27b88c308c5253dcdbbeb76c6ecbc96d46e786c786ee766aa1a83f57f2bc812a09ee08b8 SHA512 a6f378f447fd70cc7d6aa55e7cc405803afc6606b9e5ccd0c7a82f0364996af031b1167d64c3a02e477130471dc8573f66d8fd498e6a9c1b585711917345c27d
 MISC metadata.xml 571 BLAKE2B 3e6c723e5f9823cb72741fb666a67c14c52a6b206624c4d5329b19921c8305c03c8f1e586ee087000ffd189c8d4ca84ab413c79d35d2aa039369e2e2064c2866 SHA512 35020bf848f8caa61ea7bb46bddd9acc28fdcd9a9bab2f0dfdb701a0689d20ad38a09c03c141d106234363ed805fea575b47c1e79fc0dbd950bb75ea4b294026
diff --git a/app-crypt/heimdal/heimdal-7.7.0-r3.ebuild b/app-crypt/heimdal/heimdal-7.7.0-r3.ebuild
index 877ceb3362f7..832a5ab34fbd 100644
--- a/app-crypt/heimdal/heimdal-7.7.0-r3.ebuild
+++ b/app-crypt/heimdal/heimdal-7.7.0-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -15,7 +15,7 @@ SRC_URI="https://github.com/${PN}/${PN}/releases/download/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ppc64 ~riscv ~s390 sparc x86"
 IUSE="afs +berkdb caps gdbm hdb-ldap +lmdb otp selinux ssl static-libs test X"
 RESTRICT="!test? ( test )"
 
diff --git a/app-crypt/hmaccalc/Manifest b/app-crypt/hmaccalc/Manifest
deleted file mode 100644
index 821061c720e9..000000000000
--- a/app-crypt/hmaccalc/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST hmaccalc-0.9.14.tar.gz 111893 BLAKE2B 30aebd67e49db354c616110477e78fd6923df3ddfbe5e5023fd791bd90c783031da8c631fbfc9e5f2bdae06a08da1d56a08df921ddee359b630c5665e833ad4e SHA512 688a72b4e534ca4a1d45a116c0361ffd389de93dfdeec68e35cbffe0be13832789abaf33300003e12c7317ba473d3a0415f4b22cb3b7b36946c04bd40aa49184
-EBUILD hmaccalc-0.9.14.ebuild 571 BLAKE2B 9864a99137f4c76df27c3762e401192eb7239c062adf254b1e3791a118e25fc4caeb998654cba74d8125f09d898dd4e3b73bb3084879502f8995e54f6aa75204 SHA512 546d13ab95aec19fe7f8ed86b120ec4210cc0f6492c09ba440f5f0cd8e543035376b03fb4a4bd448928e993cd1be84380c6958863adbbe40a3c3448ce82926a1
-MISC metadata.xml 605 BLAKE2B 88a55c7be04d6127bde2bc82fe024cb64449ff5c995964c025d013cd9dd535739d1d8d88dbb981e4240cfd06fef390aa48a7df857b9fe9cd7065e2a6f35f0dc9 SHA512 24d9dd4a3af22a97d7c59868b691a6b3b6581ca58340eaf70f0017fefad88aba14b6859451007bb47b119e90c7e3cc8da25a4f90a20054e9a41fcfef4a14e67a
diff --git a/app-crypt/hmaccalc/hmaccalc-0.9.14.ebuild b/app-crypt/hmaccalc/hmaccalc-0.9.14.ebuild
deleted file mode 100644
index b094e1169982..000000000000
--- a/app-crypt/hmaccalc/hmaccalc-0.9.14.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit multilib-minimal
-
-DESCRIPTION="Tools for computing and checking HMAC values for files"
-HOMEPAGE="https://pagure.io/hmaccalc"
-SRC_URI="https://releases.pagure.org/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="+fips"
-
-DEPEND="dev-libs/nss
-		sys-devel/prelink"
-RDEPEND="${DEPEND}"
-
-multilib_src_configure() {
-	ECONF_SOURCE="${S}" econf \
-		--enable-sum-directory=/usr/$(get_libdir)/${PN}/ \
-		$(use_enable !fips non-fips)
-}
diff --git a/app-crypt/hmaccalc/metadata.xml b/app-crypt/hmaccalc/metadata.xml
deleted file mode 100644
index 48c380e56115..000000000000
--- a/app-crypt/hmaccalc/metadata.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<!-- maintainer-needed -->
-<use>
-<flag name="fips">Enable NSS FIPS mode and support only the FIPS-compliant functions</flag>
-</use>
-<longdescription>
-hmaccalc can be used to compute HMAC (hash-based message authentication code)
-values for files. An HMAC is similar in concept to a message digest, except in
-that its calculation also incorporates a key which must be known to both the
-party generating the HMAC and the party verifying the HMAC. 
-</longdescription>
-</pkgmetadata>
diff --git a/app-crypt/ima-evm-utils/Manifest b/app-crypt/ima-evm-utils/Manifest
index c43718818651..e0359c72bd16 100644
--- a/app-crypt/ima-evm-utils/Manifest
+++ b/app-crypt/ima-evm-utils/Manifest
@@ -1,7 +1,12 @@
 AUX ima-evm-utils-1.1-configure-use-sys-xattr-bug-649790.patch 1332 BLAKE2B 1787a1f7154843123c1b4879f2e159ffef5ed8edb64a34ba84c5cbc71b1bdf34db63686e26f44554da67731ed857ca399219a1e7b36ca1630bac0705be56d2de SHA512 02642544797076d3c1568b11cc8edb303d844a2b9d9088af80f3bf7135da25635cbf7ce67387d9c51365466fc60942254773854fb9eff5562e2c7fff88d5a42f
+AUX ima-evm-utils-1.4-configure-remove-automagic-TSS-dependencies.patch 1514 BLAKE2B 8c1e8b80c3aecae969a1f4840667ae85665100902c53022b08782bbeda53a684880d9814abd27a52938f51d6366bc2187bd021ca1a7a4a9cfddc07a111f2f02f SHA512 62c5a073a6a3bed7c04973bddcb1f29d477fc2ae7aa68956c7e8a9725d3bbe4185c4ffb9cdbd1ee2d42b9b70a66bdb4b882496b46522367302aaeb461e59a300
+AUX ima-evm-utils-1.4-test-Rename-bash-variable-WORKDIR-to-MYWORKDIR.patch 2959 BLAKE2B 597c24af59c0d12e4b86e5397a7f18e27ec2c24c657dd65ee4264c95a9bad1b089d5de7ad3e203560b09f5fe320883dcbbce8bd05e3d8f386d81b87f822c523b SHA512 667a6343b1ab8dfa2e3439392fa0663ec50efd46914a4ea0f657c3614b8884db35b676b0171d47d524a82c0fe0ea6538babf7b64ebe3068c9d6cac20af1d7405
+AUX ima-evm-utils-1.4-test-remove-boot_aggregate.patch 6458 BLAKE2B 6a2b60d7c098da28fd7c4de333552965417735e028e0f6f6c7561a54fb2ee2fff397d4754371c00cd5cff6b8ad54a975a89d84b89b803a94a9e999cc2232c9e2 SHA512 85f54a0972d40e40251f9de5b151e17e48610c29d8207c583934e03ec9b295b13563d5382d42b5ec618c152961420c4899cdfa52fd1622279b9765a20682c426
 DIST ima-evm-utils-1.1.tar.gz 37825 BLAKE2B 469f5bbc194f3fcc8996f252d01745c0d8d4d4f63476174622ea4569c97978db478bd522ae4672819c5ef995f2bb524eb857e5bf5c303131959f2f5cb9c2ebcc SHA512 fc7efc890812233db888eef210dc4357bee838b56fd95efd9a9e141d684b0b354670a3c053dd93a94a1402dd826074d4a83a4637c8e6c1d90ead3132354a5776
 DIST ima-evm-utils-1.3.2.tar.gz 100373 BLAKE2B 04717a934795f7e2a351b1f59388d2d429e00a8a18c57c0eb258bb81bc329342cb9971fa2b4493f7b492f07961ec794a0549fd2d0984381492dcab474915a0d6 SHA512 af96935f953fbec8cdd40ba1a24001fae916633df03f9dee1e96775baec0ffea21a7a13798b3e3c3f375fd493a65fe65b5357887890b46cac0c4dcca5a5b79db
+DIST ima-evm-utils-1.4.tar.gz 110104 BLAKE2B 12e09162e0d5e689132dde6b814ceeb8001a0379e8edb89b9aeb87c8e9f6e21fdd554e6626d1496b82cc77213fdf08b26bcc0be77140d7d598589a482940a321 SHA512 2fdf41470d88608162a084c4877ba17d531941b744bcb44dd4913e48ab2c2d131e0af3e3ead74c18748a5d46aced51213ebd7c13a5ee19050c28d54a26c011a3
 EBUILD ima-evm-utils-1.1-r1.ebuild 930 BLAKE2B e781a98fbaa64eddde0e5da3e83078d081b38fd5793233774d704e78f1cb0fccbf6c4967cf3b54c4fe9b7441ea65368744d5dbc5bf19742bcf4cf2636ac10419 SHA512 d0ce0baafa523571fe772d277c86cf56cc9f540e13dd8a0e6b90332f61abb9c4ee9417adb2452f6e56b8b482ffb240d42025e24fb95794b0598c2d8fc27bb746
 EBUILD ima-evm-utils-1.3.2.ebuild 939 BLAKE2B 65582200fc5b73c90d4fef83297001d1d94c76fb4f7a60550929ae8fb25314fe3efdde4b0dbea4de577ba75e78d171342c7c04ef94d544d60d5a2cb9296cfc72 SHA512 348f47d3a235ba09437593c6408c5cf3f7d448f0f238138208d1e2181800b7eb4e3d3a34e2612eb77a0c3ecea706cac295fa5350921e70dd2674687392e041f5
-EBUILD ima-evm-utils-9999.ebuild 924 BLAKE2B a78f12fd68b67be06b6d897ff864ad1df3e864a0b102e6b483045aa4e34410f603126895d1e97509ed26d98eb760b79cdd7256db5fe3e5beda289aefe1e91d71 SHA512 3306757d5d64cf1fab08f1260484c71b4bd333eb106baa57bdc70f7396680db3a5ecc74ca2f2629119851bb70a4db8f4bff632c3689ea47c5717b872e497f065
-MISC metadata.xml 331 BLAKE2B 1c72879ab3666f6dcb1b9b4f5b268ba4763a4d0c833e349d454a3a480ae70f3f287b1514ec04f3c79595658f7815d1e35be5247af5b64d0036b1c2206529ed7d SHA512 6c63abaa5dfda37911626af3683da11115bc6f753cba511a95b4c129912c19e516b8a4a71f9fe905c27924022e2bc6585444683000a4d6a2c3b3709b0818fa76
+EBUILD ima-evm-utils-1.4.ebuild 1201 BLAKE2B 0f01e3c5e65155daf2e869307436adf869fc4257dc722b884977292a832691e3abea1cd03440d067efc0e6d4e7df583618d332e325eff19b50256ebf84c51c6e SHA512 0fbe3f919c7c8c5658bbb274479d61d62bb5847e29c8fbf8707fab65701883bff426a9d7bf1db8ab75184f2b1c80d912ae33c356e70b270f0f76da581c97a6a4
+EBUILD ima-evm-utils-9999.ebuild 1186 BLAKE2B 0c7e9419d4886165fd938d8058b68e168e2ddb656a246806ced171a7d7e39a6ccbc87dd04e3ff45de91625f26d0a9e324379afc9ea7c3b3731d7d3de09601b4a SHA512 b522120664f846af5829062f2ac59538645c89f0c317977675d2d68374d5f64c81d0308c1aa7bffb25ec6bec6d29510cecfe1f6400cce786f7045e2382cb6741
+MISC metadata.xml 392 BLAKE2B c837347437c375cfc21f3b3708942ffbcbc3c3456aef565046c1a01b27dba3d900ad9a755af8c1ba2fcdd4ebc7298cf3fbcc346ada5f2ce7c8b45fcc0286f63a SHA512 44cba0b9d16b1f89ff587ac7ac675fe4965f18165d719c29d88f4d4257e59fd9a87373f2b30c24731a4e2e3a8a2afb0f394612c65dba51f0e8a7ec9764663023
diff --git a/app-crypt/ima-evm-utils/files/ima-evm-utils-1.4-configure-remove-automagic-TSS-dependencies.patch b/app-crypt/ima-evm-utils/files/ima-evm-utils-1.4-configure-remove-automagic-TSS-dependencies.patch
new file mode 100644
index 000000000000..a5fb28a291fb
--- /dev/null
+++ b/app-crypt/ima-evm-utils/files/ima-evm-utils-1.4-configure-remove-automagic-TSS-dependencies.patch
@@ -0,0 +1,39 @@
+From 911cef2b984a947b1020bdcf87d1573600ea754d Mon Sep 17 00:00:00 2001
+From: Christopher Byrne <salah.coronya@gmail.com>
+Date: Fri, 5 Nov 2021 21:31:10 -0500
+Subject: [PATCH] configure.ac: Remove automagic dependencies on the TSS stacks
+
+Signed-off-by: Christopher Byrne <salah.coronya@gmail.com>
+---
+ configure.ac | 12 +++++++++---
+ 1 file changed, 9 insertions(+), 3 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 1a0f093..c05b72d 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -31,12 +31,18 @@ AC_CHECK_HEADER(unistd.h)
+ AC_CHECK_HEADERS(openssl/conf.h)
+ 
+ # Intel TSS
+-AC_CHECK_LIB([tss2-esys], [Esys_Free])
+-AC_CHECK_LIB([tss2-rc], [Tss2_RC_Decode])
++AC_ARG_WITH([pcrtss], AS_HELP_STRING([--with-pcrtss], [Build with Intel TSS library (default: disabled)]))
++AS_IF([test "x$with_pcrtss" = "xyes"], [
++  AC_CHECK_LIB([tss2-esys], [Esys_Free])
++  AC_CHECK_LIB([tss2-rc], [Tss2_RC_Decode])
++])
+ AM_CONDITIONAL([USE_PCRTSS], [test "x$ac_cv_lib_tss2_esys_Esys_Free" = "xyes"])
+ 
+ # IBM TSS include files
+-AC_CHECK_HEADER(ibmtss/tss.h, [], [], [[#define TPM_POSIX]])
++AC_ARG_WITH([ibmtss], AS_HELP_STRING([--with-ibmtss], [Build with IBM TSS library (default: disabled)]))
++AS_IF([test "x$with_ibmtss" = "xyes"], [
++  AC_CHECK_HEADER(ibmtss/tss.h, [], [], [[#define TPM_POSIX]])
++])
+ AM_CONDITIONAL([USE_IBMTSS], [test "x$ac_cv_header_ibmtss_tss_h" = "xyes"])
+ 
+ AC_CHECK_HEADERS(sys/xattr.h, , [AC_MSG_ERROR([sys/xattr.h header not found. You need the c-library development package.])])
+-- 
+2.32.0
+
diff --git a/app-crypt/ima-evm-utils/files/ima-evm-utils-1.4-test-Rename-bash-variable-WORKDIR-to-MYWORKDIR.patch b/app-crypt/ima-evm-utils/files/ima-evm-utils-1.4-test-Rename-bash-variable-WORKDIR-to-MYWORKDIR.patch
new file mode 100644
index 000000000000..41dd2cd6fb0c
--- /dev/null
+++ b/app-crypt/ima-evm-utils/files/ima-evm-utils-1.4-test-Rename-bash-variable-WORKDIR-to-MYWORKDIR.patch
@@ -0,0 +1,84 @@
+From 5be7797f96db606c16701b6cb7e218a487c4cf4a Mon Sep 17 00:00:00 2001
+From: Christopher Byrne <salah.coronya@gmail.com>
+Date: Sat, 6 Nov 2021 15:36:48 -0500
+Subject: [PATCH] test: Rename bash variable WORKDIR to MYWORKDIR
+
+Gentoo Portage ALSO uses the variable WORKDIR, and this results in
+Portage deleting the entire tree if the tests are run under it
+
+Signed-off-by: Christopher Byrne <salah.coronya@gmail.com>
+---
+ tests/functions.sh     | 12 ++++++------
+ tests/sign_verify.test |  6 +++---
+ 2 files changed, 9 insertions(+), 9 deletions(-)
+
+diff --git a/tests/functions.sh b/tests/functions.sh
+index 8f6f02d..eb6b34a 100755
+--- a/tests/functions.sh
++++ b/tests/functions.sh
+@@ -250,8 +250,8 @@ _enable_gost_engine() {
+ # Show test stats and exit into automake test system
+ # with proper exit code (same as ours). Do cleanups.
+ _report_exit_and_cleanup() {
+-  if [ -n "${WORKDIR}" ]; then
+-    rm -rf "${WORKDIR}"
++  if [ -n "${MYWORKDIR}" ]; then
++    rm -rf "${MYWORKDIR}"
+   fi
+ 
+   if [ $testsfail -gt 0 ]; then
+@@ -277,19 +277,19 @@ _report_exit_and_cleanup() {
+ }
+ 
+ # Setup SoftHSM for local testing by calling the softhsm_setup script.
+-# Use the provided workdir as the directory where SoftHSM will store its state
++# Use the provided myworkdir as the directory where SoftHSM will store its state
+ # into.
+ # Upon successfully setting up SoftHSM, this function sets the global variables
+ # OPENSSL_ENGINE and OPENSSL_KEYFORM so that the openssl command line tool can
+ # use SoftHSM. Also the PKCS11_KEYURI global variable is set to the test key's
+ # pkcs11 URI.
+ _softhsm_setup() {
+-  local workdir="$1"
++  local myworkdir="$1"
+ 
+   local msg
+ 
+-  export SOFTHSM_SETUP_CONFIGDIR="${workdir}/softhsm"
+-  export SOFTHSM2_CONF="${workdir}/softhsm/softhsm2.conf"
++  export SOFTHSM_SETUP_CONFIGDIR="${myworkdir}/softhsm"
++  export SOFTHSM2_CONF="${myworkdir}/softhsm/softhsm2.conf"
+ 
+   mkdir -p "${SOFTHSM_SETUP_CONFIGDIR}"
+ 
+diff --git a/tests/sign_verify.test b/tests/sign_verify.test
+index c56290a..b619c22 100755
+--- a/tests/sign_verify.test
++++ b/tests/sign_verify.test
+@@ -29,7 +29,7 @@ fi
+ ./gen-keys.sh >/dev/null 2>&1
+ 
+ trap _report_exit_and_cleanup EXIT
+-WORKDIR=$(mktemp -d)
++MYWORKDIR=$(mktemp -d)
+ set -f # disable globbing
+ 
+ # Determine keyid from a cert
+@@ -426,7 +426,7 @@ expect_fail \
+   check_sign TYPE=ima KEY=gost2012_256-B ALG=md_gost12_512 PREFIX=0x0302 OPTS=
+ 
+ # Test signing with key described by pkcs11 URI
+-_softhsm_setup "${WORKDIR}"
++_softhsm_setup "${MYWORKDIR}"
+ if [ -n "${PKCS11_KEYURI}" ]; then
+   expect_pass check_sign FILE=pkcs11test TYPE=ima KEY=${PKCS11_KEYURI} ALG=sha256 PREFIX=0x030204aabbccdd0100 OPTS=--keyid=aabbccdd
+   expect_pass check_sign FILE=pkcs11test TYPE=ima KEY=${PKCS11_KEYURI} ALG=sha1   PREFIX=0x030202aabbccdd0100 OPTS=--keyid=aabbccdd
+@@ -436,4 +436,4 @@ else
+   expect_pass __skip
+   expect_pass __skip
+ fi
+-_softhsm_teardown "${WORKDIR}"
++_softhsm_teardown "${MYWORKDIR}"
+-- 
+2.32.0
+
diff --git a/app-crypt/ima-evm-utils/files/ima-evm-utils-1.4-test-remove-boot_aggregate.patch b/app-crypt/ima-evm-utils/files/ima-evm-utils-1.4-test-remove-boot_aggregate.patch
new file mode 100644
index 000000000000..701a81614f78
--- /dev/null
+++ b/app-crypt/ima-evm-utils/files/ima-evm-utils-1.4-test-remove-boot_aggregate.patch
@@ -0,0 +1,216 @@
+diff --git a/tests/Makefile.am b/tests/Makefile.am
+index ff928e1..029f2ff 100644
+--- a/tests/Makefile.am
++++ b/tests/Makefile.am
+@@ -1,7 +1,7 @@
+ check_SCRIPTS =
+ TESTS = $(check_SCRIPTS)
+ 
+-check_SCRIPTS += ima_hash.test sign_verify.test boot_aggregate.test
++check_SCRIPTS += ima_hash.test sign_verify.test
+ 
+ clean-local:
+ 	-rm -f *.txt *.out *.sig *.sig2
+diff --git a/tests/boot_aggregate.test b/tests/boot_aggregate.test
+deleted file mode 100755
+index d711566..0000000
+--- a/tests/boot_aggregate.test
++++ /dev/null
+@@ -1,197 +0,0 @@
+-#!/bin/bash
+-
+-#
+-# Calculate the boot_aggregate for each TPM bank, verifying that the
+-# boot_aggregate in the IMA measurement list matches one of them.
+-#
+-# A software TPM may be used to verify the boot_aggregate.  If a
+-# software TPM is not already running on the system, this test
+-# starts one and initializes the TPM PCR banks by walking the sample
+-# binary_bios_measurements event log, included in this directory, and
+-# extending the TPM PCRs.  The associated ascii_runtime_measurements
+-# for verifying the calculated boot_aggregate is included in this
+-# directory as well.
+-
+-trap cleanup SIGINT SIGTERM EXIT
+-
+-# Base VERBOSE on the environment variable, if set.
+-VERBOSE="${VERBOSE:-0}"
+-
+-cd "$(dirname "$0")"
+-export PATH=../src:$PATH
+-export LD_LIBRARY_PATH=$LD_LIBRARY_PATH
+-. ./functions.sh
+-_require evmctl
+-TSSDIR="$(dirname -- "$(which tssstartup)")"
+-PCRFILE="/sys/class/tpm/tpm0/device/pcrs"
+-MISC_PCRFILE="/sys/class/misc/tpm0/device/pcrs"
+-
+-# Only stop this test's software TPM
+-cleanup() {
+-	if [ -n "${SWTPM_PID}" ]; then
+-		kill -SIGTERM "${SWTPM_PID}"
+-	elif [ -n "${TPMSERVER_PID}" ]; then
+-		"${TSSDIR}/tsstpmcmd" -stop
+-	fi
+-}
+-
+-# Try to start a software TPM if needed.
+-swtpm_start() {
+-	local tpm_server swtpm
+-
+-	tpm_server="$(which tpm_server)"
+-	swtpm="$(which swtpm)"
+-	if [ -z "${tpm_server}" ] && [ -z "${swtpm}" ]; then
+-		echo "${CYAN}SKIP: Software TPM (tpm_server and swtpm) not found${NORM}"
+-		return "$SKIP"
+-	fi
+-
+-	if [ -n "${swtpm}" ]; then
+-		pgrep swtpm
+-		if [ $? -eq 0 ]; then
+-			echo "INFO: Software TPM (swtpm) already running"
+-			return 114
+-		else
+-			echo "INFO: Starting software TPM: ${swtpm}"
+-			mkdir -p ./myvtpm
+-			${swtpm} socket --tpmstate dir=./myvtpm --tpm2 --ctrl type=tcp,port=2322 --server type=tcp,port=2321 --flags not-need-init > /dev/null 2>&1 &
+-			SWTPM_PID=$!
+-		fi
+-	elif [ -n "${tpm_server}" ]; then
+-		# tpm_server uses the Microsoft simulator encapsulated packet format
+-		export TPM_SERVER_TYPE="mssim"
+-		pgrep tpm_server
+-		if [ $? -eq 0 ]; then
+-			echo "INFO: Software TPM (tpm_server) already running"
+-			return 114
+-		else
+-			echo "INFO: Starting software TPM: ${tpm_server}"
+-			${tpm_server} > /dev/null 2>&1 &
+-			TPMSERVER_PID=$!
+-		fi
+-	fi
+-	return 0
+-}
+-
+-# Initialize the software TPM using the sample binary_bios_measurements log.
+-swtpm_init() {
+-	if [ ! -f "${TSSDIR}/tssstartup" ] || [ ! -f "${TSSDIR}/tsseventextend" ]; then
+-		echo "${CYAN}SKIP: tssstartup and tsseventextend needed for test${NORM}"
+-		return "$SKIP"
+-	fi
+-
+-	echo "INFO: Sending software TPM startup"
+-	"${TSSDIR}/tssstartup"
+-	if [ $? -ne 0 ]; then
+-		echo "INFO: Retry sending software TPM startup"
+-		sleep 1
+-		"${TSSDIR}/tssstartup"
+-	fi
+-
+-	if [ $? -ne 0 ]; then
+-		echo "INFO: Software TPM startup failed"
+-		return "$SKIP"
+-	fi
+-
+-	echo "INFO: Walking ${BINARY_BIOS_MEASUREMENTS} initializing the software TPM"
+-#	$(${TSSDIR}/tsseventextend -tpm -if "${BINARY_BIOS_MEASUREMENTS}" -v) 2>&1 > /dev/null
+-	"${TSSDIR}/tsseventextend" -tpm -if "${BINARY_BIOS_MEASUREMENTS}" -v > /dev/null 2>&1
+-}
+-
+-# In VERBOSE mode, display the calculated TPM PCRs for the different banks.
+-display_pcrs() {
+-	local PCRMAX=9
+-	local banks=("sha1" "sha256")
+-	local i;
+-
+-	for bank in "${banks[@]}"; do
+-		echo "INFO: Displaying ${bank} TPM bank (PCRs 0 - 9)"
+-		for i in $(seq 0 $PCRMAX); do
+-			rc=0
+-			pcr=$("${TSSDIR}/tsspcrread" -halg "${bank}" -ha "${i}" -ns)
+-			if [ $rc -ne 0 ]; then
+-				echo "INFO: tsspcrread failed: $pcr"
+-				break
+-			fi
+-			echo "$i: $pcr"
+-		done
+-	done
+-}
+-
+-# The first entry in the IMA measurement list is the "boot_aggregate".
+-# For each kexec, an additional "boot_aggregate" will appear in the
+-# measurement list, assuming the previous measurement list is carried
+-# across the kexec.
+-#
+-# Verify that the last "boot_aggregate" record in the IMA measurement
+-# list matches.
+-check() {
+-	echo "INFO: Calculating the boot_aggregate (PCRs 0 - 9) for multiple banks"
+-	bootaggr=$(evmctl ima_boot_aggregate)
+-	if [ $? -ne 0 ]; then
+-		echo "${CYAN}SKIP: evmctl ima_boot_aggregate: $bootaggr${NORM}"
+-		exit "$SKIP"
+-	fi
+-
+-	boot_aggr=( $bootaggr )
+-
+-	echo "INFO: Searching for the boot_aggregate in ${ASCII_RUNTIME_MEASUREMENTS}"
+-	for hash in "${boot_aggr[@]}"; do
+-		if [ "$VERBOSE" != "0" ]; then
+-			echo "$hash"
+-		fi
+-		if grep -e " boot_aggregate$" -e " boot_aggregate.$" "${ASCII_RUNTIME_MEASUREMENTS}" | tail -n 1 | grep -q "${hash}"; then
+-			echo "${GREEN}SUCCESS: boot_aggregate ${hash} found${NORM}"
+-			return "$OK"
+-		fi
+-	done
+-	echo "${RED}FAILURE: boot_aggregate not found${NORM}"
+-	echo "$bootaggr"
+-	return "$FAIL"
+-}
+-
+-if [ "$(id -u)" = 0 ] && [ -c "/dev/tpm0" ]; then
+-	ASCII_RUNTIME_MEASUREMENTS="/sys/kernel/security/ima/ascii_runtime_measurements"
+-	if [ ! -d "/sys/kernel/security/ima" ]; then
+-		echo "${CYAN}SKIP: CONFIG_IMA not enabled${NORM}"
+-		exit "$SKIP"
+-	fi
+-else
+-	BINARY_BIOS_MEASUREMENTS="./sample-binary_bios_measurements-pcrs-8-9"
+-	ASCII_RUNTIME_MEASUREMENTS="./sample-ascii_runtime_measurements-pcrs-8-9"
+-	export TPM_INTERFACE_TYPE="socsim"
+-	export TPM_COMMAND_PORT=2321
+-	export TPM_PLATFORM_PORT=2322
+-	export TPM_SERVER_NAME="localhost"
+-
+-	# swtpm uses the raw, unencapsulated packet format
+-	export TPM_SERVER_TYPE="raw"
+-fi
+-
+-# Start and initialize a software TPM as needed
+-if [ "$(id -u)" != 0 ] || [ ! -c "/dev/tpm0" ]; then
+-	if [ -f "$PCRFILE" ] || [ -f "$MISC_PCRFILE" ]; then
+-		echo "${CYAN}SKIP: system has discrete TPM 1.2, sample TPM 2.0 event log test not supported.${NORM}"
+-		exit "$SKIP"
+-	fi
+-
+-	swtpm_start
+-	error=$?
+-	if [ $error -eq "$SKIP" ]; then
+-		echo "skip: swtpm not installed"
+-		exit "$SKIP"
+-	fi
+-
+-	if [ $error -eq 0 ]; then
+-		swtpm_init
+-		if [ $? -eq "$SKIP" ]; then
+-			echo "testing boot_aggregate without entries"
+-			exit "$SKIP"
+-		fi
+-	fi
+-	if [ "$VERBOSE" != "0" ]; then
+-		display_pcrs
+-	fi
+-fi
+-
+-expect_pass check
diff --git a/app-crypt/ima-evm-utils/ima-evm-utils-1.4.ebuild b/app-crypt/ima-evm-utils/ima-evm-utils-1.4.ebuild
new file mode 100644
index 000000000000..3f32ba3defbf
--- /dev/null
+++ b/app-crypt/ima-evm-utils/ima-evm-utils-1.4.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools
+
+DESCRIPTION="Supporting tools for IMA and EVM"
+HOMEPAGE="http://linux-ima.sourceforge.net"
+SRC_URI="https://download.sourceforge.net/linux-ima/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug test tpm"
+
+RDEPEND="
+	dev-libs/openssl:0=
+	sys-apps/keyutils:=
+	tpm? ( app-crypt/tpm2-tss )"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	app-text/asciidoc
+	app-text/docbook-xsl-stylesheets
+	dev-libs/libxslt
+	test? ( app-editors/vim-core )"
+
+RESTRICT="!test? ( test )"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-1.4-configure-remove-automagic-TSS-dependencies.patch"
+	"${FILESDIR}/${PN}-1.4-test-Rename-bash-variable-WORKDIR-to-MYWORKDIR.patch"
+	"${FILESDIR}/${PN}-1.4-test-remove-boot_aggregate.patch"
+)
+
+src_prepare() {
+	default
+
+	sed -i '/^MANPAGE_DOCBOOK_XSL/s:/usr/share/xml/docbook/stylesheet/docbook-xsl/manpages/docbook.xsl:/usr/share/sgml/docbook/xsl-stylesheets/manpages/docbook.xsl:' Makefile.am || die
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		$(use_enable debug) \
+		$(use_with tpm pcrtss)
+}
+
+src_install() {
+	default
+	find "${ED}" -name '*.la' -delete || die
+}
diff --git a/app-crypt/ima-evm-utils/ima-evm-utils-9999.ebuild b/app-crypt/ima-evm-utils/ima-evm-utils-9999.ebuild
index bdb4d49d4f72..7237825ff877 100644
--- a/app-crypt/ima-evm-utils/ima-evm-utils-9999.ebuild
+++ b/app-crypt/ima-evm-utils/ima-evm-utils-9999.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 inherit autotools git-r3
 
@@ -11,11 +11,12 @@ EGIT_REPO_URI="https://git.code.sf.net/p/linux-ima/ima-evm-utils"
 
 LICENSE="GPL-2"
 SLOT="0"
-IUSE="debug test"
+IUSE="debug test tpm"
 
 RDEPEND="
 	dev-libs/openssl:0=
-	sys-apps/keyutils:="
+	sys-apps/keyutils:=
+	tpm? ( app-crypt/tpm2-tss )"
 DEPEND="${RDEPEND}"
 BDEPEND="
 	app-text/asciidoc
@@ -25,18 +26,23 @@ BDEPEND="
 
 RESTRICT="!test? ( test )"
 
+PATCHES=(
+	"${FILESDIR}/${PN}-1.4-configure-remove-automagic-TSS-dependencies.patch"
+	"${FILESDIR}/${PN}-1.4-test-Rename-bash-variable-WORKDIR-to-MYWORKDIR.patch"
+	"${FILESDIR}/${PN}-1.4-test-remove-boot_aggregate.patch"
+)
+
 src_prepare() {
 	default
 
 	sed -i '/^MANPAGE_DOCBOOK_XSL/s:/usr/share/xml/docbook/stylesheet/docbook-xsl/manpages/docbook.xsl:/usr/share/sgml/docbook/xsl-stylesheets/manpages/docbook.xsl:' Makefile.am || die
-
 	eautoreconf
 }
 
 src_configure() {
 	econf \
 		$(use_enable debug) \
-		--disable-static
+		$(use_with tpm pcrtss)
 }
 
 src_install() {
diff --git a/app-crypt/ima-evm-utils/metadata.xml b/app-crypt/ima-evm-utils/metadata.xml
index 1beb74ffb739..06e244511370 100644
--- a/app-crypt/ima-evm-utils/metadata.xml
+++ b/app-crypt/ima-evm-utils/metadata.xml
@@ -8,4 +8,7 @@
 	<upstream>
 		<remote-id type="sourceforge">linux-ima</remote-id>
 	</upstream>
+	<use>
+		<flag name="tpm">Enable TPM support</flag>
+	</use>	
 </pkgmetadata>
diff --git a/app-crypt/jitterentropy/Manifest b/app-crypt/jitterentropy/Manifest
index 64bbbbb91d61..4b99ebde94cb 100644
--- a/app-crypt/jitterentropy/Manifest
+++ b/app-crypt/jitterentropy/Manifest
@@ -1,5 +1,7 @@
 DIST jitterentropy-2.2.0.tar.gz 25556 BLAKE2B d0a8faa9131e9fd5712fad4179725ac29ba813e0d77e5ae9dc905841b92f67fc51e79c407142b2e8c3473f92a59a5b03f03d2013bd7e5d1ae07110da52461255 SHA512 4701a7e0a82ee583cbde5edfdacb737a5f588b42c61b16434b5a11bdfb1a108e7b9df8b8b38d9e92290e702b33f2ae8774580d6a71e6e8ac3af295ffc8ff5ff9
 DIST jitterentropy-3.0.1.tar.gz 31212 BLAKE2B 522e9b88e96ed1e6f57e793779c46f7799185f9d25390268f628eb309239a3522ac13277a037acf54dcce7e7b1364b2ec6e15d21a5f13aaa5a87ece7690d57fd SHA512 fd195e150ea861fcd5ff72a84f48ef8b7d0d8a3d44aae51f0fe5c39a1d1409ca98271a6cf06140fa8b6aba08d8bbbddf097cd7d99b5c1b698db08f056236e547
+DIST jitterentropy-3.3.1.tar.gz 81596 BLAKE2B ad8bf87d5a30b4bc98a3af7c1dcff442516c0330050aea90f2f05d68c4c2f1e9fe4b8db885f00dcd138ae7cb5a6ca58800686ae507f0e41596c95176a33e2b96 SHA512 7dc17c377cf90d38057bbc135e00730a3f84bc66aeed83eca1ad1b0e1c2fb89c5346ec20bdf25d3ce27f1d21893d44e52c08e96175554c18dfa1934a8d4fd9f7
 EBUILD jitterentropy-2.2.0.ebuild 923 BLAKE2B 2cdcfbc5e413a0049b0743aeba0f905c7eb274de0fe2b775d65f8b5fd6c576595b796745b5ed55a4c006774412a2948e8fc75720b3fef9e233719b1dd48c2dfa SHA512 1aa071401c70f21315e819adc18b139af5c294f19bed9a6f2481b24c102654571cbc2dbfde46ef74927b2c1680cd615bf989d880d9e857d951e0f13b46c81d92
 EBUILD jitterentropy-3.0.1.ebuild 967 BLAKE2B d8d88a202b58736e7c26733f5877c19924865e350fdeb317fa6d91f3c98734c609dfa9a9d11e2ef1e7494237f662660e362f33c3e49779f77a838d2fb12b3429 SHA512 951dbe3572d366f35f326790a9243597eab572739b234865390121b4e6056e17dc3c415dd44fc87b13ff0b72c119625cebaa8e326ab18f106479e1e3117e6a67
+EBUILD jitterentropy-3.3.1.ebuild 1617 BLAKE2B 5eaa309e01186953ce0e0a15164425755d3f3f579a63387d43b7b7b980ee327f8d3f8f8b121e86e141b2ebebd5d0e4ba68efab7b46fe736af53b39e8f7086981 SHA512 dd26125a48ce890ff674c6ba6764ad394cd6a6c78440380fc229a78d8fe1d442df6c5c2a6a1ad61f2bbc54b8e642372cf9356403c175470f73a500eba4004913
 MISC metadata.xml 667 BLAKE2B 9133417986fe9e64d3fd5abe0cae7b0e8e8d9fa792645c13599856b1a30f929f4291f05b58d38f7ef1cf99a91fb60ff56a61571bd48da801c9b5a5ff87166447 SHA512 47cbaa73c37c0eb2b6ad0321b716e31342e721828413f6523fda7d688d3851c83ad714cd23a6ba7d0147367c09ec2a45f6c2da44ffa7f7b2905cd41d18502b7d
diff --git a/app-crypt/jitterentropy/jitterentropy-3.3.1.ebuild b/app-crypt/jitterentropy/jitterentropy-3.3.1.ebuild
new file mode 100644
index 000000000000..4f867c12ca00
--- /dev/null
+++ b/app-crypt/jitterentropy/jitterentropy-3.3.1.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit flag-o-matic toolchain-funcs
+
+DESCRIPTION="Hardware RNG based on CPU timing jitter"
+HOMEPAGE="https://github.com/smuellerDD/jitterentropy-library"
+SRC_URI="https://github.com/smuellerDD/jitterentropy-library/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+# For future reference, tests/raw-entropy/validation-{restart,runtime}
+# have a weird license clause where it says:
+#   The licensee IS NOT granted permission to redistribute the source code or
+#   derivatives of the source code, and the binaries compiled from the source
+#   code or its derivatives to any third parties.
+# Do not package these two components!
+LICENSE="BSD"
+SLOT="0/3"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~riscv ~x86"
+IUSE="static-libs"
+
+S="${WORKDIR}/${PN}-library-${PV}"
+
+src_prepare() {
+	default
+
+	# Disable man page compression on install
+	sed -e '/\tgzip.*man/ d' -i Makefile || die
+}
+
+src_compile() {
+	# Upstream defines some of CFLAGS in the Makefile using '?='
+	# This allows those default flags to be overwritten by
+	# user-defined CFLAGS. Restore some of the defaults.
+	append-cflags '-fwrapv' '-fvisibility=hidden' '-fPIE'
+	# Optimizations are not allowed by upstream, which already
+	# overrides CFLAGS in Makefile. We need to handle CPPFLAGS here.
+	append-cppflags '-O0'
+	emake AR="$(tc-getAR)" CC="$(tc-getCC)"
+}
+
+src_install() {
+	emake PREFIX="${EPREFIX}/usr" \
+		  LIBDIR="$(get_libdir)" \
+		  DESTDIR="${D}" \
+		  INSTALL_STRIP="install" \
+		  install $(usex static-libs install-static '')
+}
diff --git a/app-crypt/johntheripper-jumbo/Manifest b/app-crypt/johntheripper-jumbo/Manifest
index 6ef1fd1fc385..de1163c2695a 100644
--- a/app-crypt/johntheripper-jumbo/Manifest
+++ b/app-crypt/johntheripper-jumbo/Manifest
@@ -7,6 +7,6 @@ DIST johntheripper-jumbo-1.9.0_p20210920.tar.gz 47758128 BLAKE2B e85255dc218c43e
 DIST johntheripper-jumbo-1.9.0_p20211129.tar.gz 47758087 BLAKE2B de57218151fbc3bed79322d065ef73deb99b73fb1ce55924197793a320600cc1189dabae43fe5848014c2e72dcb7e1c2a91f2aaba64bd8c7314ded37e23a34c9 SHA512 f8fc6bf102d900bb32c5714bd595a71f67f73a1f0a237d9f851b2f250046307bf1177f3782023cd1bbcc55f9d54fd7b4946e09c7dc1fd908ba6a6bad90b233d6
 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-1.9.0_p20211129.ebuild 3404 BLAKE2B af8b6e7c6407d19e9e9c2cce9eea60198894688c48987a21d37a85f3de08d393664d2413d5f08156164bef3e387b8c8ca94343d66651e49c7e66276dcf7b69a0 SHA512 4f71d582bc5449847fd58ecc1124dd2cb0c1d2854f6021a34c600c0f7a31f787ff9fae21ed93b9641b2f7d8e21edd0358120efeb3b8a97495ed558d729bc4d31
-EBUILD johntheripper-jumbo-9999.ebuild 3353 BLAKE2B be60f37e658f516090dc7760ffd2fe69bd1c9d6b1ced228ac3d77118a6f2894033deda4cd858f9437234c776b896877b0399f3759bfab8ce582498c7efca340c SHA512 ed6f213a1cca61cf72bb54859be6fc40e59e7eaed93458e3027017048f457106c608ab352150fda37fa6278c8117f118e9d91f393bbc74a18756fd4257e47b32
+EBUILD johntheripper-jumbo-1.9.0_p20211129.ebuild 3406 BLAKE2B ab33692303412ad6e514740adbdc342f3a211cf9578a8f652ef65eeb0c3190aaca3ee7ebbd9a64542f7e4171645872f22e3c9b5a6179d70cf7558ae756457074 SHA512 b2bad079d5f632edfc43ad4f355de20e1392ea8a003e8a865202fe9f04feb3d6dc2b644b694fc9df892461d2a4e49c5d94f1789535bdc53ceadcb11e47d62105
+EBUILD johntheripper-jumbo-9999.ebuild 3355 BLAKE2B d23852472c7d854227feda33dec26f1cff4c0d4ace6fedc86bf57bb8e7c8e3d4ebccc780e531cdf65c4ef6b5563316c1ba22f6a6410e8ac9076351e7eff34a72 SHA512 f6ea45b36eacf865ec5cb5bcfc836f89da09e5169d94e8dd16a2b31a6c13a19c66fd5dc7b57049f52926246f7d4a63ea1291b770b0c8c37941ed45f9cb55eca2
 MISC metadata.xml 473 BLAKE2B ed1c424492ff052e83ce899d8ea4a805ce5d4a5604da336ad16929594d14307c2e264c4eb6e6ee985d3167b8917e8c80c38ed9f97ba5293a0b8f84f472fd9786 SHA512 f124050eecf17e3c2fa01b6140881349e089840c75cb30bf054286a049026bb372cc70e1ce7be3054fffbe5836be7dc1f7fc9e3918f874443644ea99c5b441ab
diff --git a/app-crypt/johntheripper-jumbo/johntheripper-jumbo-1.9.0_p20211129.ebuild b/app-crypt/johntheripper-jumbo/johntheripper-jumbo-1.9.0_p20211129.ebuild
index 684a202323cb..6f4a38509974 100644
--- a/app-crypt/johntheripper-jumbo/johntheripper-jumbo-1.9.0_p20211129.ebuild
+++ b/app-crypt/johntheripper-jumbo/johntheripper-jumbo-1.9.0_p20211129.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -89,7 +89,7 @@ src_configure() {
 src_compile() {
 	# Uses default LD=$(CC) but if the user's set LD, it'll call it
 	# bug #729432.
-	emake LD=$(tc-getCC) -C src
+	emake LD="$(tc-getCC)" -C src
 }
 
 src_test() {
diff --git a/app-crypt/johntheripper-jumbo/johntheripper-jumbo-9999.ebuild b/app-crypt/johntheripper-jumbo/johntheripper-jumbo-9999.ebuild
index d1fbfc6ec025..90eb1c9135c3 100644
--- a/app-crypt/johntheripper-jumbo/johntheripper-jumbo-9999.ebuild
+++ b/app-crypt/johntheripper-jumbo/johntheripper-jumbo-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -85,7 +85,7 @@ src_configure() {
 src_compile() {
 	# Uses default LD=$(CC) but if the user's set LD, it'll call it
 	# bug #729432.
-	emake LD=$(tc-getCC) -C src
+	emake LD="$(tc-getCC)" -C src
 }
 
 src_test() {
diff --git a/app-crypt/libscrypt/Manifest b/app-crypt/libscrypt/Manifest
index 9da9c816cb7c..d8450c407602 100644
--- a/app-crypt/libscrypt/Manifest
+++ b/app-crypt/libscrypt/Manifest
@@ -1,4 +1,4 @@
 AUX libscrypt-1.21-build.patch 2460 BLAKE2B 139168dc59ea0001b5106a62731379c8a54e713d0bb5a30ab736eab36b2e8918d2ce47c8b3dc264b50172868c9c5108d0cd093c68e4fe4d3668301d84b15269c SHA512 74891b020e6115aa938368f43d727b3653160406f887f9958e66c688eb1191f7ba2ce6d753541af9369cf7724ecffff9b6633bef26062ebc0f74a092ed8cdd0d
 DIST libscrypt-1.21.tar.gz 19425 BLAKE2B 4f9f21c6ba36bad005d95203d1d2c206f50200973233670c4819fe2cc32de6941cc100360ba1683453fc7abcb0e0e024e32417beec06d5b43cbda56bfa89be5a SHA512 0f894bc2f47016cdd043ea692a4e4b08891b1a961443265230d5ccb76820d40e50b0d4d63588c44c985cd24e214f07b126d30989d3ce4cd79366f3b8f16c4d34
-EBUILD libscrypt-1.21.ebuild 719 BLAKE2B 7582b84a50894c3d8b0ba6e66cad06429b37e8a823310224e244207a6228473891d270517c7c3dc251f0a333a4417676a8b4a993b6c4e222b40518d93ccdd6fb SHA512 0bd3bdb3c7d53f8672cc848e45e073268e29752f6833812f75fb81d4c1539a2f0872bfb382f1bb7e6ae2f2f88cffb39ab474d84aa753421fab3fc6d96780a4ad
+EBUILD libscrypt-1.21.ebuild 727 BLAKE2B b321164f5a0f62a20ee3d9bfbe8b28412190a8082883c6c859a971549049e5556103b3f7d27103f699b58fc78ae134a90a61741387b107245da99f95de8c263e SHA512 bb48155d4e4134fb93b41d4bfd8e70ce905d75af9678f72990402ce42780f6e4183a00284910d9a51cde8023551c6b6cbb4afa9126f7573a4498016d560b2020
 MISC metadata.xml 346 BLAKE2B 98662f24e6b883032afb7ee0afd68a249c56a87d8c581f9edf7926332147d0905bcff8c34ea8e531e2a049a5c326748f002a88b33974ae3897cb0aa20eb4220b SHA512 3c255d66cb79b5e9d959285ea196a112242d6bc1dfe3a0dddfdcd1d9a8ae99cacb06816c881d94d93087593924ea3a20e7c4c7ec0d3de672b9327b2bf5bff6e6
diff --git a/app-crypt/libscrypt/libscrypt-1.21.ebuild b/app-crypt/libscrypt/libscrypt-1.21.ebuild
index b883b47b9bcc..101c8f622047 100644
--- a/app-crypt/libscrypt/libscrypt-1.21.ebuild
+++ b/app-crypt/libscrypt/libscrypt-1.21.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/technion/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 ~mips ppc ppc64 ~riscv sparc x86"
+KEYWORDS="amd64 arm arm64 ~hppa ~mips ppc ppc64 ~riscv sparc x86"
 IUSE=""
 
 DEPEND=""
@@ -32,5 +32,5 @@ pkg_setup() {
 
 src_compile() {
 	emake \
-		CC=$(tc-getCC)
+		CC="$(tc-getCC)"
 }
diff --git a/app-crypt/libsecret/Manifest b/app-crypt/libsecret/Manifest
index b4bb6fa7580b..fef6c624303a 100644
--- a/app-crypt/libsecret/Manifest
+++ b/app-crypt/libsecret/Manifest
@@ -1,4 +1,5 @@
 AUX libsecret-0.20.4-meson-build-test-vala-unstable-with-DSECRET_WITH_UNS.patch 1316 BLAKE2B 0c0fb8c10d869ff98d0644067336e54f907904ed8c4899e58e5d65aa84406442a550a6d4d6939cc34d5f6a80ec5d1d96dc7dcc91e44e955a8eef9b272f2fef6f SHA512 e2e4474a2af3e6f8a5bde2eff58417991b3d85f3042fe77776815f86567094168ca01c25f101cbc82a5f66573b1bc4592e6dee6b1be082fb8ec612c1394a7ce9
-DIST libsecret-0.20.4.tar.xz 529916 BLAKE2B d5922dcb1eb27e4cc6bc7770926fc3191c9f4634867ff9682fd33f9373d6fa2d334c9c1b995bd208bbf178af008ec7b224bd5388427617fbd7e48d05d2e35823 SHA512 599482796af001703c25d181a710c5a3207f44d4d0036ef2001cc541bde9ef453172b71df9bb214d27d1fbd2f28c1b5a5efdbd5faca3561188c07dccdc7d7c15
-EBUILD libsecret-0.20.4-r1.ebuild 2345 BLAKE2B a13c06bda6cb753656b66276fcacddae29131cd3111e4ca0df4b94e8228216b48eaa16b3136b32236cdf16922c678320e35e8cac76250576a20fa4ad70becf66 SHA512 edd63da2e3b3d0d6c1b219896b2cc6e43f072814159725d4dfc6aa63beebd2c6af6b4b01141ecc75f24739f92effd38e283e771cdd57a28641515af3cbb8056c
-MISC metadata.xml 254 BLAKE2B de7a97001e5947704f42973c8a0c3a23c2d80afb976254f5fd21e9d372a946e055d4cdc3c0eaed010505f87929b56e8b1e650c945e2a302644adbc9440833be8 SHA512 c81da4f9b80e5691a167f4590906952e25356604ec17689c005be14efb394c0634776bbe84df936edde239480bdf46db41216b00da4a3a45f670e9ca18ab0132
+DIST libsecret-0.20.5.tar.xz 187340 BLAKE2B cde5094eaaf54f251c19afb015c39cc88435dafe6ee682ca8f9d1917dd5b3dc8cc1609cdbf2a3a42d2592c2a149bec5fe28b2f4ec179b92c0d0f07d2f14c1792 SHA512 61ca248aafd265e1f31d56c9084c68d880ebf03660ace3d4a6c6622ab306b56e921ac24647b6a60633bfa99c8a0407d4ae1aa6148511f289bf5ce2025b72692a
+EBUILD libsecret-0.20.5-r1.ebuild 3699 BLAKE2B 1e2ae8299297444340851ee7fb648317d8848760c867cfb990f111e1db869a619c922018770c1f5f37e788ac94241b243cdcec46d843d90988c7e7c4de1c5137 SHA512 e169f9db924f86444af0e69aaf6a8562ce3ee6e2e0d9b027b2a80d57bb9aedd90a793b37988a905fb513d879e83cdc67d7136740184bdfd1f66e94d4c5e06a35
+EBUILD libsecret-0.20.5.ebuild 2225 BLAKE2B 8b5730b19340eeffad72c3b055ff26cecf2d0b0859358969ce5e7588dad9e134119021377c7db0d7c289135dde411eee2f5863b59339e1035d719fa26d0f555b SHA512 5f860e90a98696369febf9d4833da8110cfff203b54f36229f7e498c05ad32a1302305c45d3bfa3b6536bc1151f54d9b5970e5b2a4f006e55366fde0d423bb07
+MISC metadata.xml 368 BLAKE2B b1730ea71fc0ee02e7971533562f7bbf0e0479304c22dbeb13a4620dde8083031cffa63077ac5dc725de4f17c4a826df2cd6091d378682d04e9cab2f3072c97f SHA512 b5a3db4438a1a98846c2e24b269966b7d9fdbe7419f7a169557a16544ba1846b470e0835720d039bdea56d8cf02667cc6435169029f9ef40365cb4642a9a3b04
diff --git a/app-crypt/libsecret/libsecret-0.20.5-r1.ebuild b/app-crypt/libsecret/libsecret-0.20.5-r1.ebuild
new file mode 100644
index 000000000000..da95f0a7ad31
--- /dev/null
+++ b/app-crypt/libsecret/libsecret-0.20.5-r1.ebuild
@@ -0,0 +1,155 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{8..10} )
+VALA_USE_DEPEND=vapigen
+
+inherit bash-completion-r1 gnome2 meson-multilib python-any-r1 vala virtualx
+
+DESCRIPTION="GObject library for accessing the freedesktop.org Secret Service API"
+HOMEPAGE="https://wiki.gnome.org/Projects/Libsecret"
+
+LICENSE="LGPL-2.1+ Apache-2.0" # Apache-2.0 license is used for tests only
+SLOT="0"
+
+IUSE="+crypt gtk-doc +introspection test tpm +vala"
+RESTRICT="!test? ( test )"
+REQUIRED_USE="
+	vala? ( introspection )
+	gtk-doc? ( crypt )
+"
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
+
+DEPEND="
+	>=dev-libs/glib-2.44:2[${MULTILIB_USEDEP}]
+	crypt? ( >=dev-libs/libgcrypt-1.2.2:0=[${MULTILIB_USEDEP}] )
+	tpm? ( >=app-crypt/tpm2-tss-3.0.3 )
+	introspection? ( >=dev-libs/gobject-introspection-1.54:= )
+"
+RDEPEND="${DEPEND}
+	virtual/secret-service"
+BDEPEND="
+	app-text/docbook-xml-dtd:4.2
+	dev-libs/libxslt
+	dev-util/gdbus-codegen
+	dev-util/glib-utils
+	>=sys-devel/gettext-0.19.8
+	virtual/pkgconfig
+	gtk-doc? (
+		app-text/docbook-xml-dtd:4.1.2
+		>=dev-util/gi-docgen-2021.7
+	)
+	test? (
+		$(python_gen_any_dep '
+			dev-python/mock[${PYTHON_USEDEP}]
+			dev-python/dbus-python[${PYTHON_USEDEP}]
+			introspection? ( dev-python/pygobject:3[${PYTHON_USEDEP}] )')
+		introspection? ( >=dev-libs/gjs-1.32 )
+		tpm? (
+			app-crypt/swtpm
+			app-crypt/tpm2-abrmd
+			>=app-crypt/tpm2-tss-3.2.0
+		)
+	)
+	vala? ( $(vala_depend) )
+"
+
+dbus_run() {
+	(
+		# start isolated dbus session bus
+		dbus_data=$(dbus-launch --sh-syntax) || exit
+		eval "${dbus_data}"
+
+		$@
+		ret=${?}
+
+		kill "${DBUS_SESSION_BUS_PID}"
+		exit "${ret}"
+	) || die
+}
+
+tpm2_run_with_emulator() {
+	export XDG_CONFIG_HOME=${T}/.config/swtpm
+	${BROOT}/usr/share/swtpm/swtpm-create-user-config-files || die
+
+	mkdir -p ${XDG_CONFIG_HOME}/mytpm1 || die
+	swtpm_setup_args=(
+		--tpm2
+		--tpmstate ${XDG_CONFIG_HOME}/mytpm1
+		--createek
+		--allow-signing
+		--decryption
+		--create-ek-cert
+		--create-platform-cert
+		--lock-nvram
+		--overwrite
+		--display
+	)
+	swtpm_setup "${swtpm_setup_args[@]}" || die
+
+	swtpm_socket_args=(
+		--tpm2
+		--tpmstate dir=${XDG_CONFIG_HOME}/mytpm1
+		--flags startup-clear
+		--ctrl type=unixio,path=${XDG_CONFIG_HOME}/mytpm1/swtpm.socket.ctrl
+		--server type=unixio,path=${XDG_CONFIG_HOME}/mytpm1/swtpm.socket
+		--pid file=${XDG_CONFIG_HOME}/mytpm1/swtpm.pid
+		--daemon
+	)
+	swtpm socket "${swtpm_socket_args[@]}" || die
+
+	tpm2_abrmd_args=(
+		--logger=stdout
+		--tcti=swtpm:path=${XDG_CONFIG_HOME}/mytpm1/swtpm.socket
+		--session
+		--flush-all
+	)
+	tpm2-abrmd "${tpm2_abrmd_args[@]}" &
+	export TCTI=tabrmd:bus_type=session
+
+	$@ || die
+
+	# When swtpm dies, tmp2-abrmd will exit
+	kill $(< ${XDG_CONFIG_HOME}/mytpm1/swtpm.pid) || die
+}
+
+python_check_deps() {
+	if use introspection; then
+		has_version -b "dev-python/pygobject:3[${PYTHON_USEDEP}]" || return
+	fi
+	has_version -b "dev-python/mock[${PYTHON_USEDEP}]" &&
+	has_version -b "dev-python/dbus-python[${PYTHON_USEDEP}]"
+}
+
+pkg_setup() {
+	use test && python-any-r1_pkg_setup
+}
+
+src_prepare() {
+	use vala && vala_src_prepare
+	default
+}
+
+multilib_src_configure() {
+	local emesonargs=(
+		$(meson_native_true manpage)
+		$(meson_use crypt gcrypt)
+		$(meson_native_use_bool vala vapi)
+		$(meson_native_use_bool gtk-doc gtk_doc)
+		$(meson_native_use_bool introspection)
+		-Dbashcompdir="$(get_bashcompdir)"
+		$(meson_native_enabled bash_completion)
+		$(meson_native_use_bool tpm tpm2)
+	)
+	meson_src_configure
+}
+
+multilib_src_test() {
+	if use tpm; then
+		dbus_run tpm2_run_with_emulator virtx meson test -C "${BUILD_DIR}"
+	else
+		virtx dbus-run-session meson test -C "${BUILD_DIR}"
+	fi
+}
diff --git a/app-crypt/libsecret/libsecret-0.20.4-r1.ebuild b/app-crypt/libsecret/libsecret-0.20.5.ebuild
index 37666f544f15..91d31f827b4d 100644
--- a/app-crypt/libsecret/libsecret-0.20.4-r1.ebuild
+++ b/app-crypt/libsecret/libsecret-0.20.5.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 PYTHON_COMPAT=( python3_{8..10} )
 VALA_USE_DEPEND=vapigen
 
-inherit gnome2 meson-multilib python-any-r1 vala virtualx
+inherit bash-completion-r1 gnome2 meson-multilib python-any-r1 vala virtualx
 
 DESCRIPTION="GObject library for accessing the freedesktop.org Secret Service API"
 HOMEPAGE="https://wiki.gnome.org/Projects/Libsecret"
@@ -13,7 +13,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/Libsecret"
 LICENSE="LGPL-2.1+ Apache-2.0" # Apache-2.0 license is used for tests only
 SLOT="0"
 
-IUSE="+crypt gtk-doc +introspection test +vala"
+IUSE="+crypt gtk-doc +introspection test tpm +vala"
 RESTRICT="!test? ( test )"
 REQUIRED_USE="
 	vala? ( introspection )
@@ -25,6 +25,7 @@ KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~mips ppc ppc64 ~riscv sparc x86"
 DEPEND="
 	>=dev-libs/glib-2.44:2[${MULTILIB_USEDEP}]
 	crypt? ( >=dev-libs/libgcrypt-1.2.2:0=[${MULTILIB_USEDEP}] )
+	tpm? ( >=app-crypt/tpm2-tss-3.0.3 )
 	introspection? ( >=dev-libs/gobject-introspection-1.54:= )
 "
 RDEPEND="${DEPEND}
@@ -38,7 +39,7 @@ BDEPEND="
 	virtual/pkgconfig
 	gtk-doc? (
 		app-text/docbook-xml-dtd:4.1.2
-		dev-util/gtk-doc
+		>=dev-util/gi-docgen-2021.7
 	)
 	test? (
 		$(python_gen_any_dep '
@@ -50,10 +51,6 @@ BDEPEND="
 	vala? ( $(vala_depend) )
 "
 
-PATCHES=(
-	"${FILESDIR}"/${P}-meson-build-test-vala-unstable-with-DSECRET_WITH_UNS.patch
-)
-
 python_check_deps() {
 	if use introspection; then
 		has_version -b "dev-python/pygobject:3[${PYTHON_USEDEP}]" || return
@@ -69,27 +66,22 @@ pkg_setup() {
 src_prepare() {
 	use vala && vala_src_prepare
 	default
-
-	# Remove @filename@ from the header template that would otherwise cause
-	# differences dependent on the ABI
-	sed -e '/enumerations from "@filename@"/d' \
-		-i libsecret/secret-enum-types.h.template || die
 }
 
 multilib_src_configure() {
 	local emesonargs=(
-		$(meson_use crypt gcrypt)
-
-		# Don't build docs multiple times
 		$(meson_native_true manpage)
+		$(meson_use crypt gcrypt)
+		$(meson_native_use_bool vala vapi)
 		$(meson_native_use_bool gtk-doc gtk_doc)
-
 		$(meson_native_use_bool introspection)
-		$(meson_native_use_bool vala vapi)
+		-Dbashcompdir="$(get_bashcompdir)"
+		$(meson_native_enabled bash_completion)
+		$(meson_native_use_bool tpm tpm2)
 	)
 	meson_src_configure
 }
 
 multilib_src_test() {
-	virtx meson_src_test
+	virtx dbus-run-session meson test -C "${BUILD_DIR}"
 }
diff --git a/app-crypt/libsecret/metadata.xml b/app-crypt/libsecret/metadata.xml
index f453528b934f..7318f81748ab 100644
--- a/app-crypt/libsecret/metadata.xml
+++ b/app-crypt/libsecret/metadata.xml
@@ -5,4 +5,7 @@
 		<email>gnome@gentoo.org</email>
 		<name>Gentoo GNOME Desktop</name>
 	</maintainer>
+	<use>
+		<flag name="tpm">Enable Trusted Platform Module support via <pkg>app-crypt/tpm2-tss</pkg></flag>
+	</use>
 </pkgmetadata>
diff --git a/app-crypt/mit-krb5-appl/Manifest b/app-crypt/mit-krb5-appl/Manifest
index 56a11c402d16..29c79f755710 100644
--- a/app-crypt/mit-krb5-appl/Manifest
+++ b/app-crypt/mit-krb5-appl/Manifest
@@ -1,5 +1,5 @@
 AUX mit-krb5-appl-sig_t.patch 1411 BLAKE2B c2a34ada3f811459d006c1be6e79cb0811b0ab6ef7a1eb2fa6372db5b52b7db06e1cb94d7cbcd9b883fa14d9e0cf704ebfde7a441e7348728be9511ff2b6dae5 SHA512 a25ca113d8cae969ef370aa28b274dc4573964eb78e340a86ff4e3b130c6f7a73c97a41e657a5fabb634604a3bfb8f5a04c8925a248a8f9e45a22979fd8395f3
 AUX mit-krb5-appl-tinfo.patch 579 BLAKE2B 8db4885b88e2eb155ea80ce8d4e7f320ae39a9183e70de452081a452c51ba9ae3dfad4ea000582b3f3f361e17de02b0720cd794473c974c5551b69afde869445 SHA512 3b90b4f9539b94ddc8a0483dc156f61d33b436a01d32d8e66de13a82e653ec51c7996e3e5b4f5d8e1edf6a21d6c4fe09f4a4382e2f918edff070e71bfcee0951
 DIST krb5-appl-1.0.3-signed.tar 634880 BLAKE2B 0341ce0f3845bbf49ac2c43dea95d1bf196a9e6fb07a1bb4e8d1eac9ef74765f4b02b7f6e2794cf55ce6c7a7e2623bd325457dcb60f94b7e30bdc65a370751ad SHA512 1d85be6eb39a01c21308f6b159a375ae4ee331de8052c3990c9252f708d717b8b518f92c424bd6beebe344d940b4813e6ea11dd18df5d7caa4b5effc2513dd23
-EBUILD mit-krb5-appl-1.0.3-r3.ebuild 1652 BLAKE2B e4c2c44285434945c0420d89712d3f7813a2735c66ef18405d75a0d4279aef3a7338babc505e0d4d5aabdfd97ff50269389d8da6e7df00258001df22c91164f9 SHA512 6d4022e333b8162ac7fff5c2bc837a013924c9f49b4b3c590607780700bd976caae297677aac2d0827071243587034f0971ee96372b47ffb26245998fe96d9d3
+EBUILD mit-krb5-appl-1.0.3-r3.ebuild 1653 BLAKE2B ef1b6c3488dc68768aaed9a92fd9c4f85c946d2c7cfb413fcf1a38115cc17ace1857e43d0726ea569a80e4cbef22e14abbb7086e7adb73eb045ade5c11cdf260 SHA512 0dd3bec272363de8be85412efa982a591305328ff3aa8a9f5bf341c71b7de4a8b95003018728b6d92ddecc438b55e31781ba80e74385834897bbf7fc939c759c
 MISC metadata.xml 241 BLAKE2B ccde51ebe69cc26698aafb45f6c9491703ea0760efd8c1f32141ba61bf183e4015eb62ab6d779cc112b8ca9d08d5832a2f1ec1d8fb94d650bd4f3f7b2a1f4a22 SHA512 cd13ed42d7b37e1773b00b79fde8ffe9ef2a685eb88c30b6b974a026df67e99fb20c54cb208e8bb7c3b6d7508e0ef94e05eeb9e463d565a1570675460537c176
diff --git a/app-crypt/mit-krb5-appl/mit-krb5-appl-1.0.3-r3.ebuild b/app-crypt/mit-krb5-appl/mit-krb5-appl-1.0.3-r3.ebuild
index c932cfc0e4c1..6b8ddc9b0c32 100644
--- a/app-crypt/mit-krb5-appl/mit-krb5-appl-1.0.3-r3.ebuild
+++ b/app-crypt/mit-krb5-appl/mit-krb5-appl-1.0.3-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -14,7 +14,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="openafs-krb5-a BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~s390 sparc x86"
 
 BDEPEND="virtual/pkgconfig"
 RDEPEND=">=app-crypt/mit-krb5-1.8.0
diff --git a/app-crypt/mit-krb5/Manifest b/app-crypt/mit-krb5/Manifest
index 38b9faeee018..8a360b62345e 100644
--- a/app-crypt/mit-krb5/Manifest
+++ b/app-crypt/mit-krb5/Manifest
@@ -16,5 +16,7 @@ AUX mit-krb5kpropd.service 128 BLAKE2B 31d002c16987bd6fc42e22e64dd9bd1f9db36655d
 AUX mit-krb5kpropd.socket 122 BLAKE2B 2ce51e67b909c6955d9796f80f7985c9209af398ad2a60beebe83bd766d42261bd44c712df14608a1e5e922715780a6c4aa8ad294c34ba4e8fc336a24d038fd3 SHA512 4e7ae175425e0787a1d5ff959471a88bf5af4cd6e213dc6d4048902fab7547c1186a082370b523f9549f5096acfab1fb03b4839e42bd80dc539130ae4bb3ea55
 AUX mit-krb5kpropd_at.service 162 BLAKE2B ccd1dea2419656a95ea1e5068457ea45a765a831f36e7abe3e27cdd9b42f2b703cd6ddad1ac60d75feff4d74bf31dbf146ee2cbfdd34ac38c11908d44162e77a SHA512 4b7121da07b11fa65db4edc185c57197ebb25ed5c49797e36bc31b8b7bbb22a6f512f4a986c8430dfc31b1b8fcfba66dcfe154cd6eeb8b4bb445d5006fff3802
 DIST krb5-1.19.2.tar.gz 8741053 BLAKE2B 963722721201e75381c91a2af6e982f569a5b1602beb2d1ded83d35f6f914235a6ed91e5d54f56c97e94921a32ed27c49aded258327966ee13d39485208c38d8 SHA512 b90d6ed0e1e8a87eb5cb2c36d88b823a6a6caabf85e5d419adb8a930f7eea09a5f8491464e7e454cca7ba88be09d19415962fe0036ad2e31fc584f9fc0bbd470
-EBUILD mit-krb5-1.19.2-r2.ebuild 4291 BLAKE2B dc8f08f5b77c5917f51e1ed064311b10e912641bfdeb6dcdfc937dd94c43a168b492d3ec272ac4eb73018e41faf6e95d03e173c0de448fcf975fd9a42780e745 SHA512 ecb531fc16b57ddff16ae32377b85231c57231b385c07bc6709181ec117364f749ce5b862eb5692b56315d97a49eaac4b50b50a3692d6b3554ed842d8ef07fa8
+DIST krb5-1.19.3.tar.gz 8741343 BLAKE2B 79e68237ee82affa85299060c509e303453c0fab965adc6b9ed305ab64a1f73bd51e65df1b3faadc60815cd506ffefaeed535765ca060d393a9141812f85b48a SHA512 18235440d6f7d8a72c5d7ca5cd8c6465e8adf091d85c483225c7b00d64b4688c1c7924cb800c2fc17e590b2709f1a9de48e6ec79f6debd11dcb7d6fa16c6f351
+EBUILD mit-krb5-1.19.2-r2.ebuild 4292 BLAKE2B 67333471711eb37c7d422914ca349d193e9a2a61fdbb8a2da1068bde310606b8389acd70d604e82c7d0efb2d5df636c3506f5c2c287441922daf9a54e21d5a2f SHA512 5ec038122bb09de82e4769193d37e7d9b263cdec795a0c878e3d14a00e95d2096fec9d4d03e9d574b46a726149a553039115566075a2fe72b8805c07f2f77532
+EBUILD mit-krb5-1.19.3.ebuild 4257 BLAKE2B 43f4305c1cef154e08b109b19635b9019b601682103394ca545a2c847486623872009b32421c2c2ff5acd1086ed4a4cbaa31ff8dfe32b20ef13b8db59cb1538a SHA512 10ea7e8b9b917c2f662a1766b383b9dc5b0fc78731e08f1388580bdde442c462c4c06956a8c259675b087d3a3d46eb13d67b369fd51ba7fd154cebc5e6fdc882
 MISC metadata.xml 824 BLAKE2B 7f8486768dd9da718f2514da9a9b6928a89c43d26fd73f4be651438a4b02cd7a1db7839c580ca4f0812387e77cd002fa3caba86163ec2ecc1c2cdbcd1ffa4270 SHA512 0c075a303679455bd7f288b9345855bb38aa59da73e93f31b697688062399713dae64b39c775f4c74fa1f46fc1c3567732217ddcac7588bf3ae77c3e20e64144
diff --git a/app-crypt/mit-krb5/mit-krb5-1.19.2-r2.ebuild b/app-crypt/mit-krb5/mit-krb5-1.19.2-r2.ebuild
index 5598ad9bed53..96aed80b535c 100644
--- a/app-crypt/mit-krb5/mit-krb5-1.19.2-r2.ebuild
+++ b/app-crypt/mit-krb5/mit-krb5-1.19.2-r2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://web.mit.edu/kerberos/dist/krb5/${P_DIR}/${MY_P}.tar.gz"
 
 LICENSE="openafs-krb5-a BSD MIT OPENLDAP BSD-2 HPND BSD-4 ISC RSA CC-BY-SA-3.0 || ( BSD-2 GPL-2+ )"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ~ppc ppc64 ~riscv ~s390 sparc x86"
 IUSE="cpu_flags_x86_aes doc +keyutils lmdb nls openldap +pkinit selinux +threads test xinetd"
 
 # some tests requires network access
diff --git a/app-crypt/mit-krb5/mit-krb5-1.19.3.ebuild b/app-crypt/mit-krb5/mit-krb5-1.19.3.ebuild
new file mode 100644
index 000000000000..f16a2ffd54cc
--- /dev/null
+++ b/app-crypt/mit-krb5/mit-krb5-1.19.3.ebuild
@@ -0,0 +1,164 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+inherit autotools flag-o-matic multilib-minimal python-any-r1 systemd toolchain-funcs
+
+MY_P="${P/mit-}"
+P_DIR=$(ver_cut 1-2)
+DESCRIPTION="MIT Kerberos V"
+HOMEPAGE="https://web.mit.edu/kerberos/www/"
+SRC_URI="https://web.mit.edu/kerberos/dist/krb5/${P_DIR}/${MY_P}.tar.gz"
+
+LICENSE="openafs-krb5-a BSD MIT OPENLDAP BSD-2 HPND BSD-4 ISC RSA CC-BY-SA-3.0 || ( BSD-2 GPL-2+ )"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+IUSE="cpu_flags_x86_aes doc +keyutils lmdb nls openldap +pkinit selinux +threads test xinetd"
+
+# some tests requires network access
+RESTRICT="test"
+
+DEPEND="
+	!!app-crypt/heimdal
+	|| (
+		>=sys-fs/e2fsprogs-1.46.4-r51[${MULTILIB_USEDEP}]
+		sys-libs/e2fsprogs-libs[${MULTILIB_USEDEP}]
+	)
+	|| (
+		>=dev-libs/libverto-0.2.5[libev,${MULTILIB_USEDEP}]
+		>=dev-libs/libverto-0.2.5[libevent,${MULTILIB_USEDEP}]
+	)
+	keyutils? ( >=sys-apps/keyutils-1.5.8:=[${MULTILIB_USEDEP}] )
+	lmdb? ( dev-db/lmdb )
+	nls? ( sys-devel/gettext[${MULTILIB_USEDEP}] )
+	openldap? ( >=net-nds/openldap-2.4.38-r1[${MULTILIB_USEDEP}] )
+	pkinit? ( >=dev-libs/openssl-1.0.1h-r2:0=[${MULTILIB_USEDEP}] )
+	xinetd? ( sys-apps/xinetd )
+	"
+BDEPEND="
+	${PYTHON_DEPS}
+	virtual/yacc
+	cpu_flags_x86_aes? (
+		amd64? ( dev-lang/yasm )
+		x86? ( dev-lang/yasm )
+	)
+	doc? ( virtual/latex-base )
+	test? (
+		${PYTHON_DEPS}
+		dev-lang/tcl:0
+		dev-util/dejagnu
+		dev-util/cmocka
+	)"
+RDEPEND="${DEPEND}
+	selinux? ( sec-policy/selinux-kerberos )"
+
+S=${WORKDIR}/${MY_P}/src
+
+PATCHES=(
+	"${FILESDIR}/${PN}-1.12_warn_cflags.patch"
+	"${FILESDIR}/${PN}-config_LDFLAGS-r1.patch"
+	"${FILESDIR}/${PN}_dont_create_rundir.patch"
+	"${FILESDIR}/${PN}-1.18.2-krb5-config.patch"
+)
+
+MULTILIB_CHOST_TOOLS=(
+	/usr/bin/krb5-config
+)
+
+src_prepare() {
+	default
+	# Make sure we always use the system copies.
+	rm -rf util/{et,ss,verto}
+	sed -i 's:^[[:space:]]*util/verto$::' configure.ac || die
+
+	eautoreconf
+}
+
+src_configure() {
+	# QA
+	append-flags -fno-strict-aliasing
+	append-flags -fno-strict-overflow
+
+	multilib-minimal_src_configure
+}
+
+multilib_src_configure() {
+	ECONF_SOURCE=${S} \
+	AR="$(tc-getAR)" \
+	WARN_CFLAGS="set" \
+	econf \
+		$(use_with openldap ldap) \
+		"$(multilib_native_use_with test tcl "${EPREFIX}/usr")" \
+		$(use_enable nls) \
+		$(use_enable pkinit) \
+		$(use_enable threads thread-support) \
+		$(use_with lmdb) \
+		$(use_with keyutils) \
+		--without-hesiod \
+		--enable-shared \
+		--with-system-et \
+		--with-system-ss \
+		--enable-dns-for-realm \
+		--enable-kdc-lookaside-cache \
+		--with-system-verto \
+		--disable-rpath
+}
+
+multilib_src_compile() {
+	emake -j1
+}
+
+multilib_src_test() {
+	multilib_is_native_abi && emake -j1 check
+}
+
+multilib_src_install() {
+	emake \
+		DESTDIR="${D}" \
+		EXAMPLEDIR="${EPREFIX}/usr/share/doc/${PF}/examples" \
+		install
+}
+
+multilib_src_install_all() {
+	# default database dir
+	keepdir /var/lib/krb5kdc
+
+	cd ..
+	dodoc README
+
+	if use doc; then
+		dodoc -r doc/html
+		docinto pdf
+		dodoc doc/pdf/*.pdf
+	fi
+
+	newinitd "${FILESDIR}"/mit-krb5kadmind.initd-r2 mit-krb5kadmind
+	newinitd "${FILESDIR}"/mit-krb5kdc.initd-r2 mit-krb5kdc
+	newinitd "${FILESDIR}"/mit-krb5kpropd.initd-r2 mit-krb5kpropd
+	newconfd "${FILESDIR}"/mit-krb5kadmind.confd mit-krb5kadmind
+	newconfd "${FILESDIR}"/mit-krb5kdc.confd mit-krb5kdc
+	newconfd "${FILESDIR}"/mit-krb5kpropd.confd mit-krb5kpropd
+
+	systemd_newunit "${FILESDIR}"/mit-krb5kadmind.service mit-krb5kadmind.service
+	systemd_newunit "${FILESDIR}"/mit-krb5kdc.service mit-krb5kdc.service
+	systemd_newunit "${FILESDIR}"/mit-krb5kpropd.service mit-krb5kpropd.service
+	systemd_newunit "${FILESDIR}"/mit-krb5kpropd_at.service "mit-krb5kpropd@.service"
+	systemd_newunit "${FILESDIR}"/mit-krb5kpropd.socket mit-krb5kpropd.socket
+
+	insinto /etc
+	newins "${ED}/usr/share/doc/${PF}/examples/krb5.conf" krb5.conf.example
+	insinto /var/lib/krb5kdc
+	newins "${ED}/usr/share/doc/${PF}/examples/kdc.conf" kdc.conf.example
+
+	if use openldap ; then
+		insinto /etc/openldap/schema
+		doins "${S}/plugins/kdb/ldap/libkdb_ldap/kerberos.schema"
+	fi
+
+	if use xinetd ; then
+		insinto /etc/xinetd.d
+		newins "${FILESDIR}/kpropd.xinetd" kpropd
+	fi
+}
diff --git a/app-crypt/mkp224o/Manifest b/app-crypt/mkp224o/Manifest
new file mode 100644
index 000000000000..a7eb8ecab353
--- /dev/null
+++ b/app-crypt/mkp224o/Manifest
@@ -0,0 +1,3 @@
+DIST mkp224o-1.5.0-src.tar.gz 1378324 BLAKE2B 19d38fbf23328607fa428ec9329cdc909b210b4235d85e14ff372347c9b408ecf22d41dac7122bdae06725d7bca0c3d53c81cc27272c47517e714e9b8e0625dd SHA512 aa5adc91e695dbfd8ece5fdfe3ca370056d4390a5186326b35ee37402040fa24675ede5389c48b79a1e57b624b86024ff72957741fef175602f7721f20c5cc14
+EBUILD mkp224o-1.5.0.ebuild 766 BLAKE2B 8138ab3b1467e1f2164b5ffac561a7d62bdebb99c53624e5a9c9b936fb839f18615ab7165f35a0bc38c6986af1cfbc8b01dc635426db2a5d05db077f752ef232 SHA512 b678d1d3167979e9f7507b6a4359356cf859160026892fc7e3489355b9201557139223e912ccf6f09aa3e770a2577c24ad071b82bbab476e72540ff0217ddacd
+MISC metadata.xml 440 BLAKE2B ce6c1788d5bcc126762432a2bca2db89f89e675700e9443b512295843ab58b714a222804c9a6776986dc56fa11aa25950d23e2d4b61b98ae55cb1650716edc56 SHA512 d6d0de280eea8ee5b68cbd8145ec089011949a88ed73efbc5f4b2b54ac6e288e8a4cdac3bbba9a633e7437326b089bd20438acc003bea33576463c7e8fd6857d
diff --git a/app-crypt/mkp224o/metadata.xml b/app-crypt/mkp224o/metadata.xml
new file mode 100644
index 000000000000..6bbe7e963edf
--- /dev/null
+++ b/app-crypt/mkp224o/metadata.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>matthew@gentoo.org</email>
+    <name>Matthew Smith</name>
+  </maintainer>
+  <use>
+    <flag name="pcre2">Search with a regex instead of prefix/suffix matching</flag>
+  </use>
+  <upstream>
+    <remote-id type="github">cathugger/mkp224o</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/app-crypt/mkp224o/mkp224o-1.5.0.ebuild b/app-crypt/mkp224o/mkp224o-1.5.0.ebuild
new file mode 100644
index 000000000000..4e71a3ec031b
--- /dev/null
+++ b/app-crypt/mkp224o/mkp224o-1.5.0.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DESCRIPTION="Vanity address generator for v3 Tor hidden service addresses"
+HOMEPAGE="https://github.com/cathugger/mkp224o"
+SRC_URI="https://github.com/cathugger/${PN}/releases/download/v${PV}/${PN}-${PV}-src.tar.gz"
+
+LICENSE="CC0-1.0"
+SLOT="0"
+KEYWORDS="amd64"
+IUSE="cpu_flags_x86_sse2 pcre2"
+
+DEPEND="
+	dev-libs/libsodium:=
+	pcre2? ( dev-libs/libpcre2:= )
+"
+RDEPEND="${DEPEND}"
+
+DOCS=( OPTIMISATION.txt README.txt )
+
+src_configure() {
+	local myeconfargs=(
+		--enable-regex=$(usex pcre2)
+		--enable-statistics
+	)
+	use cpu_flags_x86_sse2 && myeconfargs+=( --enable-donna-sse2 )
+
+	econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	einstalldocs
+	dobin ${PN}
+}
diff --git a/app-crypt/nasty/Manifest b/app-crypt/nasty/Manifest
index 42f6a0355922..eeb3ff30f05b 100644
--- a/app-crypt/nasty/Manifest
+++ b/app-crypt/nasty/Manifest
@@ -1,4 +1,4 @@
 AUX nasty-0.6-flags.patch 468 BLAKE2B acc1ac4bbe024136a176f04a3f6ba85190ffa34b4655d4e284ed980774169ab790f5582d8ce8d86cb59ceecaeefb579f975dacc5144b6bf8fc5da741819a8f27 SHA512 56d808209a9ba1fd1fa3b77ed90398cded9adb08c271ed74c80c5dff793413f1e7270ab057bd253c8c1e951dec7e7b8ad6c92976abb7c267109f517ccb81d4a1
 DIST nasty-0.6.tgz 3811 BLAKE2B d6e5973c4f1335fe936b9a7c976d5a0f994cf618ed83c8ae7629256c2dbab17b631a095a14da366d7011add5df5263d63de66db4b3e69712aae0be092fa50064 SHA512 6803c1ccb843934ab6d2bd173c4cf154124926ee493a79072b351167f7fbbc08f90226ba63d2c591f2ae122d33d7cf1dc6b60e8684dc7ec650c8bcf3f04b3e07
-EBUILD nasty-0.6-r1.ebuild 553 BLAKE2B af753a0eda3a8756af06d098574d4ba0d0256673da30b02da0895ccfa4a3f7c2e187f114c333231ce9176f5a43085fbb0ddb83b056264c5bb23b147cd1dac8dc SHA512 d10d1c5da5a420d5d28daf30c04166bba01e9246ce10eed933da80db4503b0d8315d197037ca4864f348557632561a20866560f68b96c34acdca86fa2e848400
+EBUILD nasty-0.6-r2.ebuild 535 BLAKE2B 6ce17fe20c35b6eedb3afc75cfd06e5d59df52699607bf226d15f1b659cae421b092464756485a46ede5ef954b1ec11ff153580cf725739eda90918ccc3f47fd SHA512 ae2004b87f9dd89772dd30bc0d5897b826f684b6ac46ef4876cd034477f47a562f589d23e3e6ba167e71f51db288a92083db56066459b4535ac49bc8c0072f56
 MISC metadata.xml 168 BLAKE2B 2e0e000b4c3b6ca04c12903fdbe278415c05a822623c52e9aa95cbbf3d50bcb1246b7edbda7d2f6b559af8950c6374e6e0a69b76319964cfe686bf50b0604a57 SHA512 4dcf45d1809e8390a2d8155c8ebfe0dd610203e392aeab0ccd8a10f42cc8532a4925eff32b35e7a6c35598a4efd288229034ec0732299dbd8cfa0acff705fed3
diff --git a/app-crypt/nasty/nasty-0.6-r1.ebuild b/app-crypt/nasty/nasty-0.6-r2.ebuild
index 574cd87cb1de..2596a2964bf5 100644
--- a/app-crypt/nasty/nasty-0.6-r1.ebuild
+++ b/app-crypt/nasty/nasty-0.6-r2.ebuild
@@ -1,32 +1,28 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 inherit toolchain-funcs
 
 DESCRIPTION="Proof-of-concept GPG passphrase recovery tool"
 HOMEPAGE="http://www.vanheusden.com/nasty/"
 SRC_URI="http://www.vanheusden.com/nasty/${P}.tgz"
+
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-RDEPEND="app-crypt/gpgme"
-DEPEND="${RDEPEND}"
 
-DOCS=(
-	readme.txt
-)
+RDEPEND="app-crypt/gpgme:="
+DEPEND="${RDEPEND}"
 
-PATCHES=(
-	"${FILESDIR}/${P}-flags.patch"
-)
+PATCHES=( "${FILESDIR}"/${P}-flags.patch )
 
 src_compile() {
 	emake CC="$(tc-getCC)" DEBUG=
 }
 
 src_install() {
-	einstalldocs
 	dobin nasty
+	dodoc readme.txt
 }
diff --git a/app-crypt/pesign/Manifest b/app-crypt/pesign/Manifest
index c4b6a5ebf2d4..ddc0018d7c6b 100644
--- a/app-crypt/pesign/Manifest
+++ b/app-crypt/pesign/Manifest
@@ -1,5 +1,10 @@
 AUX pesign-113-enum-conversion.patch 1571 BLAKE2B b1e8f90a220ba7dbdba9d16c1c568fed6e463f8d550b678d85d6c806bc451a023d989ad0830075a4e4b28411685e29d60c5c887d3af100b85a048dcff0a103c0 SHA512 cfa001265bfda5428ef72134d05ec16bee679a3906832aab4100f2c567f22e62d089b8cd475b9707926485c30958e70ba48c4035e118c480d008114fb6876c62
 AUX pesign-113-nss.patch 2092 BLAKE2B f75730c2ab48f0ff6af4237fc46c535b3ceead357e31a548c28b78648fec7d52a5cc1bc9dfdb9db4e6cf22b7312cc452afb04a3088810140055ae88b55fb2f1d SHA512 7a4ebd4c875cf6678a6d2ca4083eafea552259e2c1692d167d0b948ac73d50244db3feea1c6d7c403e152236421609da5d92cd6405fb3107e1c3933c2f94fece
+AUX pesign-114-format-string.patch 4359 BLAKE2B 12a7c43162d806050c2fe4c5cf8e289fe262a158ac8cefb60a26a3233831526cfe3e98bea956f7158ea648b22da6cd0cc36e807101485b299f8be6cb2bc93ec2 SHA512 133f452089ec6691d3b50ff7a73399382b5e300f1d1686e9e4f98ffcfa1fce824503c146589d249a67e28df5dfc7c737fb05ad67e2c707aa97fb1dfebb550993
+AUX pesign-114-no-werror.patch 537 BLAKE2B a92e320460d83a943f60ee2524344a24f907d5fa09416ecc1e5024941d7f4130afe339f508301594d7ff0e6f53166093086e64b774a8448c55a3fbb73e74568e SHA512 e64b2f3ebeabba2e74c281a2a8205faa0ba0fac91e9153a8979e3edbf695274d4e940502736db12ba6bcb19a70179c5529b262f6a8b23779f19a750ff810cda3
+AUX pesign-114-wanalyzer-diagnostic.patch 734 BLAKE2B dcfae1fb4bea691ffb2bbd3f2e4f40e1e21f16840f4dfcc9293f856fdf6f75913bf6c12f7739ffa0e453949a9aa0add9925e7a0ee4adea6452c1007c4a40e11b SHA512 21ef15d5d1358bb9ff92f337a1da149bf993f04a6c0cd391956ce7175ac15f83596a3601a68eb51a9f88eb76c69dba8a3f57b672d9e628d0f75e9678d819a593
 DIST pesign-113.tar.gz 124618 BLAKE2B 36cdface6ecdf9003251da3058b21b2ee8e94eb655e47a8668b38c4ea576d990a71860952eea277d5e029bb007039c8e3ded9918e89d47f6db404423acbd1cc7 SHA512 e71dc90c2ab8085d1b000c0d2cf9cb00ddaed1ea1393db75c2d19a96f1b1c188a26b76850533ba97ec254a3b48db6b07a69b597c329ac891e64422780a358c24
+DIST pesign-114.tar.gz 148898 BLAKE2B 0dae3b4e17c61bcea02a6f81f6a62f8d526e83954bf95d0de24726daa81e45a3b42b6867f2d64decd69f421a14f5e2ff6ff1ec26246f44d68b242b452e60d9a1 SHA512 567176718e098c3494e27ce29b61ef396ca2503137260fc36c784951f0bd2130c9f61c655461d6091e9bdb0df77c9e00cf2fde8fb1b1c5ab83e4b9c57d65fdab
 EBUILD pesign-113.ebuild 1183 BLAKE2B 5b997df6d0d7670b7f64ea61404ba5682e6be810c3634c36002514b5617be88b72ed95ca603a982bcc0502e422f07a5857eca450ccf7d92b2445393bc0f5f2ff SHA512 dc6e6bc4ae0b80446628ab9c15691d7896d594eb7bb4404667f15d452c3a337e89bec9b4e63bbbb0f99421e33b44efcbc114cc973db6c29283a83edcc9372c9b
+EBUILD pesign-114.ebuild 1233 BLAKE2B b61a091d19b2f6d58e697af779ca5032b44f29a89c97c42c5f1b4c64eb595ea616fe37dc2c7155ce4f3d1eff82ffcc326cd58448e1cbb05a079fec6d2d517f08 SHA512 0b7f43429fa81ebbe551044da0a737745891f2b2d8cd16bf71e8a88faef631151e32059e8f85c156160295f5577d151cca27a4b4061e4185febfaab2e152a8db
 MISC metadata.xml 249 BLAKE2B 0928166bc28197e80603bef476a41c55e1e593a7e2636ecb634cecd26b5df5896667b06f049e1a2737f6da0330d243387068b6beededab2c3c8cab7208c1016d SHA512 dcbdae805ad96a8343af41708b249dfb119c7b18146279212b9747a91fbb64beb9e23b606151a77b42ea4f2fbbcf9f81d48067cd26122c61dee8b8178277d307
diff --git a/app-crypt/pesign/files/pesign-114-format-string.patch b/app-crypt/pesign/files/pesign-114-format-string.patch
new file mode 100644
index 000000000000..2361cb4a2660
--- /dev/null
+++ b/app-crypt/pesign/files/pesign-114-format-string.patch
@@ -0,0 +1,111 @@
+https://github.com/rhboot/pesign/commit/df8783ed4ed87fef850268098690985049916ee9.patch
+
+From df8783ed4ed87fef850268098690985049916ee9 Mon Sep 17 00:00:00 2001
+From: Robbie Harwood <rharwood@redhat.com>
+Date: Tue, 1 Feb 2022 17:37:14 -0500
+Subject: [PATCH] Fix format strings for 32-bit arches
+
+Sadly, in 2022, this remains a thing.
+
+Signed-off-by: Robbie Harwood <rharwood@redhat.com>
+---
+ src/cms_pe_common.c | 16 +++++++++-------
+ src/password.c      |  7 ++++---
+ 2 files changed, 13 insertions(+), 10 deletions(-)
+
+diff --git a/src/cms_pe_common.c b/src/cms_pe_common.c
+index 964f0d9..3a3921b 100644
+--- a/src/cms_pe_common.c
++++ b/src/cms_pe_common.c
+@@ -49,7 +49,7 @@ check_pointer_and_size(cms_context *cms, Pe *pe, void *ptr, size_t size)
+ 
+ 	if (p + size > m + map_size)
+ 		cmsreterr(0, cms,
+-			  "pointer %p is above mmap end at %p (%lu is %lu bytes past EOF at %lu)",
++			  "pointer %p is above mmap end at %p (%lu is %lu bytes past EOF at %zu)",
+ 			  (void *)((uintptr_t)p + size),
+ 			  (void *)((uintptr_t)m + map_size),
+ 			  p + size - m,
+@@ -189,7 +189,7 @@ generate_digest(cms_context *cms, Pe *pe, int padded)
+ 	if (!check_pointer_and_size(cms, pe, hash_base, hash_size))
+ 		cmsgotoerr(error, cms, "PE header is invalid");
+ 	dprintf("beginning of hash");
+-	dprintf("digesting %lx + %lx", hash_base - map, hash_size);
++	dprintf("digesting %tx + %zx", hash_base - map, hash_size);
+ 	generate_digest_step(cms, hash_base, hash_size);
+ 
+ 	/* 5. Skip over the image checksum
+@@ -209,7 +209,7 @@ generate_digest(cms_context *cms, Pe *pe, int padded)
+ 		cmsgotoerr(error, cms, "PE data directory is invalid");
+ 
+ 	generate_digest_step(cms, hash_base, hash_size);
+-	dprintf("digesting %lx + %lx", hash_base - map, hash_size);
++	dprintf("digesting %tx + %zx", hash_base - map, hash_size);
+ 
+ 	/* 8. Skip over the crt dir
+ 	 * 9. Hash everything up to the end of the image header. */
+@@ -222,7 +222,7 @@ generate_digest(cms_context *cms, Pe *pe, int padded)
+ 		cmsgotoerr(error, cms, "PE relocations table is invalid");
+ 
+ 	generate_digest_step(cms, hash_base, hash_size);
+-	dprintf("digesting %lx + %lx", hash_base - map, hash_size);
++	dprintf("digesting %tx + %zx", hash_base - map, hash_size);
+ 
+ 	/* 10. Set SUM_OF_BYTES_HASHED to the size of the header. */
+ 	hashed_bytes = pe32opthdr ? pe32opthdr->header_size
+@@ -265,7 +265,7 @@ generate_digest(cms_context *cms, Pe *pe, int padded)
+ 		}
+ 
+ 		generate_digest_step(cms, hash_base, hash_size);
+-		dprintf("digesting %lx + %lx", hash_base - map, hash_size);
++		dprintf("digesting %tx + %zx", hash_base - map, hash_size);
+ 
+ 		hashed_bytes += hash_size;
+ 	}
+@@ -285,10 +285,12 @@ generate_digest(cms_context *cms, Pe *pe, int padded)
+ 			memset(tmp_array, '\0', tmp_size);
+ 			memcpy(tmp_array, hash_base, hash_size);
+ 			generate_digest_step(cms, tmp_array, tmp_size);
+-			dprintf("digesting %lx + %lx", (unsigned long)tmp_array, tmp_size);
++			dprintf("digesting %tx + %zx", (ptrdiff_t)tmp_array,
++				tmp_size);
+ 		} else {
+ 			generate_digest_step(cms, hash_base, hash_size);
+-			dprintf("digesting %lx + %lx", hash_base - map, hash_size);
++			dprintf("digesting %tx + %zx", hash_base - map,
++				hash_size);
+ 		}
+ 	}
+ 	dprintf("end of hash");
+diff --git a/src/password.c b/src/password.c
+index 644f362..05add9a 100644
+--- a/src/password.c
++++ b/src/password.c
+@@ -213,7 +213,7 @@ parse_pwfile_line(char *start, struct token_pass *tp)
+ 	dprintf("non-whitespace span is %zd", span);
+ 
+ 	if (line[span] == '\0') {
+-		dprintf("returning %ld", (line + span) - start);
++		dprintf("returning %td", (line + span) - start);
+ 		return (line + span) - start;
+ 	}
+ 	line[span] = '\0';
+@@ -241,7 +241,7 @@ parse_pwfile_line(char *start, struct token_pass *tp)
+ 	dprintf("Setting token pass %p to { %p, %p }", tp, tp->token, tp->pass);
+ 	dprintf("token:\"%s\"", tp->token);
+ 	dprintf("pass:\"%s\"", tp->pass);
+-	dprintf("returning %ld", (line + span) - start);
++	dprintf("returning %td", (line + span) - start);
+ 	return (line + span) - start;
+ }
+ 
+@@ -330,7 +330,8 @@ SECU_FilePasswd(PK11SlotInfo *slot, PRBool retry, void *arg)
+ 		if (c != '\0')
+ 			span++;
+ 		start += span;
+-		dprintf("start is file[%ld] == '\\x%02hhx'", start - file, start[0]);
++		dprintf("start is file[%td] == '\\x%02hhx'", start - file,
++			start[0]);
+ 	}
+ 
+ 	qsort(phrases, nphrases, sizeof(struct token_pass), token_pass_cmp);
diff --git a/app-crypt/pesign/files/pesign-114-no-werror.patch b/app-crypt/pesign/files/pesign-114-no-werror.patch
new file mode 100644
index 000000000000..3937873e80bd
--- /dev/null
+++ b/app-crypt/pesign/files/pesign-114-no-werror.patch
@@ -0,0 +1,13 @@
+diff --git a/Make.defaults b/Make.defaults
+index fdb961a..cdbb064 100644
+--- a/Make.defaults
++++ b/Make.defaults
+@@ -58,7 +58,7 @@ cflags	= $(CFLAGS) $(ARCH3264) \
+ 	-Wall -Wextra -Wsign-compare -Wno-unused-result \
+ 	-Wno-unused-function -Wno-missing-field-initializers \
+ 	-Wno-analyzer-malloc-leak \
+-	-Werror -Wno-error=cpp -Wno-free-nonheap-object \
++	-Wno-error=cpp -Wno-free-nonheap-object \
+ 	-std=gnu11 -fshort-wchar -fPIC -fno-strict-aliasing \
+ 	-D_GNU_SOURCE -DCONFIG_$(ARCH) -I${TOPDIR}/include \
+ 	'-DRUNDIR="$(rundir)"' \
diff --git a/app-crypt/pesign/files/pesign-114-wanalyzer-diagnostic.patch b/app-crypt/pesign/files/pesign-114-wanalyzer-diagnostic.patch
new file mode 100644
index 000000000000..43bc0d84c44c
--- /dev/null
+++ b/app-crypt/pesign/files/pesign-114-wanalyzer-diagnostic.patch
@@ -0,0 +1,19 @@
+https://github.com/rhboot/pesign/issues/78
+
+daemon.c:922:32: error: unknown option after ‘#pragma GCC diagnostic’ kind [-Werror=pragmas]
+  922 | #pragma GCC diagnostic ignored "-Wanalyzer-use-of-uninitialized-value"
+      |                                ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+cc1: all warnings being treated as errors
+--- a/src/daemon.c
++++ b/src/daemon.c
+@@ -916,10 +916,6 @@ do_shutdown(context *ctx, int nsockets, struct pollfd *pollfds)
+ 	free(pollfds);
+ }
+ 
+-/* GCC -fanalyzer has trouble with realloc
+- * https://bugzilla.redhat.com/show_bug.cgi?id=2047926 */
+-#pragma GCC diagnostic push
+-#pragma GCC diagnostic ignored "-Wanalyzer-use-of-uninitialized-value"
+ static int
+ handle_events(context *ctx)
+ {
diff --git a/app-crypt/pesign/pesign-114.ebuild b/app-crypt/pesign/pesign-114.ebuild
new file mode 100644
index 000000000000..bd65febf96c3
--- /dev/null
+++ b/app-crypt/pesign/pesign-114.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit toolchain-funcs
+
+DESCRIPTION="Tools for manipulating signed PE-COFF binaries"
+HOMEPAGE="https://github.com/rhboot/pesign"
+SRC_URI="https://github.com/rhboot/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	dev-libs/nspr
+	dev-libs/nss
+	dev-libs/openssl:=
+	dev-libs/popt
+	sys-apps/util-linux
+	>=sys-libs/efivar-38
+"
+DEPEND="${RDEPEND}
+	sys-boot/gnu-efi
+"
+BDEPEND="
+	sys-apps/help2man
+	virtual/pkgconfig
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-114-wanalyzer-diagnostic.patch
+	"${FILESDIR}"/${PN}-114-no-werror.patch
+
+	"${FILESDIR}"/${P}-format-string.patch
+)
+
+src_compile() {
+	emake \
+		AR="$(tc-getAR)" \
+		ARFLAGS="-cvqs" \
+		AS="$(tc-getAS)" \
+		CC="$(tc-getCC)" \
+		LD="$(tc-getLD)" \
+		OBJCOPY="$(tc-getOBJCOPY)" \
+		PKG_CONFIG="$(tc-getPKG_CONFIG)" \
+		RANLIB="$(tc-getRANLIB)" \
+		rundir="${EPREFIX}/var/run"
+}
+
+src_install() {
+	emake DESTDIR="${ED}" VERSION="${PVR}" rundir="${EPREFIX}/var/run" install
+	einstalldocs
+
+	# remove some files that don't make sense for Gentoo installs
+	rm -rf "${ED}/etc" "${ED}/var" "${ED}/usr/share/doc/${PF}/COPYING" || die
+}
diff --git a/app-crypt/rhash/Manifest b/app-crypt/rhash/Manifest
index f224dcefd486..db90ada8300f 100644
--- a/app-crypt/rhash/Manifest
+++ b/app-crypt/rhash/Manifest
@@ -1,10 +1,4 @@
-AUX darwin-triplet.patch 657 BLAKE2B cb710ca481e9a45d593ab857dc10ff8baf6c3bc5fbd2ac9ef97cee5589d8873cdc81a6a730f9058a7b9a10199667384ebbf56f828d2e6b817bf40443653adbe5 SHA512 5caec1179c860c0bf003605dd96d8c4a47a3ef784d937080a237106364918a36c1bf1138b9a4b1b0f5e5c042d653c5b324ada1a0f9b621dc33aa4a11d4f9c1c1
-AUX freebsd-triplet.patch 800 BLAKE2B 43f1f7e1fa43313e2f323a3e5031a463185c2388a3b59c75f1a3a216d6ce6e04be9cb584ffe3c44773c072408740c02354dec4969d42d6abd824a1fc633fa4dd SHA512 7f66e6ab4bdc21959e00b8ad21aaa13eab6d11552d92e8978ce5c501339a3ddf0b303f47ae5fce4056522ffea90cef3d25c5dc5d6469e7bbffa078526e1c7404
-AUX rhash-1.3.6-no_echon.patch 1224 BLAKE2B 949b6aa839667a6fef3c3a668b6cadc451986ba837807b3d7a56b80f50c8248d734745f886d40d341a99fefaf439f95bdeb0382ee15ea9e4f8561f98703fba2d SHA512 3771077c64c28b1fcf310d7a449d3e1eb951d1669b2ad3ddffe76d98ac5821ea8af40013984c65f28c7fce3434b7173a74a77120847f557cab2dedefac0c8b58
 AUX rhash-1.4.2-clang.patch 2775 BLAKE2B 0160a245931d58eb4809e95b5ab8a515fadf1459714378f254c597d56f3c4336ee59b17152c3fc23ae4ca39a4cc076eb78783e609b847b0c276c8f8c37fdd940 SHA512 3b28f8234d42f7dc46a8b890e5ba6f49e61f3db26019e81bfe8d4318b28d71ca781c49f0ee09c387a1cbef626ad016fc3177037f2d504be7572d56ed836ff954
-AUX unquote-cc.patch 791 BLAKE2B a872b7a8e8d2e04f5cf3dda0b4f4aa5e0177878942f9836f8a431d950392dafb46be646048a0ab4dc4a31ac20b6676fa8627b39bbb30a990861cf8d3cfc742f8 SHA512 7a4c2bf019cbcde021bb79572abdbc9b42f995ada5bb9798fed127d79c44ed9d4b9544c1413952604b1dd45ed307acdacba6675419f6331d75ecf34c15b8f5ca
-DIST rhash-1.3.6-src.tar.gz 328097 BLAKE2B c74993d183f0f2e479f0bd5831a9f653b9bd17bbed4d1ba896f6e33db98b7141175cd3c688dc41dfd8ec4b98acb51255ae5b795435cbc9dfb5ab77573cb25543 SHA512 54f7f238ed1fdc01c29cc1338fa86be90b69beff0df8f20d24ce9cb3c48c7f4668b84a3fe0d4d8b04b54bc8145485d493435edf3219de3a637af0f9c007c85c6
 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.2.ebuild 2068 BLAKE2B e6f2fe60cddd5a09cf10e6904a71ed07fdba07fb9b9161853bc2afc1d3a0d1554ad5e04ebe464e7027ce0ed0834c3a8b96c5c2b30c050edab6c70e260cee33ed SHA512 af9985b92caba911f6f3a4d57a8ca0bf9884564bc8d773ce27c7b65b8ac6c8c86547ec3020ef5d468fc5f976d5cccf88d404ac74bd38492a5bc30132ddaab68c
+EBUILD rhash-1.4.2.ebuild 2060 BLAKE2B b654ecd535292a557e449914abb5f81300bbc54bf968f7683fde6ab9eaef5106204b8ecbcb5de659e8fada0f2c6b3e71534d1f494781e7e6c57edb582682ad01 SHA512 2862f7d61dc6b3d8dbe3a56985481f840e9fe7343b5ab576ea046ccdda664fa3818c177e7145cd52b20e8f19837f37aa34cd625f50e3c796ed81f4f4dfcb99a3
 MISC metadata.xml 817 BLAKE2B eeb15cde9e06507f73330759d44dca59dea3bbcb972cb25af71d91f065eb64dbd1ddc61e43f8fad50c264c269542f92efdace36d3397647c3c53972e695da22f SHA512 3e2f688b57c74e051fcfb90d34685346c459c5e9f425266fd3d8e099f586037b14c2bfdac76f135a046c77cc850bb49954c0e7d8dc9ded1db47bf0919ab3ea93
diff --git a/app-crypt/rhash/files/darwin-triplet.patch b/app-crypt/rhash/files/darwin-triplet.patch
deleted file mode 100644
index 49b7e121d818..000000000000
--- a/app-crypt/rhash/files/darwin-triplet.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-From 35a830d1968465e4ecb079273f032b754bac6c66 Mon Sep 17 00:00:00 2001
-From: James Le Cuirot <chewi@gentoo.org>
-Date: Sun, 25 Mar 2018 17:40:49 +0100
-Subject: [PATCH] configure: Add target OS clause for Darwin
-
-These triplets can also have a version number suffix, for example,
-x86_64-apple-darwin16.
----
- configure | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/configure b/configure
-index 5b6b710..2d8ac42 100755
---- a/configure
-+++ b/configure
-@@ -410,6 +410,7 @@ else
-       amigaos) TARGET_OS=AmigaOS ;;
-       mingw32*) TARGET_OS=MINGW32 ;;
-       wine) TARGET_OS=Wine ;;
-+      darwin*) TARGET_OS=Darwin ;;
-     esac
-   }
-   TARGET_OS="UNKNOWN"
diff --git a/app-crypt/rhash/files/freebsd-triplet.patch b/app-crypt/rhash/files/freebsd-triplet.patch
deleted file mode 100644
index 94b615824be7..000000000000
--- a/app-crypt/rhash/files/freebsd-triplet.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-From 14db7f9ee87e05450853ba0e1d8e83cc34aef3e4 Mon Sep 17 00:00:00 2001
-From: James Le Cuirot <chewi@aura-online.co.uk>
-Date: Sat, 24 Mar 2018 13:51:56 +0000
-Subject: [PATCH] configure: Match FreeBSD triplets with versions
-
-Triplets such as x86_64-unknown-freebsd11.1 are common.
----
- configure | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/configure b/configure
-index 8ebb929..5b6b710 100755
---- a/configure
-+++ b/configure
-@@ -398,7 +398,7 @@ else
-     part=$(echo $BUILD_TARGET | cut -d '-' -f $component)
-     case "$(echo $part | tr '[A-Z]' '[a-z]')" in
-       linux) TARGET_OS=Linux ;;
--      freebsd) TARGET_OS=FreeBSD ;;
-+      freebsd*) TARGET_OS=FreeBSD ;;
-       gnu/kfreebsd) TARGET_OS=FreeBSD ;;
-       netbsd) TARGET_OS=NetBSD ;;
-       bsd/os) TARGET_OS=BSD/OS ;;
diff --git a/app-crypt/rhash/files/rhash-1.3.6-no_echon.patch b/app-crypt/rhash/files/rhash-1.3.6-no_echon.patch
deleted file mode 100644
index 9b25b29a89f3..000000000000
--- a/app-crypt/rhash/files/rhash-1.3.6-no_echon.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-From c1776248a0b34a690e99ab9a7a814c34f78088ec Mon Sep 17 00:00:00 2001
-From: Lars Wendler <polynomial-c@gentoo.org>
-Date: Mon, 19 Mar 2018 10:47:13 +0100
-Subject: [PATCH] "echo -n" cannot be expected to work with every POSIX shell
-
-See "man 1p echo" section APPLICATION USAGE. This patch replaces "echo -n"
-with "printf '%s'".
----
- configure | 15 ++-------------
- 1 file changed, 2 insertions(+), 13 deletions(-)
-
-diff --git a/configure b/configure
-index f480f7b..2a7d485 100755
---- a/configure
-+++ b/configure
-@@ -22,17 +22,6 @@ INSTALL_LIB_STATIC=auto
- INSTALL_LIB_SHARED=auto
- INSTALL_PKGCONFIGDIR="$PKG_INSTALLDIR"
- 
--case $(echo -n) in
--  -n) # SysV style
--    ECHO_N=
--    ECHO_C='\c'
--    ;;
--  *) # BSD style
--    ECHO_N='-n '
--    ECHO_C=
--    ;;
--esac
--
- # display error message and exit
- die () {
-   echo
-@@ -235,7 +224,7 @@ trap remove_tmpdir EXIT
- 
- str_concat()
- {
--  echo ${ECHO_N} $@ ${ECHO_C}
-+  printf '%s ' $@
- }
- 
- yn_nonempty()
-@@ -246,7 +235,7 @@ yn_nonempty()
- # Use this before starting a check
- start_check() {
-   echo "============ Checking for $1 ============" >> "$TMPLOG"
--  echo ${ECHO_N} "Checking for $1 ... ${ECHO_C}"
-+  printf '%s' "Checking for $1 ... "
-   res_comment=""
- }
- 
--- 
-2.16.2
-
diff --git a/app-crypt/rhash/files/unquote-cc.patch b/app-crypt/rhash/files/unquote-cc.patch
deleted file mode 100644
index 77ccc9b2c5f7..000000000000
--- a/app-crypt/rhash/files/unquote-cc.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From 4558d6753611ab1bf21765017e5b451aee8409f6 Mon Sep 17 00:00:00 2001
-From: James Le Cuirot <chewi@gentoo.org>
-Date: Sun, 18 Mar 2018 14:23:28 +0000
-Subject: [PATCH] configure: Don't quote $CC when calling it
-
-It might have additional arguments.
----
- configure | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/configure b/configure
-index f480f7b..8ebb929 100755
---- a/configure
-+++ b/configure
-@@ -480,7 +480,7 @@ if test "$(basename $CC)" = "icc" || test "$(basename $CC)" = "ecc"; then
- else
-   CC_TMP="$CC"
-   for CC in "$CC_TMP" gcc cc ; do
--    if "$CC" -v >/dev/null 2>&1; then
-+    if $CC -v >/dev/null 2>&1; then
-       cc_name_tmp=$($CC -v 2>&1 | tail -n 1 | cut -d ' ' -f 1)
-       if test "$cc_name_tmp" = "gcc"; then
-         cc_name=$cc_name_tmp
--- 
-2.16.1
-
diff --git a/app-crypt/rhash/rhash-1.3.6-r1.ebuild b/app-crypt/rhash/rhash-1.3.6-r1.ebuild
deleted file mode 100644
index 9dfdd81943a2..000000000000
--- a/app-crypt/rhash/rhash-1.3.6-r1.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit toolchain-funcs multilib-minimal
-
-DESCRIPTION="Console utility and library for computing and verifying file hash sums"
-HOMEPAGE="http://rhash.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}-src.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris ~x86-solaris"
-IUSE="debug nls ssl static-libs"
-
-RDEPEND="
-	ssl? (
-		dev-libs/openssl:0=[${MULTILIB_USEDEP}]
-)"
-
-DEPEND="${RDEPEND}
-	nls? ( sys-devel/gettext )"
-
-S="${WORKDIR}/RHash-${PV}"
-
-PATCHES=(
-	"${FILESDIR}"/unquote-cc.patch
-	"${FILESDIR}"/${P}-no_echon.patch
-	"${FILESDIR}"/{freebsd,darwin}-triplet.patch
-)
-
-src_prepare() {
-	default
-	multilib_copy_sources
-}
-
-multilib_src_configure() {
-	set -- \
-		./configure \
-		--target="${CHOST}" \
-		--cc="$(tc-getCC)" \
-		--ar="$(tc-getAR)" \
-		--extra-cflags="${CFLAGS}" \
-		--extra-ldflags="${LDFLAGS}" \
-		--prefix="${EPREFIX}"/usr \
-		--libdir="${EPREFIX}"/usr/$(get_libdir) \
-		--sysconfdir="${EPREFIX}"/etc \
-		--disable-openssl-runtime \
-		--disable-static \
-		--enable-lib-shared \
-		$(use_enable debug) \
-		$(use_enable nls gettext) \
-		$(use_enable ssl openssl) \
-		$(use_enable static-libs lib-static)
-
-	echo "${@}"
-	"${@}" || die "configure failed"
-}
-
-# We would add compile-gmo to the build targets but install-gmo always
-# recompiles unconditionally. :(
-
-multilib_src_install() {
-	# -j1 needed due to race condition.
-	emake DESTDIR="${D}" -j1 \
-		  install{,-pkg-config} \
-		  $(use nls && echo install-gmo) \
-		  $(use kernel_Winnt || echo install-lib-so-link)
-
-	emake DESTDIR="${D}" -j1 \
-		  -C lib${PN} install-headers
-}
-
-multilib_src_test() {
-	emake test
-}
diff --git a/app-crypt/rhash/rhash-1.4.2.ebuild b/app-crypt/rhash/rhash-1.4.2.ebuild
index 95bea74843c5..d57cf5e83c4d 100644
--- a/app-crypt/rhash/rhash-1.4.2.ebuild
+++ b/app-crypt/rhash/rhash-1.4.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}-src.tar.gz"
 
 LICENSE="MIT"
 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="debug nls ssl static-libs"
 
 RDEPEND="
diff --git a/app-crypt/sbsigntools/Manifest b/app-crypt/sbsigntools/Manifest
index 837ccd8f58cb..5b467cd93de6 100644
--- a/app-crypt/sbsigntools/Manifest
+++ b/app-crypt/sbsigntools/Manifest
@@ -2,5 +2,5 @@ DIST sbsigntool-0.8-ccan.tar.gz 113537 BLAKE2B 8fbf27463d30c1895930628a145be2d52
 DIST sbsigntools-0.9.2.tar.gz 56525 BLAKE2B 0bce1f534aa960672eab6a415e287b79ff9f18eb947e2217ad4533081f8b854e160b57828afbb56423b2dcab723d3a8aacb2e6affeb2057d17ce3c1761d96b11 SHA512 060753ed9c8db794e4755cc66c1940a2ccc89f4ddf0e825da1f1e6eaa75fc67c21060ee4b5dfb0c757b69e6f5959bfa68156d9f95a945cf63c6a20f1414a2c27
 DIST sbsigntools-0.9.4.tar.gz 57714 BLAKE2B 94797af6c98a9c13cb71e52ba6f7ff07de70660af2194b14061e0cb618d6effff52ef7a4dd2fd4e44e75f022b979442d4290b1d65d63017b2fbebdca5951c5c9 SHA512 953d3d9a7f92b837da966eabe3572163a29c5292e792d5ef17cf842d7373ffaa901377cb4ec68006a6ef2f9c97d48db8ffdd3a6d2853be67016d3484a118bba9
 EBUILD sbsigntools-0.9.2.ebuild 1247 BLAKE2B 5f6f3cfcdfeca22a27b8811032fe4233f2e19939d764f2207064094056446d4e0011e992287c08b2b7a7f09ad16fd7ba562c41ca1eef3cc8a72c029883b1ddc5 SHA512 ea07d500700cdf6083ae6fa381b792ef8b8c6418e1339abc1ed1782172caa050954e2953e641d4c6bd84efb1783230a506b6dfec7df8bf0efc8be7ebfa5368c3
-EBUILD sbsigntools-0.9.4.ebuild 1249 BLAKE2B 47cd1930573e0ffd66ed83b1f307f645324e2b6ebd2014ed1156cc9eeaf7ec862d65c51d7830cdd8cabbd7b6b2aedc4b2aa70b05c35def39c70ca383d4641276 SHA512 8ded98418614ba94ba1647f10ed369d7ef6b8d814e771ba6cf911aca6ab79720b018edb75b20f9626a1afeeada7e5d046e760a52a58c359570b0f0fc1b3ef039
+EBUILD sbsigntools-0.9.4.ebuild 1280 BLAKE2B aef7aceca5092b0bbf0fa718b07ea28caf265790da3d7920524ceaf995d6b9b18a009c2fc04f3881f86d48858b01c8dcd43bf1e4b6b458aaaa22f1ddf26e31bd SHA512 2207a2d58e7a0100f7a4d7f471d7d8440360c3eec154413619cc5fbfccbb50cc72ac932f3489192798d1699094f980bee1a52068c8afc598a0b9862d11eaf851
 MISC metadata.xml 292 BLAKE2B 590a17ca49fb39917074648d0b2439e707a49055f7b65cc923500cfe354b51aa020c3899b14d7de263c97f281aad36c19695f54747c7652bf46ce26d7a14b5d7 SHA512 230e2b4d2b6858ab067cb5ffe9e59b93fa22abe34bbebe74f0eca9a1f96fcfb9bbe536ed34c1bf8d977e8dfc7b46a6d44feb541d3426e6ada42f35f92ac7c896
diff --git a/app-crypt/sbsigntools/sbsigntools-0.9.4.ebuild b/app-crypt/sbsigntools/sbsigntools-0.9.4.ebuild
index fbf2b68c085c..b8865b50a89d 100644
--- a/app-crypt/sbsigntools/sbsigntools-0.9.4.ebuild
+++ b/app-crypt/sbsigntools/sbsigntools-0.9.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
@@ -14,7 +14,7 @@ SRC_URI="https://git.kernel.org/pub/scm/linux/kernel/git/jejb/${PN}.git/snapshot
 
 LICENSE="GPL-3 LGPL-3 LGPL-2.1 CC0-1.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 arm64 ~riscv ~x86"
 IUSE=""
 
 RDEPEND="
@@ -35,6 +35,7 @@ src_prepare() {
 		amd64) iarch=x86_64 ;;
 		arm64) iarch=aarch64 ;;
 		ia64)  iarch=ia64 ;;
+		riscv) iarch=riscv64 ;;
 		x86)   iarch=ia32 ;;
 		*)     die "unsupported architecture: ${ARCH}" ;;
 	esac
diff --git a/app-crypt/seahorse/Manifest b/app-crypt/seahorse/Manifest
index b81740165fd0..2e9841dcd791 100644
--- a/app-crypt/seahorse/Manifest
+++ b/app-crypt/seahorse/Manifest
@@ -1,6 +1,4 @@
 AUX seahorse-40.0-fix-segfault-with-ldap-disabled.patch 1056 BLAKE2B bde592e3c78f28503d0e113da676639c76d9ab8c17226bd94e82b2e3cd1612088147b62d064cc0d7268d8cd75912c8239e52ec7c7c96f4f8aeff5120a955b367 SHA512 9c69c11540ea9dab84bafac8ee12302eea47e67276a6023a91768a612d42325a9496ec7472ba988dab7ad79cc7b6f5c012e5c0cb94b90f9509f0c71e72cc3c97
-DIST seahorse-40.0.tar.xz 1309064 BLAKE2B dd179ef13c79454b30571959b33c02a523591fa9d59957e0c30ec5d75a52bd8e9a5b420214f85d5feac0849d69a51ddcee808ab47e4bf97d7ac99094f853bc9a SHA512 c389420fb1b3d54c1b9a1004f2c8b9e50118a1ffcba02aa8cfdd2223d1bc117368c9a1ad875c59abd319d95eb93ec3de2e9cedadbfc1d6a0997d613c8256c60b
 DIST seahorse-41.0.tar.xz 1371984 BLAKE2B fdfc7c6d5ba41ab83c639d93c92fe6e1c36d42a02c7a384c2055bfe594e2a16415115bfb07597de93a886e492974e38c812fbbd59c7112c0360adeed96cb437d SHA512 cc51e27a55ed646ee376aa1b1bffe28369d80e4b8c484c9711de6bdf190694714ef208579d0399b5c199b5619491d72dede1b1f6c03b89cf3a53e8519a4d4fcf
-EBUILD seahorse-40.0-r1.ebuild 1688 BLAKE2B 1467777527251f2dfb6501ec2ea5054428cdbc52d0cbd08bb9f4cda244de7bee02a64c666274e724e07d8a8a1750c47cbed1886a3741c7201743d5a2d458ccb3 SHA512 a23db51158cd52eeb5db93b1479f726be7d00a4f69766fcd8d48a0304b1420420a5b3f635c44f4a9b0f7c1bc4848edf79e7db23e1d7ed8aeab01fcd994ac8ac5
-EBUILD seahorse-41.0.ebuild 1627 BLAKE2B dd1b330b4a018eae7117d6fde17c4b766f47e16d9b809d5d555ebe34321cb7489d7af8de5fb5919a17493f4539ab200d57f3dc0ae2178d44ad2d6e87b6d6c323 SHA512 1ae55ceb406da14884c069eca6eae08a4ae09549a7e60ccb3463657061762dd161e6772372a6fb4aee9adc1668792f5228cda4d3d11049026479b69fc8dcea80
+EBUILD seahorse-41.0-r1.ebuild 1626 BLAKE2B 8a1ae85a4f8918bf669eacb4ee79032bedae547f773e3e81b6dd82c93dbb1a6dd246659145ca7433b34d399015759304f6a4605cce1a7d08af8bbeeef49c832b SHA512 cad8007442c024645b08aef029f195c5c1087348f5f2a57e2700acdf161fe1e761620f3a109f9b712cc78637fbc50ad132505171f2487d29bc5f51e16eeb276a
 MISC metadata.xml 743 BLAKE2B 90fed564b56f7e7a781f197eb09ebbca90ac0bd3c93ee1b65eec7e35420fcdd8bf0c0bf67cbf2109a55de590f32b48d3837a70844bb7e6e50819a8b67c868369 SHA512 99872b87aa52c0fe0584d11186fed74d0ade69e083395b030af3a22ba031a91467247c9c72e8cfa45b114192ebc13ed593a2634aec7db5a2b8efa1e2af6a0791
diff --git a/app-crypt/seahorse/seahorse-40.0-r1.ebuild b/app-crypt/seahorse/seahorse-40.0-r1.ebuild
deleted file mode 100644
index 935f5b5b2e62..000000000000
--- a/app-crypt/seahorse/seahorse-40.0-r1.ebuild
+++ /dev/null
@@ -1,80 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit gnome.org gnome2-utils meson xdg vala
-
-DESCRIPTION="Manage your passwords and encryption keys"
-HOMEPAGE="https://wiki.gnome.org/Apps/Seahorse"
-
-LICENSE="GPL-2+ FDL-1.1+"
-SLOT="0"
-IUSE="ldap zeroconf"
-KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~sparc x86"
-
-RDEPEND="
-	>=dev-libs/glib-2.58:2
-	>=app-crypt/gcr-3.38:=
-	>=app-crypt/gpgme-1.14.0
-	>=x11-libs/gtk+-3.24.0:3
-	>=app-crypt/gnupg-2.2
-	>=gui-libs/libhandy-1.1:1=
-	>=app-crypt/libsecret-0.16
-	dev-libs/libpwquality
-	net-misc/openssh
-	ldap? ( net-nds/openldap:= )
-	>=net-libs/libsoup-2.33.92:2.4
-	zeroconf? ( >=net-dns/avahi-0.6:=[dbus] )
-"
-DEPEND="${RDEPEND}
-	$(vala_depend)
-	dev-libs/libxml2:2
-	app-crypt/gcr[vala]
-	app-crypt/libsecret[vala]
-	gui-libs/libhandy:1[vala]
-"
-BDEPEND="
-	app-text/docbook-xml-dtd:4.2
-	app-text/docbook-xsl-stylesheets
-	dev-libs/appstream-glib
-	dev-libs/libxslt
-	dev-util/gdbus-codegen
-	dev-util/glib-utils
-	dev-util/itstool
-	>=sys-devel/gettext-0.19.8
-	virtual/pkgconfig
-"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-fix-segfault-with-ldap-disabled.patch
-)
-
-src_prepare() {
-	xdg_src_prepare
-	vala_src_prepare
-}
-
-src_configure() {
-	local emesonargs=(
-		-Dhelp=true
-		-Dpgp-support=true
-		-Dcheck-compatible-gpg=false # keep lowest version listed as compatible as min dep for gnupg RDEPEND
-		-Dpkcs11-support=true
-		-Dkeyservers-support=true
-		-Dhkp-support=true
-		$(meson_use ldap ldap-support)
-		$(meson_use zeroconf key-sharing)
-		-Dmanpage=true
-	)
-	meson_src_configure
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	gnome2_schemas_update
-}
-
-pkg_postrm() {
-	xdg_pkg_postrm
-	gnome2_schemas_update
-}
diff --git a/app-crypt/seahorse/seahorse-41.0.ebuild b/app-crypt/seahorse/seahorse-41.0-r1.ebuild
index abbf0c377707..bd31322686a1 100644
--- a/app-crypt/seahorse/seahorse-41.0.ebuild
+++ b/app-crypt/seahorse/seahorse-41.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -10,12 +10,12 @@ HOMEPAGE="https://wiki.gnome.org/Apps/Seahorse"
 LICENSE="GPL-2+ FDL-1.1+"
 SLOT="0"
 IUSE="ldap zeroconf"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc x86"
 
 RDEPEND="
 	>=dev-libs/glib-2.66:2
 	>=app-crypt/gcr-3.38:=
-	>=app-crypt/gpgme-1.14.0
+	>=app-crypt/gpgme-1.14.0:=
 	>=x11-libs/gtk+-3.24.0:3
 	>=app-crypt/gnupg-2.2
 	>=gui-libs/libhandy-1.1:1=
diff --git a/app-crypt/ssss/Manifest b/app-crypt/ssss/Manifest
index 768d2709a6b5..7dfdad5aae24 100644
--- a/app-crypt/ssss/Manifest
+++ b/app-crypt/ssss/Manifest
@@ -1,3 +1,3 @@
 DIST ssss-0.5.7.tar.gz 21774 BLAKE2B 923f9e0c46e82261dc4f293635aa318c986cee221a93e9df3d232e4b923a7828f0301c8729a5beb72b66e1646e5a0694cfa9546ea26b0e06fa16a8a0c7487ef6 SHA512 aca85b7a63e6d009fffe5540b0c8e3190c364aa2070e8d8487fd42d7ac76143e404b226b28f3630022d102679371673cc7c08b8c5d3bcf63e3676b7293d2ba00
-EBUILD ssss-0.5.7.ebuild 808 BLAKE2B fc38855b3b5a473da31fe1d02e1a9b4a186aa7d899faf480cb0e2f003e1ae7d4dd3ce75b600d7eb9b2b99ec049d4179c5fccece082dc86e0699515aaf34f36cf SHA512 213578f15982f41ad74bf190293939fda322d67cf37b1745a0cac382eeffc496856e49e5df08bab06cbdfe4fe74e16aba2859dcf440b72224435209f957f605c
+EBUILD ssss-0.5.7-r1.ebuild 808 BLAKE2B f16ff6f91abb17f6edeb7fd54f4f154b2dade3bbb82f33ea45d3fe4f3b93f4127d528dbd9b49cafd44f47bb4860b7b77aeabf60c81f7bd346f37b2584eb024d8 SHA512 e64870c2d10ac4641b9990f19d6ec648fc5501c34bc21ec06ad8191e16be757cab900e8f406fb12f941b01cf99bcc838882daabf2b419ec302177ab6e0b58803
 MISC metadata.xml 572 BLAKE2B a40cd8132c114b04e6af99883713fe581dc6527d6773a4a74422e1e853dfa85455f1b199c9b8b9db056cbd7877087c8b713b3285f9bb3fe75a28fa076e3bfe65 SHA512 f715a45bd74530c74b8934c8da2d2067ec00b9af6eaebb5e50310b45295db8dbc1bd65e2258e1860f624e69565f5f04c37aaf4f5813637404b28135ff22967ca
diff --git a/app-crypt/ssss/ssss-0.5.7.ebuild b/app-crypt/ssss/ssss-0.5.7-r1.ebuild
index 53234e2029f3..ce73f8924357 100644
--- a/app-crypt/ssss/ssss-0.5.7.ebuild
+++ b/app-crypt/ssss/ssss-0.5.7-r1.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 inherit toolchain-funcs
 
diff --git a/app-crypt/swtpm/Manifest b/app-crypt/swtpm/Manifest
index ee04cf884484..bd04faaf7302 100644
--- a/app-crypt/swtpm/Manifest
+++ b/app-crypt/swtpm/Manifest
@@ -1,8 +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.1.tar.gz 326488 BLAKE2B 46c53cbd4195cfc1d45ef5e56b1f78c59dcb9f859349e161f07d9933ce720ec3511343cf29236119d08162410355fc50cb5d15745c84db78d860b006812c169f SHA512 a44e36820ad61e84d62b330f3adf0c463c98438056d74c5ba30916d956e722633e0198ae87be8352a0ab909ae5a4bbc3826410d2166186c43bba067f533fec85
-DIST swtpm-0.7.0.tar.gz 353641 BLAKE2B a9169affdfd09cec887667e21d4db72b7d4b489bf3ecf5e43da9ae2d59ef3f15b94627ce22ed1f6fca69f46da40293ba1ef3d129fab7de3ca32c4b12ffc51544 SHA512 32096309bf710e51d7565f013db32627423682fb2bfa9358976126102a0bf07401146bae9346af389c932c038f3d03217739375cef01a2ff10b01c7bd004b55e
-EBUILD swtpm-0.6.1.ebuild 1433 BLAKE2B a5f67396fc4132fc08dbc507f7a7beff6d3d35115b93607d668a2cb5301a3f0ded9985cc61dce1375fed3da62f435b7217017ced0af9da99d473a828ddca3259 SHA512 0bfc6b861f7bd45c41aea45e0b86384d66deee9ae0a7e3ed464ae6bef9233a92dff896d7ddbcd9deb05133438b67d716735a917b53b711dc9fdda173a3cc841f
-EBUILD swtpm-0.7.0.ebuild 1434 BLAKE2B bd889e4de7b54aa1db707aae32bb715a6d1e73810e6d14ddeb399370c3c039a38290e932a1421c0b257783506673d4956e4c0aa3b671b4afc8c9aabc9325c3f0 SHA512 ed8c58e32847c3706b2c3efa161dd2519b6ec4ba704d00bb9395024f80642c003bf3fb09305b47fca1ee82b6c51358a5b28ee1fa0f58e470f9ec036635545a2c
+DIST swtpm-0.7.2.tar.gz 353941 BLAKE2B e4d69919b5d255cff5eb9cda4c98e84e9fd53290360312742f95d63444ad5279fc7808e7f2e040cc2c87475c409b3c0f22e54ca301e8cb18bee71290f661ecc8 SHA512 91a8f9371a13f5f6bb329ef4bd7638fb9abe5ec84631b1d22e7eb9abcb91b7f3cccfdf147f65d54c03bf4d8a141b6b5fb6385d90f78d35096bd3b8ce140d39cb
+EBUILD swtpm-0.7.2.ebuild 1441 BLAKE2B 650f9464aedf2c87df79e3a0544817284241ca0564492e62a6d094dd241a4d28be785c203b989fc3f966c089a5401f4146e22053437f1cc5070fdd68f628b4e9 SHA512 19ccd142d8a80f52abf963a6b58eec4d64edade0f0c22481e74b5661d5a337b629a516b1d78bd7a746b7e2152724dc465ee3086b371bcc009b7a2f3b826b3779
 MISC metadata.xml 623 BLAKE2B 10e2a56c1ad2da7890bb641cdb368f0f512185cefd18356ef96c8e7b34a873c439e9f7d5d98e0e2f339a0a9f090cb372a1ef8d1cd7251efc115fc021ab05825c SHA512 edd9f7ccc6147cb92f32415ba3ed6ad9351a49fbff8655866c99e80f1782801df90a63f3ca40153bfb01d689ab642823cea5d6e144b0aede0ce6d7da8b48f5f1
diff --git a/app-crypt/swtpm/swtpm-0.6.1.ebuild b/app-crypt/swtpm/swtpm-0.6.1.ebuild
deleted file mode 100644
index edfcad7512ff..000000000000
--- a/app-crypt/swtpm/swtpm-0.6.1.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{7,8,9} )
-
-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/swtpm/swtpm-0.7.0.ebuild b/app-crypt/swtpm/swtpm-0.7.2.ebuild
index f4adc4ae102f..445bd551d578 100644
--- a/app-crypt/swtpm/swtpm-0.7.0.ebuild
+++ b/app-crypt/swtpm/swtpm-0.7.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/stefanberger/swtpm/archive/v${PV}.tar.gz -> ${P}.tar
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
 IUSE="fuse +gnutls seccomp test"
 RESTRICT="!test? ( test )"
 
diff --git a/app-crypt/tc-play/Manifest b/app-crypt/tc-play/Manifest
index 8ff223c1b2de..62e9c892bfed 100644
--- a/app-crypt/tc-play/Manifest
+++ b/app-crypt/tc-play/Manifest
@@ -1,4 +1,4 @@
 AUX tc-play-2.0-build.patch 677 BLAKE2B 1b0f8372a6e94a7ff2cc3c1236855d6d1973172b78586e6ee72f29723841aa700ece23be1c985b00c37196da20ea18c1b30f13d0e00fa8de6bf603cfce769110 SHA512 0f41f59b8fe4376f5d48dcb3e3ca76698b141924b6f0b3768eb46238f6d597f2a8cf3c6aa840bba57ecfd61337182eb48e627fc1a04b348849e8bc5346c82e9b
 DIST tc-play-2.0.tar.gz 1015525 BLAKE2B 1481eecc8aaf2cb9698eed96a9cdabaa2b74daf11865dd29a6fab7e66fb76aa2f6e544fe7ac53a2510415ee6ddf3c5732c774a26708fe354113eb9de6a9b62d9 SHA512 17408b2a664eb6822c77ede4f38ca67cdf643512014619d830a2c024bb8971811eded4edd65f6398d6112a3b57cd11a5b414357878c817c9cc2aac9d851946d7
-EBUILD tc-play-2.0-r1.ebuild 1089 BLAKE2B 64a2d9fdd8f0373cdafc82f377229455ba55b2e82b34be71d9fe2383150937c720a672f5d90e7a50fe5a2245b4a7ffc1f394b2126814e5d0cd6c6a261c5fc8c3 SHA512 2ac2ae7977d49908af62a823cf7d54000078463cc91abc4c372c2e4c181a883b46120d3320b471c5cdf12de7f017ecd65c730fbc7b7f93cfed6c6c5514e78e97
+EBUILD tc-play-2.0-r1.ebuild 1091 BLAKE2B fa20c56eb48cd82e71023fc434fd4fd6d77578a5ea40d521cdecb209a5f16cd867749bdd4e0f8376e4ffe8a9928b146b0d202c2d92e3ea7a95634bd8564e6781 SHA512 198c3a2b0d0c0c91d1ff69eacd36f27a5e68ee3cffdb567226aa17a577cc5cf9ee52b55c0696c290153eeef702a9144cb9d85928a86b9b52ef2169c8f2625c95
 MISC metadata.xml 252 BLAKE2B 555780b1a53410dc9c4d9157d8995e674e5306af2df14855c098124f3eb3a705007fc9d6122108f6ca8f842b968335e8a2c1866fde46d73801a9fb5eaabcd057 SHA512 1c6cddedeba42c9c2c82d30e312f953f0cee04bce36a70fbd1586dceb92407324b274de60d55f58251065d61ee186769e55b7a0d2cfc8cbff6c7e816015742f1
diff --git a/app-crypt/tc-play/tc-play-2.0-r1.ebuild b/app-crypt/tc-play/tc-play-2.0-r1.ebuild
index b8022d5f11a9..401465c26b69 100644
--- a/app-crypt/tc-play/tc-play-2.0-r1.ebuild
+++ b/app-crypt/tc-play/tc-play-2.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -40,9 +40,9 @@ pkg_setup() {
 	EXTRA_MAKE_FLAGS=(
 		PBKDF_BACKEND="${backend}"
 		WARNFLAGS=""
-		CC=$(tc-getCC)
-		AR=$(tc-getAR)
-		PREFIX=/usr \
+		CC="$(tc-getCC)"
+		AR="$(tc-getAR)"
+		PREFIX=/usr
 		LIBDIR=/usr/$(get_libdir)
 	)
 }
diff --git a/app-crypt/tpm2-abrmd/Manifest b/app-crypt/tpm2-abrmd/Manifest
index a428652fc574..11a47951c2e3 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 1271 BLAKE2B a8c79f8e9e0d5937435dd444648d6e1da02dfed892f6133e6c741749cff6b065208af4049d101110be4099e38d3149280206231348f353cfca89868008d753f0 SHA512 ca76d7157ff7c378a5990953a3081a01b0334b025dbe71ae79955b2290eb7c25aca5fc024ee2af9ccf30cdd886ad25952a594e55515d53b088822eca7ff9f751
+DIST tpm2-abrmd-2.4.1.tar.gz 577259 BLAKE2B 7d97e1069a171f3693fb11b8e2ce0243993f4352aae9fd691bfbf1b8fcef8615b79957f8f662ac00fe59bf7e3830d8abb79c67790f7be1cd3140fd1c7b1ed560 SHA512 0335285678cfceca4f185981ded90d213ff796cadddc9b5d6dbf2db533f81023a0f1089bbd8a8017bccb95190889be23b24d38a176d3368d221479aff4ff7d6c
+EBUILD tpm2-abrmd-2.4.1.ebuild 1508 BLAKE2B 7ba3a1b950db9423ef8364e71faf8dda1ae78766649c4795747cdf15973d2cf77221fbaa971d0e1da4a89b0eaf12dc5ee4021757a24285033b88a01f8a3f5d36 SHA512 1aa968109be771c246ee190ad2553e5dd306dbe23fe50541e9a72c231a6a5b505981a1d3a73d70137970001ba38b229fbdd4957fdb76e5910c353179e5c49d4b
 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.1.ebuild
index c8f8f974a8ee..0b9eedf9ce6d 100644
--- a/app-crypt/tpm2-abrmd/tpm2-abrmd-2.4.0.ebuild
+++ b/app-crypt/tpm2-abrmd/tpm2-abrmd-2.4.1.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 inherit autotools systemd
 
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/tpm2-software/${PN}/releases/download/${PV}/${P}.tar
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
 IUSE="static-libs test"
 
 RESTRICT="!test? ( test )"
@@ -49,6 +49,12 @@ src_configure() {
 
 src_install() {
 	default
+
+	if [[ ${PV} != $(sed -n -e 's/^Version: //p' "${ED}/usr/$(get_libdir)/pkgconfig/tss2-tcti-tabrmd.pc" || die) ]] ; then
+		# Safeguard for bug #833887
+		die "pkg-config file version doesn't match ${PV}! Please report a bug!"
+	fi
+
 	find "${D}" -name '*.la' -delete || die
 
 	newinitd "${FILESDIR}"/${PN}.initd ${PN}
diff --git a/app-crypt/tpm2-tss/Manifest b/app-crypt/tpm2-tss/Manifest
index c559fd9145a1..53e0c825241f 100644
--- a/app-crypt/tpm2-tss/Manifest
+++ b/app-crypt/tpm2-tss/Manifest
@@ -1,10 +1,10 @@
 AUX tpm2-tss-2.4.1-configure.ac-wrap-PKG_CHECK_MODULES-in-braces.patch 2073 BLAKE2B 09e64b791b75a6bb673402fe94bd4b4bac91f07f98e9053941470b0f44034d6892e6070aaa08326b25c1567018eef898b6508ded8bdbdfd0dd342ca22d0cdcc6 SHA512 d354f656481db5ead0d48ae0389954cc6735a037a6b09cda251360b937128b5807d4b3c5819dbceaa1767db2232ff8dea2f00af3998c182ee3533f97365aeda2
 AUX tpm2-tss-2.4.2-Dont-run-systemd-sysusers-in-Makefile.patch 452 BLAKE2B 8b05bcdbe62333226d89a0275de8cfaa6b4f87d508a5f5c7da260d713244f468e07fbcb5e5c071bd9f8679dd369120d4d41c3c2d9a6c6cf81e17498e1a8b397b SHA512 c8255213c3712cc9f0bdce0080c9f14644926bd45103c89e0dfdbd8dfb4d4c1168bd6c0582b4c671d4c65f6b965246eaefb86e9ae2f43d354a67584f97ef9745
 AUX tpm2-tss-3.1.0-Dont-run-systemd-sysusers-in-Makefile.patch 1214 BLAKE2B 40f1005626205d440fabda7f88444b0eef344df8f6ead5716807bcbaf490e7b24afc12580ae25c506fcc45dfb4bac0789d9b897dfcaae943c6ba9795b2f4f1d8 SHA512 adbff50c66a22659b563344c216d60bb80951016c3d7180c07c0498c285c9099a60e5573ed0ce29c7732de28d4c390b8eac16bf695c739d0c614dd344f1bfb46
-DIST tpm2-tss-2.4.5.tar.gz 1439394 BLAKE2B 644d917f545e93dd81856611522329caf4ff038e4ddb04d761f03339cc7308095abc1c9b46a4d601cad67deea6f917ee5e4236c59f3d7042a7fdf2d33630dd3f SHA512 2c92af07ed1cc3665c19479c00ce5608883081f311192a264a4f7d9119c75ac582596c53b910534c4b66dbb60de2ffd3d6218169748332609c2e0fc89f519259
 DIST tpm2-tss-2.4.6.tar.gz 1472883 BLAKE2B e007de07c759e77e377f8569c0c5d94ab57597ea3cb452fb598a47c9b404714a7816c86221d4eacad962436fc7625066d4066f433cd957c37b92d51b0455e2a0 SHA512 f7f7f067605ea30661ac891e22095238689856e22e45f11a6b603cb36ed1ae0724ae52d36f0ee5dd72208da8520457667676ae08107647faa5441a0c9b642f7a
 DIST tpm2-tss-3.1.0.tar.gz 1584690 BLAKE2B cee2807a030b8bab653045cb11dfc7a6a3f7b1e60c1ce4650ba5f0549f29f36ff307e7d53fb5ef9c950b4dae720bdaf35f7cd1e59ebc07b3f16740035e1d5738 SHA512 8967f172c92f1e3e5ba324dbe8afe07bf1bc7179dd755cef9812105f32634f312ee7cc7dfe8e13af69dc219432463f5dc9b93477743de47aba6af1d70b252405
-EBUILD tpm2-tss-2.4.5.ebuild 1791 BLAKE2B 407b4c3f446647f0376fad070976c6906580f26aecde8a6075525908186984a4f5e1f79b4ca76de7fdecb7f82a33b3367326fdaa94ce003c0eff01f11a800a2f SHA512 fc261a84aebc8ac8b73a16d744d16b226c0c90dc79fd5cac4ab2d161acfa7daba7e8eccf5ac34a1fff849934b12324ac6ec827be687ba9010bd01bb46c2456b5
+DIST tpm2-tss-3.2.0.tar.gz 1629211 BLAKE2B a89aa4d89a50bdfb5a9652874d30e2138747bd022049f2be2d0b56e296329d0c41254033ec3a062dbd64fde54a62e952f54446c551e5788231827cd53fae045a SHA512 cabb411f074dfa94919ba914849aac77a0ac2f50622e28a1406cf575369148774748e0e2b7a7c566ec83561a96d4b883bac5a3b1763f4cf48668a0c5d68c0a23
 EBUILD tpm2-tss-2.4.6.ebuild 1791 BLAKE2B 407b4c3f446647f0376fad070976c6906580f26aecde8a6075525908186984a4f5e1f79b4ca76de7fdecb7f82a33b3367326fdaa94ce003c0eff01f11a800a2f SHA512 fc261a84aebc8ac8b73a16d744d16b226c0c90dc79fd5cac4ab2d161acfa7daba7e8eccf5ac34a1fff849934b12324ac6ec827be687ba9010bd01bb46c2456b5
-EBUILD tpm2-tss-3.1.0.ebuild 1731 BLAKE2B b1f2f165574a039e1d6dabe74e959ca592ba6224d62bea44e6ea7701e48b93e20a8d3eabd5bf64f418ae2de2301c693ac78c9323d9a337ef71c8847c314e7d58 SHA512 170ef8b9d276b2929b8a3a7472335e0ebae0d42585fc677abafefb07995030e2981db671800cd3979bc229acd17305091bcc107beebbe86bf5a49c0c645d89d1
+EBUILD tpm2-tss-3.1.0.ebuild 1730 BLAKE2B e240c1e2dbe8ec07ea76f3106b4193ed07c59c69b769259529579838500d2b8431119116fa03ee8b712778c59c8aaca680c4a20462a76deef81e7a19387b2f35 SHA512 1856795cde9db35aa62dbe81872c7b01c62f5383927b0f7f5dcad7f19cd4d92885eacebcec3a56e9e1389a57f5548a2dba7f52d11afc4080840ada1e3b924e01
+EBUILD tpm2-tss-3.2.0-r2.ebuild 2493 BLAKE2B 9f027015cc2bd37f220f0628a419985cde67cebbc910a7515c7a5498fc42588fbfc56c389effeed688e02d870e0fe033b06cbeafaaa4968c580ed75045e94b3d SHA512 51e754e89e83e6d9877b3715d7331fa39b4bc71d305f16ba7afb33d17bf4545d8b79789bdf5777ef5e74bac968364320c5cb7b991eb5c1117ac9d9c1a338b3e8
 MISC metadata.xml 827 BLAKE2B d771c64e37ccd09adbf4c40c412b744b1fdecc5497116e1fb5518f26921195a9141710f4e4d8daaabe6fb9076719bf87c088665fcd6d037d4875bfa761f9bcb6 SHA512 9b1fb93de976edafed96599a093aa4f8058d2542b6dd9be0fb2de5849f77394f2e17b6f4397c14b1dc13b679fb91c38c7852cfaed37908d4c0a2f216a56c659c
diff --git a/app-crypt/tpm2-tss/tpm2-tss-2.4.5.ebuild b/app-crypt/tpm2-tss/tpm2-tss-2.4.5.ebuild
deleted file mode 100644
index 2db31aefd06e..000000000000
--- a/app-crypt/tpm2-tss/tpm2-tss-2.4.5.ebuild
+++ /dev/null
@@ -1,78 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools linux-info tmpfiles udev
-
-DESCRIPTION="TCG Trusted Platform Module 2.0 Software Stack"
-HOMEPAGE="https://github.com/tpm2-software/tpm2-tss"
-SRC_URI="https://github.com/tpm2-software/${PN}/releases/download/${PV}/${P}.tar.gz"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ppc64 x86"
-IUSE="doc +fapi gcrypt +openssl static-libs test"
-
-RESTRICT="!test? ( test )"
-
-REQUIRED_USE="^^ ( gcrypt openssl )
-		fapi? ( openssl !gcrypt )"
-
-RDEPEND="acct-group/tss
-	acct-user/tss
-	fapi? (
-		dev-libs/json-c
-		net-misc/curl
-	)
-	gcrypt? ( dev-libs/libgcrypt:0= )
-	openssl? ( dev-libs/openssl:0= )"
-DEPEND="${RDEPEND}
-	test? ( dev-util/cmocka )"
-BDEPEND="virtual/pkgconfig
-	doc? ( app-doc/doxygen )"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-2.4.1-configure.ac-wrap-PKG_CHECK_MODULES-in-braces.patch"
-	"${FILESDIR}/${PN}-2.4.2-Dont-run-systemd-sysusers-in-Makefile.patch"
-)
-
-pkg_setup() {
-	local CONFIG_CHECK=" \
-		~TCG_TPM
-	"
-	linux-info_pkg_setup
-	kernel_is ge 4 12 0 || ewarn "At least kernel 4.12.0 is required"
-}
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		--localstatedir=/var \
-		$(use_enable doc doxygen-doc) \
-		$(use_enable fapi) \
-		$(use_enable static-libs static) \
-		$(use_enable test unit) \
-		--disable-tcti-mssim \
-		--disable-defaultflags \
-		--disable-weakcrypto \
-		--with-crypto="$(usex gcrypt gcrypt ossl)" \
-		--with-runstatedir=/run \
-		--with-udevrulesdir="$(get_udevdir)/rules.d" \
-		--with-udevrulesprefix=60- \
-		--with-sysusersdir="/usr/lib/sysusers.d" \
-		--with-tmpfilesdir="/usr/lib/tmpfiles.d"
-}
-
-src_install() {
-	default
-	find "${D}" -name '*.la' -delete || die
-}
-
-pkg_postinst() {
-	tmpfiles_process tpm2-tss-fapi.conf
-}
diff --git a/app-crypt/tpm2-tss/tpm2-tss-3.1.0.ebuild b/app-crypt/tpm2-tss/tpm2-tss-3.1.0.ebuild
index 705b46ab69b1..ccfb50c8ea47 100644
--- a/app-crypt/tpm2-tss/tpm2-tss-3.1.0.ebuild
+++ b/app-crypt/tpm2-tss/tpm2-tss-3.1.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/tpm2-software/${PN}/releases/download/${PV}/${P}.tar
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 ~ppc64 ~riscv x86"
+KEYWORDS="amd64 arm arm64 ppc64 ~riscv x86"
 IUSE="doc +fapi  +openssl mbedtls static-libs test"
 
 RESTRICT="!test? ( test )"
diff --git a/app-crypt/tpm2-tss/tpm2-tss-3.2.0-r2.ebuild b/app-crypt/tpm2-tss/tpm2-tss-3.2.0-r2.ebuild
new file mode 100644
index 000000000000..63cf9eb2a511
--- /dev/null
+++ b/app-crypt/tpm2-tss/tpm2-tss-3.2.0-r2.ebuild
@@ -0,0 +1,94 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools linux-info multilib-minimal tmpfiles udev
+
+DESCRIPTION="TCG Trusted Platform Module 2.0 Software Stack"
+HOMEPAGE="https://github.com/tpm2-software/tpm2-tss"
+SRC_URI="https://github.com/tpm2-software/${PN}/releases/download/${PV}/${P}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+IUSE="doc +fapi +openssl mbedtls static-libs test"
+
+RESTRICT="!test? ( test )"
+
+REQUIRED_USE="^^ ( mbedtls openssl )
+		fapi? ( openssl !mbedtls )"
+
+RDEPEND="acct-group/tss
+	acct-user/tss
+	fapi? ( dev-libs/json-c:=[${MULTILIB_USEDEP}]
+		>=net-misc/curl-7.80.0[${MULTILIB_USEDEP}] )
+	mbedtls? ( net-libs/mbedtls:=[${MULTILIB_USEDEP}] )
+	openssl? ( dev-libs/openssl:=[${MULTILIB_USEDEP}] )"
+
+DEPEND="${RDEPEND}
+	test? ( app-crypt/swtpm
+		dev-libs/uthash
+		dev-util/cmocka
+		fapi? ( >=net-misc/curl-7.80.0 ) )"
+BDEPEND="sys-apps/acl
+	virtual/pkgconfig
+	doc? ( app-doc/doxygen )"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-3.1.0-Dont-run-systemd-sysusers-in-Makefile.patch"
+)
+
+pkg_setup() {
+	local CONFIG_CHECK=" \
+		~TCG_TPM
+	"
+	linux-info_pkg_setup
+	kernel_is ge 4 12 0 || ewarn "At least kernel 4.12.0 is required"
+}
+
+src_prepare() {
+	default
+
+	# See bug #833887 (and similar); eautoreconf means .pc file gets wrong version.
+	sed -i \
+	"s/m4_esyscmd_s(\[git describe --tags --always --dirty\])/${PV}/" \
+		"configure.ac" || die
+
+	eautoreconf
+}
+
+multilib_src_configure() {
+	ECONF_SOURCE=${S} econf \
+		--localstatedir=/var \
+		$(use_enable doc doxygen-doc) \
+		$(use_enable fapi) \
+		$(use_enable static-libs static) \
+		$(multilib_native_use_enable test unit) \
+		$(multilib_native_use_enable test integration) \
+		$(multilib_native_use_enable test self-generated-certificate) \
+		--disable-tcti-libtpms \
+		--disable-defaultflags \
+		--disable-weakcrypto \
+		--with-crypto="$(usex mbedtls mbed ossl)" \
+		--with-runstatedir=/run \
+		--with-udevrulesdir="$(get_udevdir)/rules.d" \
+		--with-udevrulesprefix=60- \
+		--with-sysusersdir="/usr/lib/sysusers.d" \
+		--with-tmpfilesdir="/usr/lib/tmpfiles.d"
+}
+
+multilib_src_install() {
+	default
+
+	if [[ ${PV} != $(sed -n -e 's/^Version: //p' "${ED}/usr/$(get_libdir)/pkgconfig/tss2-sys.pc" || die) ]] ; then
+		# Safeguard for bug #833887
+		die "pkg-config file version doesn't match ${PV}! Please report a bug!"
+	fi
+
+	find "${D}" -name '*.la' -delete || die
+}
+
+pkg_postinst() {
+	tmpfiles_process tpm2-tss-fapi.conf
+}
diff --git a/app-crypt/veracrypt/Manifest b/app-crypt/veracrypt/Manifest
index 1ce2c8e36ea2..67af8a93b9a8 100644
--- a/app-crypt/veracrypt/Manifest
+++ b/app-crypt/veracrypt/Manifest
@@ -1,4 +1,6 @@
 AUX veracrypt.init 384 BLAKE2B 0325852e3bb9d8427298c46b0e7caefb1f62d957a158c8a6f898c6609c0363449ef5f48c9cd5a1092efbd9d2e1077a6218bdbebacebde936afc40ec3bfd0b3eb SHA512 574b18b7cbc5f4ea71bb35ec3343af5bdcc7848801decf3b93157bc4fde44ca5daec01847e3ff9f3a638b297f33023ea46a0ada5cc64bab0d14cbe12b93b66ed
 DIST veracrypt-1.24_p8.tar.gz 25116825 BLAKE2B fccab3e7de7637f6f3a7f448a9dcc6671198ea6155e8f6741844c5bd844819c639f968e4cc6e13c274c90f2ba8e540a020b98cb12617a109d5911ce8dd9cb991 SHA512 16139d055e2b2dda6c38ecf156cf5d15cd4788253fe0c85e42050eafd8afbd5c5908e590e53a7b5220767ebbb3b9e81d0049a910b322e42f1c29d2c131bd29d0
+DIST veracrypt-1.25.7.tar.gz 26108318 BLAKE2B e3974e6abec3ff462239b6c7a775ebfde4138dde295863c8788de88b593bc4bcd69db66eb81dd08333055b0efed2cccccf24d5f038099f6fc25b8f550cb90347 SHA512 955d5354d7401625196f1bd43d5e40695f4a2ebc7742cdfe0850d3b974a02126446346fe7e3174e16a38de39b507fc436b45b5e43d6fb714f37a4b8b394843dd
 EBUILD veracrypt-1.24_p8.ebuild 2633 BLAKE2B 9cbbde75cc90c56405c49235eecb9e2b997cfa60bd0048c56d849734c49a9c2059d804d7bad217a3b2603e4e49f15dc66c391d1a739884c606ee35ef80f85a9b SHA512 e67824eb329231342c1b0b932736305de87adeb107290e1cdcea7080b347f9e813a0188c69716e2318609597ace85b330469313f77aa4b07c1d45a8ab0b85ad7
+EBUILD veracrypt-1.25.7.ebuild 2578 BLAKE2B 3dcad45a436142ff44dd980ca78b925c1b339caf2328bd1f1199b65b2ef2dd4eb9e6e4b1a1998eb750e0c488a636374be6a3cfa07bac701816c53fdad19eefba SHA512 1759f4df7495ffc3105176f8fbd13eeff6622a9aa4545876b11750a4a06d5224fcfac1e1c49c02febd420798ec797bfdf75981dfcd4dd908f51108cc71c0fb70
 MISC metadata.xml 400 BLAKE2B 9dedf1fc4c897fe4061f844b05a281b3b629beb82fa7806527550362528de0cb0b894c6901b4eceb7b86bfa07a0708dd6557e388a506151eeb17c307ffa66e8e SHA512 2923a0c7330435996e1fee89531ce36897a50ad7592978742dea69b9e07a58b322b92cfc2f83b0a5bfcc58705951fd53e8764dd770787681b298f6ec66c74c0a
diff --git a/app-crypt/veracrypt/veracrypt-1.25.7.ebuild b/app-crypt/veracrypt/veracrypt-1.25.7.ebuild
new file mode 100644
index 000000000000..41d225cd1baf
--- /dev/null
+++ b/app-crypt/veracrypt/veracrypt-1.25.7.ebuild
@@ -0,0 +1,99 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+WX_GTK_VER="3.0-gtk3"
+inherit desktop flag-o-matic linux-info pax-utils toolchain-funcs wxwidgets
+
+DESCRIPTION="Disk encryption with strong security based on TrueCrypt"
+HOMEPAGE="https://www.veracrypt.fr/en/Home.html"
+SRC_URI="https://github.com/${PN}/VeraCrypt/archive/VeraCrypt_${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/VeraCrypt-VeraCrypt_${PV}/src"
+
+# The modules not linked against in Linux include (but not limited to):
+#   libzip, chacha-xmm, chacha256, chachaRng, rdrand, t1ha2
+# Tested by actually removing the source files and performing a build
+# For this reason, we don't have to worry about their licenses
+LICENSE="Apache-2.0 BSD truecrypt-3.0"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="+asm cpu_flags_x86_sse2 cpu_flags_x86_sse4_1 cpu_flags_x86_ssse3 doc X"
+RESTRICT="bindist mirror"
+
+RDEPEND="
+	sys-fs/lvm2
+	sys-fs/fuse:0
+	x11-libs/wxGTK:${WX_GTK_VER}[X?]
+	app-admin/sudo
+	dev-libs/pkcs11-helper"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	virtual/pkgconfig
+	asm? ( dev-lang/yasm )"
+
+CONFIG_CHECK="~BLK_DEV_DM ~CRYPTO ~CRYPTO_XTS ~DM_CRYPT ~FUSE_FS"
+
+src_configure() {
+	setup-wxwidgets
+
+	# https://bugs.gentoo.org/786741
+	# std::byte clashes with src/Common/Tcdefs.h typedef
+	append-cxxflags -std=c++14
+}
+
+src_compile() {
+	local myemakeargs=(
+		NOSTRIP=1
+		NOTEST=1
+		VERBOSE=1
+		CC="$(tc-getCC)"
+		CXX="$(tc-getCXX)"
+		AR="$(tc-getAR)"
+		RANLIB="$(tc-getRANLIB)"
+		TC_EXTRA_CFLAGS="${CFLAGS}"
+		TC_EXTRA_CXXFLAGS="${CXXFLAGS}"
+		TC_EXTRA_LFLAGS="${LDFLAGS}"
+		WX_CONFIG="${WX_CONFIG}"
+		$(usex X "" "NOGUI=1")
+		$(usex asm "" "NOASM=1")
+		$(usex cpu_flags_x86_sse2 "" "NOSSE2=1")
+		$(usex cpu_flags_x86_sse4_1 "SSE41=1" "")
+		$(usex cpu_flags_x86_ssse3 "SSSE3=1" "")
+	)
+
+	emake "${myemakeargs[@]}"
+}
+
+src_test() {
+	./Main/veracrypt --text --test || die "tests failed"
+}
+
+src_install() {
+	local DOCS=( Readme.txt )
+
+	dobin Main/veracrypt
+	if use doc; then
+		DOCS+=( "${S}"/../doc/EFI-DCS )
+		docompress -x /usr/share/doc/${PF}/EFI-DCS
+		HTML_DOCS=( "${S}"/../doc/html/. )
+	fi
+	einstalldocs
+
+	newinitd "${FILESDIR}"/veracrypt.init veracrypt
+
+	if use X; then
+		local s
+		for s in 16 48 128 256; do
+			newicon -s ${s} Resources/Icons/VeraCrypt-${s}x${s}.xpm veracrypt.xpm
+		done
+		make_desktop_entry veracrypt "VeraCrypt" veracrypt "Utility;Security"
+	fi
+
+	pax-mark -m "${ED}"/usr/bin/veracrypt
+}
+
+pkg_postinst() {
+	ewarn "VeraCrypt has a very restrictive license. Please be explicitly aware"
+	ewarn "of the limitations on redistribution of binaries or modified source."
+}
diff --git a/app-crypt/yubikey-manager/Manifest b/app-crypt/yubikey-manager/Manifest
index 3e2eba5e6045..3438daaa4eaf 100644
--- a/app-crypt/yubikey-manager/Manifest
+++ b/app-crypt/yubikey-manager/Manifest
@@ -1,5 +1,7 @@
 DIST yubikey-manager-4.0.5.tar.gz 142197 BLAKE2B c48a9c6ae5f2d54b24888b750c6263eb501e68be56beb9fb964e8b9ea5131a608786b2e67d0d092ebcfacb15b09cae3eec19f4271893ac77eba70eee28b6d06d SHA512 f8bddf3121c0c509fcacb56500f1c1885354aff5c00b3347d9ca84cdf1df65276ed744209d9653474909b6cba7595bc5529cd4b37ec34c35d2d2c3cf2ff850de
 DIST yubikey-manager-4.0.7.tar.gz 143622 BLAKE2B 1ea768b4b95a65dc2cbc34f1e796a1012b534495154f475c7deb9ec7dbc807ff688d864abba8001752d3717034acbf39cd1cb17f147842fc38d27a83cb8c8ddc SHA512 7ba11488cddcc7d4bb15e673b7d8d82d8e85c52d8a4a3a13c6681cc494ecf33b88eb54556785783e6ec458292f155668bac0bb3a38a2df1702a24f623f8b084e
+DIST yubikey-manager-4.0.8.tar.gz 147076 BLAKE2B efdefb15c3939bfb2171766aec195fb776668894d4439565840587d14387999e052aee6eb225b9332662f1ebdbf1db24fceb606393e23d591ff61b91c1ee96f5 SHA512 87352bbb133eead48d1588df2db5420687278a9f76ceb283a53af8eab3d29e30c86e01a588a6da2884e6dac6af192ad355a28745f2f8505ef6cd0e96dea3e9c7
 EBUILD yubikey-manager-4.0.5-r1.ebuild 992 BLAKE2B 97f3f6c6c731a99c73c0a8c138cf3245a35003d4fab8bfa03908d91183ba8c60f62125e153cd71706c8746f089d77b29d99a1b685cb2db199ac66570d182ca80 SHA512 719cab973ed71b98c2ba156ee072d7c2a524fc259c3d80420925512cb19aebeec1df4306113f8dd8675ad46f4bd40c289a155822c88c38721417f8d954c4da51
 EBUILD yubikey-manager-4.0.7.ebuild 1006 BLAKE2B 364336b23b74f0db1e9423917a68a8b3941c6a2aa8d47aa1eee43b218243b3ffa6fb022e2db31d0f9f6b02072344e083b555b07b2611f0c75392cb1b0f010b74 SHA512 8fcb0743e3c150b37e3c8c7c27be0b228ba8c3392521041c173b486d2894effbd87aae1bf45d988082b9b76d8a252d21a4ac7dec6d44f02f08423a012fe1e2b6
+EBUILD yubikey-manager-4.0.8.ebuild 1097 BLAKE2B adb63279d970b4599e48c1996285bfbe1f25f13e12c9c036c1018b1a48cac0148b8e8ef9f68e509d1af2e3493de556a2e08416ea782cfd6da414d730b8d14778 SHA512 7795882f4f55ad3132e6547add71e72df51f5a949ba1125b06362014d36725c94a0c46cb4104d142c8f022a1c26b205cfe23cfd019817583c9524c6cb18140a2
 MISC metadata.xml 534 BLAKE2B 1dc91b31fae812c9abf38e762d18db228cf07cb29dc41f5c7928ef417002826acaaabaa3b1374433f9fdfc251b5f5fbabbc43e66e3b94cc6df3174d3ae5aa059 SHA512 cf47e3400679f7f4feb73ef3b8282d3f4dae6b6d0e5034cbc22935fd0196be0784946bf9ac93dea7fb36a16347f867d092845c1ce3528a00c704de9657ad3821
diff --git a/app-crypt/yubikey-manager/yubikey-manager-4.0.8.ebuild b/app-crypt/yubikey-manager/yubikey-manager-4.0.8.ebuild
new file mode 100644
index 000000000000..a1c35da4ab92
--- /dev/null
+++ b/app-crypt/yubikey-manager/yubikey-manager-4.0.8.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+DISTUTILS_USE_PEP517=poetry
+
+inherit distutils-r1
+
+DESCRIPTION="Python library and command line tool for configuring a YubiKey"
+HOMEPAGE="https://developers.yubico.com/yubikey-manager/"
+# Per https://github.com/Yubico/yubikey-manager/issues/217, Yubico is
+# the official source for tarballs, not Github
+SRC_URI="https://developers.yubico.com/${PN}/Releases/${P}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+IUSE="ssl"
+
+# app-crypt/ccid required for
+# - 'ykman oath'
+# - 'ykman openpgp'
+# - 'ykman piv'
+RDEPEND="
+	app-crypt/ccid
+	dev-python/click[${PYTHON_USEDEP}]
+	<dev-python/cryptography-39[${PYTHON_USEDEP}]
+	dev-python/fido2:0/0.9[${PYTHON_USEDEP}]
+	dev-python/pyscard[${PYTHON_USEDEP}]
+	ssl? ( >=dev-python/pyopenssl-0.15.1[${PYTHON_USEDEP}] )"
+BDEPEND="test? (
+	dev-python/makefun[${PYTHON_USEDEP}]
+)"
+
+distutils_enable_tests pytest
+
+python_install_all() {
+	distutils-r1_python_install_all
+	doman man/ykman.1
+}
author	V3n3RiX <venerix@koprulu.sector>	2022-03-20 00:40:44 +0000
committer	V3n3RiX <venerix@koprulu.sector>	2022-03-20 00:40:44 +0000
commit	4cbcc855382a06088e2f016f62cafdbcb7e40665 (patch)
tree	356496503d52354aa6d9f2d36126302fed5f3a73 /app-crypt
parent	fcc5224904648a8e6eb528d7603154160a20022f (diff)