gentoo resync : 09.07.2022

42 files changed, 782 insertions, 57 deletions

diff --git a/app-crypt/Manifest.gz b/app-crypt/Manifest.gz
index e18f94c4d8d2..0ccb9a2bd639 100644
--- a/app-crypt/Manifest.gz
+++ b/app-crypt/Manifest.gz
diff --git a/app-crypt/acme/Manifest b/app-crypt/acme/Manifest
index a49735353243..3b9f2001f762 100644
--- a/app-crypt/acme/Manifest
+++ b/app-crypt/acme/Manifest
@@ -1,8 +1,8 @@
-DIST certbot-1.26.0.tar.gz 1364070 BLAKE2B f9b13df8fb424e579293280202b71756c37a3ec7f986da38a5fd318d00ab7e2ed89223c62a20448ad30271783bb3c44db11a0ce4afebced9f1e9ca4e4c6de3f2 SHA512 bd27cb0a0ef6fc143a3d0dcf5d530d336b93a24d7010e6427c25614befb815f33076b4a3043bb247cafdfad17b8714a19ead43257c64f4fd72ac99f02cb07cde
 DIST certbot-1.27.0.tar.gz 1366469 BLAKE2B e9ec47520e027a9d348e861ea7d070eff4857301be0d42be6965e4159d85ef60866aa70de76edd5e68b0d40d9544075aa28e9aa07a8e04dfbf3e1a7dd77fd1de SHA512 5db7836ae2eda27c088476c149e736ce7f41b85d871cf563c69e021dd8af2d64ed85c1482049edf0dffe6fd0c9591d66be3e22fbf617068600e12691c4802e5e
 DIST certbot-1.28.0.tar.gz 1367671 BLAKE2B 01fda6c068217e32273b2c1ac97faa099f98da687d41796e1c98971ed6779ab4ff78e3309b7a6f82b9b0a891c5f00b5201bb3ce1bc879e5acbab3ccc4988ec31 SHA512 888f51dfcf4712b70ce7c99abfc52106384dcba2eef486db8b033bfcca3043bd0beaadce1c1e59f19c3a58b7fe454b2b64774de2e23f5d93579b3e1be1a7c08b
-EBUILD acme-1.26.0.ebuild 1140 BLAKE2B 93b2947d02cb8de8680b605bccc0b8aa1197e9962d423943826b617f7f9702cbc8312143468c26101c0950d668ec17d697d4e51805119f2ae83e129ccb17fdb1 SHA512 a570b29c4fb3d6081df33667ffe40f35e93439952e72e7d7c63b435f470aa011fe184303bde315d8a6773ccc004dd737b679eaeb3fdff97f6fd5cb8901cea8db
+DIST certbot-1.29.0.tar.gz 1367853 BLAKE2B c0d8d2c05a061b2d50564a97bf17ae883bd443321bf99cea13fbae196c7ec876231d803d5389e524997dd8632035d5ad60b1a99b025a22a65d0865d564cfafc5 SHA512 755781e12e0e4cdb41aa16d90ab6a334ef41a98630e08127a867c8e8813ee45ebd3f6f54168fe747900f6ab59539e414ffed7891c05746b3a7af2e2a96a8d522
 EBUILD acme-1.27.0.ebuild 1140 BLAKE2B 93b2947d02cb8de8680b605bccc0b8aa1197e9962d423943826b617f7f9702cbc8312143468c26101c0950d668ec17d697d4e51805119f2ae83e129ccb17fdb1 SHA512 a570b29c4fb3d6081df33667ffe40f35e93439952e72e7d7c63b435f470aa011fe184303bde315d8a6773ccc004dd737b679eaeb3fdff97f6fd5cb8901cea8db
-EBUILD acme-1.28.0.ebuild 1142 BLAKE2B 53a5d26bdec0161638b21e37b8f274de986e029568ec4ac83fa92fe4ba5596f7b30b6cc07527f2c251a3009ab851ea57ff7c1c298d59defa65fde67647815c0f SHA512 dcb6317e211f649b2b4923d3912761454e72094bab3ca505194eef240deabadade81f7bf49c42e42d3b1e77398130c7dd85092ea593523b66c3ade7d82273d5b
-EBUILD acme-9999.ebuild 1142 BLAKE2B 53a5d26bdec0161638b21e37b8f274de986e029568ec4ac83fa92fe4ba5596f7b30b6cc07527f2c251a3009ab851ea57ff7c1c298d59defa65fde67647815c0f SHA512 dcb6317e211f649b2b4923d3912761454e72094bab3ca505194eef240deabadade81f7bf49c42e42d3b1e77398130c7dd85092ea593523b66c3ade7d82273d5b
+EBUILD acme-1.28.0.ebuild 1140 BLAKE2B 93b2947d02cb8de8680b605bccc0b8aa1197e9962d423943826b617f7f9702cbc8312143468c26101c0950d668ec17d697d4e51805119f2ae83e129ccb17fdb1 SHA512 a570b29c4fb3d6081df33667ffe40f35e93439952e72e7d7c63b435f470aa011fe184303bde315d8a6773ccc004dd737b679eaeb3fdff97f6fd5cb8901cea8db
+EBUILD acme-1.29.0.ebuild 1142 BLAKE2B 3149eedb71a5e80bf3ec01b5e7bb678aba01f63f01e7179c1cb913e14baa1fbdddff209e92db0bad53c31f3aea9fd9d22e74e986d000b851d7531a66d5c73a61 SHA512 83c207826a400e854d8523412a07e40b7c1e5d4b33c7ab17227a0f8515d9241b443b58c76e991f5f9735ff206a08dac662715055f7ec2d45bd5166f9ca26c44d
+EBUILD acme-9999.ebuild 1142 BLAKE2B 3149eedb71a5e80bf3ec01b5e7bb678aba01f63f01e7179c1cb913e14baa1fbdddff209e92db0bad53c31f3aea9fd9d22e74e986d000b851d7531a66d5c73a61 SHA512 83c207826a400e854d8523412a07e40b7c1e5d4b33c7ab17227a0f8515d9241b443b58c76e991f5f9735ff206a08dac662715055f7ec2d45bd5166f9ca26c44d
 MISC metadata.xml 401 BLAKE2B 30a2ac1f03749a8e3bb98723c57f47ab6bcf7bfa58c2b6e21c309fae279feca0d3612df6c2a1dafaf27b4f0781c583a140322feac1a1cf2c13e50861cad129ea SHA512 d8e725b71ca81ce4ca6565ed58271b283c25394448f0f48f726f232122577c33d5b2d726e117419b2fae99f9dae29a8080bb9564eccbca13368c83988cf3da01
diff --git a/app-crypt/acme/acme-1.28.0.ebuild b/app-crypt/acme/acme-1.28.0.ebuild
index be518d606627..da63ed453043 100644
--- a/app-crypt/acme/acme-1.28.0.ebuild
+++ b/app-crypt/acme/acme-1.28.0.ebuild
@@ -14,7 +14,7 @@ if [[ ${PV} == 9999* ]]; then
 	S=${WORKDIR}/${P}/${PN}
 else
 	SRC_URI="https://github.com/certbot/certbot/archive/v${PV}.tar.gz -> certbot-${PV}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~riscv x86"
 	S=${WORKDIR}/certbot-${PV}/acme
 fi
 
diff --git a/app-crypt/acme/acme-1.26.0.ebuild b/app-crypt/acme/acme-1.29.0.ebuild
index da63ed453043..a905a81b75cc 100644
--- a/app-crypt/acme/acme-1.26.0.ebuild
+++ b/app-crypt/acme/acme-1.29.0.ebuild
@@ -14,7 +14,7 @@ if [[ ${PV} == 9999* ]]; then
 	S=${WORKDIR}/${P}/${PN}
 else
 	SRC_URI="https://github.com/certbot/certbot/archive/v${PV}.tar.gz -> certbot-${PV}.tar.gz"
-	KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~riscv x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
 	S=${WORKDIR}/certbot-${PV}/acme
 fi
 
@@ -28,7 +28,7 @@ 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/pyopenssl-17.5.0[${PYTHON_USEDEP}]
 	dev-python/pyrfc3339[${PYTHON_USEDEP}]
 	>=dev-python/pytz-2019.3[${PYTHON_USEDEP}]
 	>=dev-python/requests-2.20.0[${PYTHON_USEDEP}]
diff --git a/app-crypt/acme/acme-9999.ebuild b/app-crypt/acme/acme-9999.ebuild
index be518d606627..a905a81b75cc 100644
--- a/app-crypt/acme/acme-9999.ebuild
+++ b/app-crypt/acme/acme-9999.ebuild
@@ -28,7 +28,7 @@ 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/pyopenssl-17.5.0[${PYTHON_USEDEP}]
 	dev-python/pyrfc3339[${PYTHON_USEDEP}]
 	>=dev-python/pytz-2019.3[${PYTHON_USEDEP}]
 	>=dev-python/requests-2.20.0[${PYTHON_USEDEP}]
diff --git a/app-crypt/acr38u/Manifest b/app-crypt/acr38u/Manifest
index c0cb4881d3af..706f2d84eed1 100644
--- a/app-crypt/acr38u/Manifest
+++ b/app-crypt/acr38u/Manifest
@@ -1,5 +1,5 @@
 AUX 1.7.11-bis.rules 590 BLAKE2B 8604b9d067bac53501127f7d6ed8b6ef226e6faee64cd89cb0f53f66a89dcbb62e3de71743845c48e5326254f69ab1b07a207375614224066980df672b1bf5f6 SHA512 9e2d806a13a978f1a27a9b3bb6bf4f63809bc3cd03057b513f48bee0d2f2589f75484ff4e0e18dcf8b1b37b9af2465014fc3bcf87b48dd330a375fee3baef52f
 AUX acr38u-1.7.11-build.patch 5819 BLAKE2B 46747a588006909d04c14e643f098ba8de3fd69943d311cf82bbc8135d4bcafab30526366f021d5bfcd150a20debabc4e6e35355f19938591fdc423a68b65730 SHA512 a9395d41e55c381de65ebc9b9e796d1ae01c75a0261fdc80d5d819dc4cf85030eb3fe1e6123d9beb247abca3b60fa94210eb12b325b37cf8b367ee3a00919cae
 DIST ACR38_LINUX_100711_P.tar.bz2 274137 BLAKE2B 0087cc63ee3af898824fd7cfe31f8b1f922ca4dded22215196b2bdaf1296cd50319d4923735fd2ecdb3cc329dee0df7f288a70e875417b02eb0803d19b1613af SHA512 c5d0e71ae383de515718d24110b825efa84cf1a150ec7249f80070446331fb4df4d157f5f4e96d45588346e51ab8e2012530edae92575b66891c7ee596d8d3f7
-EBUILD acr38u-1.7.11-r3.ebuild 1359 BLAKE2B cf9aba09624788656de556e54fb893d1a2642ba77ad74f73f605a83f510cbb2a06bd312310cb59768939d3f1677da17f8b8b45cb8646f0990f242b030b16f6eb SHA512 f269e951002756ab3bd10c21f70388e55f89a9934676cd486a0d83dbc4ce1eda13a7f4fa3b3f995b37a846ab369f0a1a9a955340ef486f5e02fcf0b806081981
+EBUILD acr38u-1.7.11-r4.ebuild 1411 BLAKE2B 8b1c7b00fdf8818494dac5882e640352b885f163379a21dc5b5d86e24dd89d3dccbe0b6ba9f9c8ade821808e63933dbc8bcf44a0df6397b5c7defb2c676c7be6 SHA512 c66782ec7a2dd5983ee3143c5e4598e7bbc343186a380861cc7cf315e81824b222a2682ee102218cc1bd5cc6809a1c91dd358f60c35e1d9ec06e7611bc52a73b
 MISC metadata.xml 384 BLAKE2B ed3f61fac35344e337b92528527d1a72fb6b42ce7504df0a3e7525864fd9a7979dc3008dfdb5f3ac46b725c130b4b05b74d47cabd85ec02fa5945b21c3d974f1 SHA512 9b69e0c9084463997343e06e5bcb50d7c4c0c9dced4c13aba208d4422417a05e0165259850346547e6ac3f5f82c0e098afc3036bcf53a645de877b1ee1c37978
diff --git a/app-crypt/acr38u/acr38u-1.7.11-r3.ebuild b/app-crypt/acr38u/acr38u-1.7.11-r4.ebuild
index db32da26fb14..2af122979701 100644
--- a/app-crypt/acr38u/acr38u-1.7.11-r3.ebuild
+++ b/app-crypt/acr38u/acr38u-1.7.11-r4.ebuild
@@ -1,7 +1,7 @@
-# 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 autotools toolchain-funcs udev
 
@@ -15,7 +15,7 @@ DESCRIPTION="Non CCID driver for ACR38 AC1038-based Smart Card Reader"
 #SRC_URI="http://www.acs.com.hk/drivers/eng/${MY_P}.tar.bz2"
 # tarball release is encapsuled in a .zip file :-(
 # http://www.acs.com.hk/drivers/eng/ACR38_Driver_Lnx_101_P.zip
-# I'm waiting an answer from info@acs.com.hk about that !
+# This drivers is not maintained by ACS anymore.
 SRC_URI="https://www.linuxunderground.be/${MY_P}.tar.bz2"
 HOMEPAGE="https://www.acs.com.hk"
 
@@ -46,3 +46,11 @@ src_install() {
 	# note: for eudev support this pkg may always need to install rules to /usr
 	udev_newrules "${FILESDIR}/${PV}-bis.rules" 92-pcscd-acr38u.rules
 }
+
+pkg_postinst() {
+	udev_reload
+}
+
+pkg_postrm() {
+	udev_reload
+}
diff --git a/app-crypt/certbot-apache/Manifest b/app-crypt/certbot-apache/Manifest
index 58c8afba70ac..a0af01b5b03a 100644
--- a/app-crypt/certbot-apache/Manifest
+++ b/app-crypt/certbot-apache/Manifest
@@ -1,8 +1,8 @@
-DIST certbot-1.26.0.tar.gz 1364070 BLAKE2B f9b13df8fb424e579293280202b71756c37a3ec7f986da38a5fd318d00ab7e2ed89223c62a20448ad30271783bb3c44db11a0ce4afebced9f1e9ca4e4c6de3f2 SHA512 bd27cb0a0ef6fc143a3d0dcf5d530d336b93a24d7010e6427c25614befb815f33076b4a3043bb247cafdfad17b8714a19ead43257c64f4fd72ac99f02cb07cde
 DIST certbot-1.27.0.tar.gz 1366469 BLAKE2B e9ec47520e027a9d348e861ea7d070eff4857301be0d42be6965e4159d85ef60866aa70de76edd5e68b0d40d9544075aa28e9aa07a8e04dfbf3e1a7dd77fd1de SHA512 5db7836ae2eda27c088476c149e736ce7f41b85d871cf563c69e021dd8af2d64ed85c1482049edf0dffe6fd0c9591d66be3e22fbf617068600e12691c4802e5e
 DIST certbot-1.28.0.tar.gz 1367671 BLAKE2B 01fda6c068217e32273b2c1ac97faa099f98da687d41796e1c98971ed6779ab4ff78e3309b7a6f82b9b0a891c5f00b5201bb3ce1bc879e5acbab3ccc4988ec31 SHA512 888f51dfcf4712b70ce7c99abfc52106384dcba2eef486db8b033bfcca3043bd0beaadce1c1e59f19c3a58b7fe454b2b64774de2e23f5d93579b3e1be1a7c08b
-EBUILD certbot-apache-1.26.0.ebuild 945 BLAKE2B 11822156671a8a090c234685393f7a1e832f03eb168d7c65775163fbbfde98cf47e106466e68f11b0036536bd380764bc153ce7f73e9b2b1115893324ad8a621 SHA512 aa6605c150f841510e7b1eee3ef4a8a2edd4f9cccb28dd66d3c3ad9aac029c0b3c6c0aff189ca9e2621fba93ad0cb11a80a6f7ea75892d4c32876cd381752c6f
+DIST certbot-1.29.0.tar.gz 1367853 BLAKE2B c0d8d2c05a061b2d50564a97bf17ae883bd443321bf99cea13fbae196c7ec876231d803d5389e524997dd8632035d5ad60b1a99b025a22a65d0865d564cfafc5 SHA512 755781e12e0e4cdb41aa16d90ab6a334ef41a98630e08127a867c8e8813ee45ebd3f6f54168fe747900f6ab59539e414ffed7891c05746b3a7af2e2a96a8d522
 EBUILD certbot-apache-1.27.0.ebuild 945 BLAKE2B 11822156671a8a090c234685393f7a1e832f03eb168d7c65775163fbbfde98cf47e106466e68f11b0036536bd380764bc153ce7f73e9b2b1115893324ad8a621 SHA512 aa6605c150f841510e7b1eee3ef4a8a2edd4f9cccb28dd66d3c3ad9aac029c0b3c6c0aff189ca9e2621fba93ad0cb11a80a6f7ea75892d4c32876cd381752c6f
-EBUILD certbot-apache-1.28.0.ebuild 947 BLAKE2B 57472217512ae222c82d13b4f4d9ad0298c4ecf3f177714e0fa82486e94b6f49a2db45ec125c1af349e63cd24c432f3e24d67f61e2725da031988d38aa8dfa09 SHA512 2712fed72fa6a444ec6fd048cb47760580c432eb73ae2bd6167523a7e512489b241d7f7eef567980b2d188c9755abc35b3cd304044b6e5304aa002901c5cf9b3
-EBUILD certbot-apache-9999.ebuild 947 BLAKE2B 5da53f56cef939f37cefd63251b522b54c18e30db386a229413bcc3a02605984194d1ea4c5647fa895a9502d254fcb9b73f5575fb7096f31df51f1e0b17659a5 SHA512 79358b1fe949ee2302a2db4c72b55bce960b0ba9aafff3cc50ee86e886c80a1337f086166646cb7f9e1baa8ead34dd43188feb53516321acd297e55a7475535b
+EBUILD certbot-apache-1.28.0.ebuild 945 BLAKE2B 11822156671a8a090c234685393f7a1e832f03eb168d7c65775163fbbfde98cf47e106466e68f11b0036536bd380764bc153ce7f73e9b2b1115893324ad8a621 SHA512 aa6605c150f841510e7b1eee3ef4a8a2edd4f9cccb28dd66d3c3ad9aac029c0b3c6c0aff189ca9e2621fba93ad0cb11a80a6f7ea75892d4c32876cd381752c6f
+EBUILD certbot-apache-1.29.0.ebuild 947 BLAKE2B a48f898df86410229175cb4cc86735136be08f8e163ccd184a7a598d0bbc88c556f243bce3f6ba354cbb0ddcdccaee6903142b8bdb382b61c7326bffa0a99cf0 SHA512 1d2ee7ad9c9a1dcc7955fdf0a2295812abcc934c8853a7406d4bc219ea851bcdeb189330e3b9b5aef486c5494d98e66a512f2c4cb631109f5136cb283a83355c
+EBUILD certbot-apache-9999.ebuild 947 BLAKE2B a48f898df86410229175cb4cc86735136be08f8e163ccd184a7a598d0bbc88c556f243bce3f6ba354cbb0ddcdccaee6903142b8bdb382b61c7326bffa0a99cf0 SHA512 1d2ee7ad9c9a1dcc7955fdf0a2295812abcc934c8853a7406d4bc219ea851bcdeb189330e3b9b5aef486c5494d98e66a512f2c4cb631109f5136cb283a83355c
 MISC metadata.xml 359 BLAKE2B 7f8ac46ecea304579baca80978cc35905720d1950caa183b5b5b297afab8bf6ea328324bacc438e9ecd91176230e42e55deda1c15e1ba73c63b2021ac2842c0f SHA512 a50b1db5a30eac290ac6645fcb30b0d5c4d8e51d83cff284e76358ee4fe7cef9366e40b06f532ba64a2131672972ea10b73541a9bd42cc323c17f6d26f6b0197
diff --git a/app-crypt/certbot-apache/certbot-apache-1.28.0.ebuild b/app-crypt/certbot-apache/certbot-apache-1.28.0.ebuild
index cf0c9621b1ae..85b55229a0d2 100644
--- a/app-crypt/certbot-apache/certbot-apache-1.28.0.ebuild
+++ b/app-crypt/certbot-apache/certbot-apache-1.28.0.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} == 9999* ]]; then
 	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"
+	KEYWORDS="amd64 ~arm64 x86"
 	S=${WORKDIR}/${PN%-apache}-${PV}/${PN}
 fi
 
diff --git a/app-crypt/certbot-apache/certbot-apache-1.26.0.ebuild b/app-crypt/certbot-apache/certbot-apache-1.29.0.ebuild
index 85b55229a0d2..4a5e9753518c 100644
--- a/app-crypt/certbot-apache/certbot-apache-1.26.0.ebuild
+++ b/app-crypt/certbot-apache/certbot-apache-1.29.0.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 PYTHON_COMPAT=( python3_{8..10} )
 DISTUTILS_USE_SETUPTOOLS=rdepend
@@ -12,7 +12,7 @@ if [[ ${PV} == 9999* ]]; then
 	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"
+	KEYWORDS="~amd64 ~arm64 ~x86"
 	S=${WORKDIR}/${PN%-apache}-${PV}/${PN}
 fi
 
diff --git a/app-crypt/certbot-apache/certbot-apache-9999.ebuild b/app-crypt/certbot-apache/certbot-apache-9999.ebuild
index b46b10fa3536..4a5e9753518c 100644
--- a/app-crypt/certbot-apache/certbot-apache-9999.ebuild
+++ b/app-crypt/certbot-apache/certbot-apache-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
 
 PYTHON_COMPAT=( python3_{8..10} )
 DISTUTILS_USE_SETUPTOOLS=rdepend
diff --git a/app-crypt/certbot-nginx/Manifest b/app-crypt/certbot-nginx/Manifest
index d1940b44ca86..4c9dfc88ae9e 100644
--- a/app-crypt/certbot-nginx/Manifest
+++ b/app-crypt/certbot-nginx/Manifest
@@ -1,8 +1,8 @@
-DIST certbot-1.26.0.tar.gz 1364070 BLAKE2B f9b13df8fb424e579293280202b71756c37a3ec7f986da38a5fd318d00ab7e2ed89223c62a20448ad30271783bb3c44db11a0ce4afebced9f1e9ca4e4c6de3f2 SHA512 bd27cb0a0ef6fc143a3d0dcf5d530d336b93a24d7010e6427c25614befb815f33076b4a3043bb247cafdfad17b8714a19ead43257c64f4fd72ac99f02cb07cde
 DIST certbot-1.27.0.tar.gz 1366469 BLAKE2B e9ec47520e027a9d348e861ea7d070eff4857301be0d42be6965e4159d85ef60866aa70de76edd5e68b0d40d9544075aa28e9aa07a8e04dfbf3e1a7dd77fd1de SHA512 5db7836ae2eda27c088476c149e736ce7f41b85d871cf563c69e021dd8af2d64ed85c1482049edf0dffe6fd0c9591d66be3e22fbf617068600e12691c4802e5e
 DIST certbot-1.28.0.tar.gz 1367671 BLAKE2B 01fda6c068217e32273b2c1ac97faa099f98da687d41796e1c98971ed6779ab4ff78e3309b7a6f82b9b0a891c5f00b5201bb3ce1bc879e5acbab3ccc4988ec31 SHA512 888f51dfcf4712b70ce7c99abfc52106384dcba2eef486db8b033bfcca3043bd0beaadce1c1e59f19c3a58b7fe454b2b64774de2e23f5d93579b3e1be1a7c08b
-EBUILD certbot-nginx-1.26.0.ebuild 963 BLAKE2B ef69ff6b60789e3339091a31c52b8b3ca8ede1cb84c877e741eb975e860d295d03b85345a3ace63baf2f24fb3f6fd8dc14e81e769ed09fb92efe17e37d155299 SHA512 05c3214eb5ae0fb4ae2df86da5196d1c45627431d7e7462d650a71f7e7645a4cb991cd31c4be03a72919d222fa8b228a549374c6442c4f0055c8dab87a41047e
+DIST certbot-1.29.0.tar.gz 1367853 BLAKE2B c0d8d2c05a061b2d50564a97bf17ae883bd443321bf99cea13fbae196c7ec876231d803d5389e524997dd8632035d5ad60b1a99b025a22a65d0865d564cfafc5 SHA512 755781e12e0e4cdb41aa16d90ab6a334ef41a98630e08127a867c8e8813ee45ebd3f6f54168fe747900f6ab59539e414ffed7891c05746b3a7af2e2a96a8d522
 EBUILD certbot-nginx-1.27.0.ebuild 963 BLAKE2B ef69ff6b60789e3339091a31c52b8b3ca8ede1cb84c877e741eb975e860d295d03b85345a3ace63baf2f24fb3f6fd8dc14e81e769ed09fb92efe17e37d155299 SHA512 05c3214eb5ae0fb4ae2df86da5196d1c45627431d7e7462d650a71f7e7645a4cb991cd31c4be03a72919d222fa8b228a549374c6442c4f0055c8dab87a41047e
-EBUILD certbot-nginx-1.28.0.ebuild 965 BLAKE2B 7b098dd3c540c9fe96750722a696386de685db8e4bc62689e08cc298b3d53fd8561411f7e8366b93999a49aaf2f7dcca7c5b483a49ba873ef7c746f49a36001c SHA512 4acb894e4d79fd1b989cc03cc738a6bc81605eb6d889c31f73a2398aead9b46a5cfbea8c0adc07f079adc21dbcb10655135024bbe2d091fdb748d71b0ff98539
-EBUILD certbot-nginx-9999.ebuild 965 BLAKE2B 7b098dd3c540c9fe96750722a696386de685db8e4bc62689e08cc298b3d53fd8561411f7e8366b93999a49aaf2f7dcca7c5b483a49ba873ef7c746f49a36001c SHA512 4acb894e4d79fd1b989cc03cc738a6bc81605eb6d889c31f73a2398aead9b46a5cfbea8c0adc07f079adc21dbcb10655135024bbe2d091fdb748d71b0ff98539
+EBUILD certbot-nginx-1.28.0.ebuild 963 BLAKE2B ef69ff6b60789e3339091a31c52b8b3ca8ede1cb84c877e741eb975e860d295d03b85345a3ace63baf2f24fb3f6fd8dc14e81e769ed09fb92efe17e37d155299 SHA512 05c3214eb5ae0fb4ae2df86da5196d1c45627431d7e7462d650a71f7e7645a4cb991cd31c4be03a72919d222fa8b228a549374c6442c4f0055c8dab87a41047e
+EBUILD certbot-nginx-1.29.0.ebuild 965 BLAKE2B 572c3235f9726d67f618f282b7f78dd20ce21068fd710492ab568d706cb8db81a4d9d921fe496fd23d08589c3bc19f8b46556b4674f264d0ba297d1fe05bb5c7 SHA512 e52b1a0cfddd8d17fcfcd34505652e68e174af8990d8b84b677c3b699712a7d90059655efaa056e15cebecf874fb87fcb395adb9cf46d977bb6bc90ae98875ab
+EBUILD certbot-nginx-9999.ebuild 965 BLAKE2B 572c3235f9726d67f618f282b7f78dd20ce21068fd710492ab568d706cb8db81a4d9d921fe496fd23d08589c3bc19f8b46556b4674f264d0ba297d1fe05bb5c7 SHA512 e52b1a0cfddd8d17fcfcd34505652e68e174af8990d8b84b677c3b699712a7d90059655efaa056e15cebecf874fb87fcb395adb9cf46d977bb6bc90ae98875ab
 MISC metadata.xml 335 BLAKE2B 048854ec6bc919f9bf9b0bc74e7c291841cbfea0e571f43437937c5dd78cc65f9df53463adcf313441e01323491709b462bd9bc364876eb1508a83b3426b6b78 SHA512 25ac45574a568e362c419dfbeade4a977afa2885e7b32fb4c3d4c765450b09aa98cf419df1a39ab194518ad6f2b582e162d4dd4eec14f278635d63bf66352523
diff --git a/app-crypt/certbot-nginx/certbot-nginx-1.28.0.ebuild b/app-crypt/certbot-nginx/certbot-nginx-1.28.0.ebuild
index e66a6b39887e..3566b27d06f7 100644
--- a/app-crypt/certbot-nginx/certbot-nginx-1.28.0.ebuild
+++ b/app-crypt/certbot-nginx/certbot-nginx-1.28.0.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} == 9999* ]]; then
 	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"
+	KEYWORDS="amd64 ~arm ~arm64 x86"
 	S=${WORKDIR}/${PN%-nginx}-${PV}/${PN}
 fi
 
diff --git a/app-crypt/certbot-nginx/certbot-nginx-1.26.0.ebuild b/app-crypt/certbot-nginx/certbot-nginx-1.29.0.ebuild
index 3566b27d06f7..7eeac389284d 100644
--- a/app-crypt/certbot-nginx/certbot-nginx-1.26.0.ebuild
+++ b/app-crypt/certbot-nginx/certbot-nginx-1.29.0.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 PYTHON_COMPAT=( python3_{8..10} )
 DISTUTILS_USE_SETUPTOOLS=rdepend
@@ -12,7 +12,7 @@ if [[ ${PV} == 9999* ]]; then
 	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"
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 	S=${WORKDIR}/${PN%-nginx}-${PV}/${PN}
 fi
 
@@ -28,7 +28,7 @@ IUSE=""
 RDEPEND="
 	>=app-crypt/acme-${PV}[${PYTHON_USEDEP}]
 	>=app-crypt/certbot-${PV}[${PYTHON_USEDEP}]
-	>=dev-python/pyopenssl-17.3.0[${PYTHON_USEDEP}]
+	>=dev-python/pyopenssl-17.5.0[${PYTHON_USEDEP}]
 	>=dev-python/pyparsing-2.2.1[${PYTHON_USEDEP}]
 	dev-python/zope-interface[${PYTHON_USEDEP}]"
 
diff --git a/app-crypt/certbot-nginx/certbot-nginx-9999.ebuild b/app-crypt/certbot-nginx/certbot-nginx-9999.ebuild
index e66a6b39887e..7eeac389284d 100644
--- a/app-crypt/certbot-nginx/certbot-nginx-9999.ebuild
+++ b/app-crypt/certbot-nginx/certbot-nginx-9999.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 PYTHON_COMPAT=( python3_{8..10} )
 DISTUTILS_USE_SETUPTOOLS=rdepend
@@ -28,7 +28,7 @@ IUSE=""
 RDEPEND="
 	>=app-crypt/acme-${PV}[${PYTHON_USEDEP}]
 	>=app-crypt/certbot-${PV}[${PYTHON_USEDEP}]
-	>=dev-python/pyopenssl-17.3.0[${PYTHON_USEDEP}]
+	>=dev-python/pyopenssl-17.5.0[${PYTHON_USEDEP}]
 	>=dev-python/pyparsing-2.2.1[${PYTHON_USEDEP}]
 	dev-python/zope-interface[${PYTHON_USEDEP}]"
 
diff --git a/app-crypt/certbot/Manifest b/app-crypt/certbot/Manifest
index 78e55d756f4a..42bba4761360 100644
--- a/app-crypt/certbot/Manifest
+++ b/app-crypt/certbot/Manifest
@@ -1,8 +1,8 @@
-DIST certbot-1.26.0.tar.gz 1364070 BLAKE2B f9b13df8fb424e579293280202b71756c37a3ec7f986da38a5fd318d00ab7e2ed89223c62a20448ad30271783bb3c44db11a0ce4afebced9f1e9ca4e4c6de3f2 SHA512 bd27cb0a0ef6fc143a3d0dcf5d530d336b93a24d7010e6427c25614befb815f33076b4a3043bb247cafdfad17b8714a19ead43257c64f4fd72ac99f02cb07cde
 DIST certbot-1.27.0.tar.gz 1366469 BLAKE2B e9ec47520e027a9d348e861ea7d070eff4857301be0d42be6965e4159d85ef60866aa70de76edd5e68b0d40d9544075aa28e9aa07a8e04dfbf3e1a7dd77fd1de SHA512 5db7836ae2eda27c088476c149e736ce7f41b85d871cf563c69e021dd8af2d64ed85c1482049edf0dffe6fd0c9591d66be3e22fbf617068600e12691c4802e5e
 DIST certbot-1.28.0.tar.gz 1367671 BLAKE2B 01fda6c068217e32273b2c1ac97faa099f98da687d41796e1c98971ed6779ab4ff78e3309b7a6f82b9b0a891c5f00b5201bb3ce1bc879e5acbab3ccc4988ec31 SHA512 888f51dfcf4712b70ce7c99abfc52106384dcba2eef486db8b033bfcca3043bd0beaadce1c1e59f19c3a58b7fe454b2b64774de2e23f5d93579b3e1be1a7c08b
-EBUILD certbot-1.26.0.ebuild 1256 BLAKE2B 9f367958f021450523d83743220b3d8938bc301b0a4aa7f398e44fb44ec86d52038154ce2c2547a275b20a2eb207d43622c9f2d929ee5940a31e81b77c204c41 SHA512 b59bf3ed6470da62d7875a24b9ca0c2c900639242053494ca5660e20c91cd2aea390690855ddd7f3d827eeb491ed1662e8c1884490eb29e809122e33999e5281
-EBUILD certbot-1.27.0.ebuild 1256 BLAKE2B 9f367958f021450523d83743220b3d8938bc301b0a4aa7f398e44fb44ec86d52038154ce2c2547a275b20a2eb207d43622c9f2d929ee5940a31e81b77c204c41 SHA512 b59bf3ed6470da62d7875a24b9ca0c2c900639242053494ca5660e20c91cd2aea390690855ddd7f3d827eeb491ed1662e8c1884490eb29e809122e33999e5281
-EBUILD certbot-1.28.0.ebuild 1258 BLAKE2B 9ac38c19923fb26f8f58becde8ea4cf90faf1619a0482dc26d5dbab9111e10ad485eebfb3525cecd72123f645233a9cc6513066ce6a259088840cd6b97f7a3cd SHA512 52cb084cc7301a85849b1b7bde5a2134df0783b9800c8d991f52fcae31499f1ccaef1e10edf9649646906db4d2b506a0749bf47c13d4df3e46cc5b8ffe86ae43
-EBUILD certbot-9999.ebuild 1258 BLAKE2B 9ac38c19923fb26f8f58becde8ea4cf90faf1619a0482dc26d5dbab9111e10ad485eebfb3525cecd72123f645233a9cc6513066ce6a259088840cd6b97f7a3cd SHA512 52cb084cc7301a85849b1b7bde5a2134df0783b9800c8d991f52fcae31499f1ccaef1e10edf9649646906db4d2b506a0749bf47c13d4df3e46cc5b8ffe86ae43
+DIST certbot-1.29.0.tar.gz 1367853 BLAKE2B c0d8d2c05a061b2d50564a97bf17ae883bd443321bf99cea13fbae196c7ec876231d803d5389e524997dd8632035d5ad60b1a99b025a22a65d0865d564cfafc5 SHA512 755781e12e0e4cdb41aa16d90ab6a334ef41a98630e08127a867c8e8813ee45ebd3f6f54168fe747900f6ab59539e414ffed7891c05746b3a7af2e2a96a8d522
+EBUILD certbot-1.27.0.ebuild 1256 BLAKE2B 345c71258a03cba6613bae69937a0fe87805ec50e8341b4c8bb3e3ac6299696b42de16bcacc907f4e0b75a15b542c610ae13031de3bdb9f386795d0f428b2218 SHA512 91ae3de66390b8687e6136a62b492e60a12174b0951677aee003bf02ae5d230b5bda63d5c2a0de9692b93d4822b762d4604b78e91f03d52337e8f826fe844c07
+EBUILD certbot-1.28.0.ebuild 1256 BLAKE2B 345c71258a03cba6613bae69937a0fe87805ec50e8341b4c8bb3e3ac6299696b42de16bcacc907f4e0b75a15b542c610ae13031de3bdb9f386795d0f428b2218 SHA512 91ae3de66390b8687e6136a62b492e60a12174b0951677aee003bf02ae5d230b5bda63d5c2a0de9692b93d4822b762d4604b78e91f03d52337e8f826fe844c07
+EBUILD certbot-1.29.0.ebuild 1258 BLAKE2B 2eb9240732ce68f2e81c9df527b2d9f58af94043a22c3c1dbc0d6ea5141f91866d40ca0eb35306657d5bb2bae07199ffbecd4510f5877ac3a844f67079accc20 SHA512 43de46e0b64a794b40ab7b05392442ee8e0f7187a6f89bc4ced6bc509e585946ce90d77799f48d9be522e69155cbb0e29da64f3c824f89998764888a75620941
+EBUILD certbot-9999.ebuild 1258 BLAKE2B 2eb9240732ce68f2e81c9df527b2d9f58af94043a22c3c1dbc0d6ea5141f91866d40ca0eb35306657d5bb2bae07199ffbecd4510f5877ac3a844f67079accc20 SHA512 43de46e0b64a794b40ab7b05392442ee8e0f7187a6f89bc4ced6bc509e585946ce90d77799f48d9be522e69155cbb0e29da64f3c824f89998764888a75620941
 MISC metadata.xml 359 BLAKE2B 7f8ac46ecea304579baca80978cc35905720d1950caa183b5b5b297afab8bf6ea328324bacc438e9ecd91176230e42e55deda1c15e1ba73c63b2021ac2842c0f SHA512 a50b1db5a30eac290ac6645fcb30b0d5c4d8e51d83cff284e76358ee4fe7cef9366e40b06f532ba64a2131672972ea10b73541a9bd42cc323c17f6d26f6b0197
diff --git a/app-crypt/certbot/certbot-1.27.0.ebuild b/app-crypt/certbot/certbot-1.27.0.ebuild
index 44b7e3889a5e..3b7237a33e98 100644
--- a/app-crypt/certbot/certbot-1.27.0.ebuild
+++ b/app-crypt/certbot/certbot-1.27.0.ebuild
@@ -27,7 +27,7 @@ IUSE="selinux"
 
 RDEPEND="
 	>=app-crypt/acme-${PV}[${PYTHON_USEDEP}]
-	>=dev-python/configargparse-0.9.3[${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}]
diff --git a/app-crypt/certbot/certbot-1.28.0.ebuild b/app-crypt/certbot/certbot-1.28.0.ebuild
index bad8bc65b32d..3b7237a33e98 100644
--- a/app-crypt/certbot/certbot-1.28.0.ebuild
+++ b/app-crypt/certbot/certbot-1.28.0.ebuild
@@ -11,7 +11,7 @@ if [[ ${PV} == 9999* ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~riscv x86"
 fi
 S=${WORKDIR}/${P}/${PN}
 
@@ -27,7 +27,7 @@ IUSE="selinux"
 
 RDEPEND="
 	>=app-crypt/acme-${PV}[${PYTHON_USEDEP}]
-	>=dev-python/configargparse-0.9.3[${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}]
diff --git a/app-crypt/certbot/certbot-1.26.0.ebuild b/app-crypt/certbot/certbot-1.29.0.ebuild
index 44b7e3889a5e..3d098ba0560b 100644
--- a/app-crypt/certbot/certbot-1.26.0.ebuild
+++ b/app-crypt/certbot/certbot-1.29.0.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 PYTHON_COMPAT=( python3_{8..10} )
 DISTUTILS_USE_SETUPTOOLS=rdepend
@@ -11,7 +11,7 @@ if [[ ${PV} == 9999* ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~riscv x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
 fi
 S=${WORKDIR}/${P}/${PN}
 
@@ -27,7 +27,7 @@ IUSE="selinux"
 
 RDEPEND="
 	>=app-crypt/acme-${PV}[${PYTHON_USEDEP}]
-	>=dev-python/configargparse-0.9.3[${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}]
diff --git a/app-crypt/certbot/certbot-9999.ebuild b/app-crypt/certbot/certbot-9999.ebuild
index bad8bc65b32d..3d098ba0560b 100644
--- a/app-crypt/certbot/certbot-9999.ebuild
+++ b/app-crypt/certbot/certbot-9999.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 PYTHON_COMPAT=( python3_{8..10} )
 DISTUTILS_USE_SETUPTOOLS=rdepend
@@ -27,7 +27,7 @@ IUSE="selinux"
 
 RDEPEND="
 	>=app-crypt/acme-${PV}[${PYTHON_USEDEP}]
-	>=dev-python/configargparse-0.9.3[${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}]
diff --git a/app-crypt/dehydrated/Manifest b/app-crypt/dehydrated/Manifest
index f9fa527d0077..93de8c142922 100644
--- a/app-crypt/dehydrated/Manifest
+++ b/app-crypt/dehydrated/Manifest
@@ -2,5 +2,5 @@ AUX 00_gentoo.sh 115 BLAKE2B f24fe757e45d9af58adb9417ef6dbd36c5db85bdc50af140304
 AUX cron 71 BLAKE2B 88ec5a0d8618bc9e058d4cb3fedb0f74a530828bf63dd58a267386bd3ed2c3b647a642bfca14f6b05161d13266983bf5672787c7fc5c44e55d953ebebf346259 SHA512 0a8ac29abf2ce84b7b429ec969a3fcbfbab3ba0ed854237efa9bc86eb62859138b027f8879e016d4bedabc788ead0bb5d55ea5b629687c0c980cb63b225852b6
 AUX dehydrated-0.7.0-fix-CN-extraction-for-older-openssl-versions.patch 1179 BLAKE2B d4925675e868e24e2bd38aa0444e9b934e351fb706be5b66e71315d213186719260c20ebb976c160b1458eed1f14416ed6d27dad79a6b39b08cca50285802cb9 SHA512 2f18fa75ea6674b9b8746645395317046012f01032e35736580d87ac9a410ec4641e81c5f307d31bb238a53886b30820cde778bf83e3d04083ae1b6323777307
 DIST dehydrated-0.7.0.tar.gz 86574 BLAKE2B 35a3b0b7592126ca65003a6c9eb8934a76584710d028057e5add7f77bb2fa3799e89a060306da3b98a62d291229a2a78f23e0f95f19e033796aee31e97b94488 SHA512 47740d2d31ca73482a4fc5ed0dfce986af907dd5449cb3a5230bf9683845686c8122fc32e6219a4439574ef11d6fb104ee09591c5ff667927a2c9c13ba005511
-EBUILD dehydrated-0.7.0.ebuild 1262 BLAKE2B c1e8bb9fe28ef217df0c34692b4f579f62a085cd4f256b44b3e4338ebbc8ceab15e428c27e2c58a41419b114af1f8a71d465b5eb4270ce2e67ef48a6a45cce98 SHA512 47494cdc40eae67ba558e15b9d124ef53500dcfe3e10015080c8c7197e8f02341cbf6302a79a459d277125baf81b215ad9f24ae20be07a84b2c113a58ecea942
+EBUILD dehydrated-0.7.0.ebuild 1269 BLAKE2B 466d00372626e0daa4df3df82e2dd18845a2f5358cdd24a5f2fc23efbaf82a43fb50a378bd75cdb99a5ec08f1d87bf2e5fa549c476fd535616e614def2263247 SHA512 91d218b7e5515c5567200f0e13003197ac9838797464ea7559e7d166795a425d0f2cc7d300a3316ea36ded3c37cc4fe1543cce0b75c50279ed0d34995e4b820a
 MISC metadata.xml 444 BLAKE2B 05cdd8b05987524fd177cb35227291039e57b4272498ecadabb6f0497d4695e752eb68f764790504d79e1b3e5b9e63fd24af331df161fdad41e130ea168be317 SHA512 e265142fd3a2a11ccadc497e1dc400d81e2b3f04c0f42c5fb9f00c1b2c1cd298f917b5185a3fd0aac2a608a1905984f31fbf2ab52b25b20258f5324fd5aa3d24
diff --git a/app-crypt/dehydrated/dehydrated-0.7.0.ebuild b/app-crypt/dehydrated/dehydrated-0.7.0.ebuild
index 471ea8763971..ff4c301408bd 100644
--- a/app-crypt/dehydrated/dehydrated-0.7.0.ebuild
+++ b/app-crypt/dehydrated/dehydrated-0.7.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"
@@ -9,7 +9,7 @@ SRC_URI="https://github.com/lukas2511/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 ~riscv x86"
+KEYWORDS="amd64 arm arm64 ~ppc64 ~riscv x86"
 IUSE="+cron"
 
 RDEPEND="acct-group/dehydrated
diff --git a/app-crypt/gcr/Manifest b/app-crypt/gcr/Manifest
index 0fdd9381d7e4..d3533d6e2e9f 100644
--- a/app-crypt/gcr/Manifest
+++ b/app-crypt/gcr/Manifest
@@ -4,5 +4,5 @@ AUX gcr-3.41.0-Unbreak-build-without-systemd.patch 766 BLAKE2B 005ba225708f0a676
 DIST gcr-3.40.0.tar.xz 1011044 BLAKE2B 6b1016f74e5fd3ace32a534a59575db9c39b5deefd2f4f3a747ef7e87a43c7c00b33500d8151009347af9fe6b073c390895bb6e17c577c6e150c780c487b997e SHA512 7118608e7bef7d0cf2eea33cb3286b7f9c3622a38892ce88cf33ed453d343cc33e070831e7b4d0c5cdb43c2e57b3f0b91c7cbd6aa8463982d3af8844b59bcb81
 DIST gcr-3.41.0.tar.xz 1039744 BLAKE2B c646a04168310051d5b582a9d2f7ab9da89eef095e856e56b8d730600debead051ad8bb40eddb7457b1be2be3e092227dd886f647258a9c6a81d4bab728245f7 SHA512 455acc40ed77feeb35f9845b00229f468b322b7eda0b1b5abb0153f0a6ba29f3d0364df22225143f4caf130254a1258b3c7f934370e5142f2f64e1c3084b6f6e
 EBUILD gcr-3.40.0.ebuild 1836 BLAKE2B 5e1af281d3dca4ec8d807a14efe4a3e274a156c9ed00d718788a72ed715e3b981c44b16959fabab67e91414de14d3ce47745483fd081dbe44aff0900b5a89338 SHA512 7f5cb00872a3a5c2e7c2b66b0d3368dc173ab6243039dcc39a4ca65e682c3e6e4f369277c5730a26062c156414228e51299643918861921e814446ce5a3fecab
-EBUILD gcr-3.41.0.ebuild 2012 BLAKE2B 68a5562da880ca6f1893375fd8fcf1cc528440c0f206092d31aaeaeea940418cab5ec9df6b19f3699b1544e1d428d5685f3c3d478401e0bec758c810a356c0b9 SHA512 a829d79db42e4b41ac0617fc7ff792a65417f94901631c55d8987da4ca2534014c4f1771297fe15ae15e829b28c44bf1ae8dc5f8fd6d6ee55bb557cd69e17a93
+EBUILD gcr-3.41.0.ebuild 2010 BLAKE2B 54b38b0c84bcb5c428fd911dc7d521b9556c2e7959620a29d7e7d672df20068d4fd5f19a6b58cada2f868b8635db1a912fd06d226aa25494cab0c9391166148b SHA512 684c23feb0f587b7ff1c9324b6110d4f8d25d43bfcaa6ac5e08d5fd343973dd6129689d0096a4e7e91fc6bd23ea83cef87e397687f04cdebae5de31f935e807b
 MISC metadata.xml 250 BLAKE2B 8f7f0fe023d43e380e7861e897e6afcb5de4baefb42ea9c65a57dfc0d204c6f787a99295141832e732ebb08be218da56ba77e2dd9639e4e3aabf718ce4db1d0c SHA512 2684e772dd6d83e4b49f08f2ba22d8a0a753e7b46863489eff1b5d1f2f147ad80ffd93245ca405ac4c747249bc1b754454ec9865fe16da70f9b257051e105fd8
diff --git a/app-crypt/gcr/gcr-3.41.0.ebuild b/app-crypt/gcr/gcr-3.41.0.ebuild
index 9a85413d5e3c..5e551dc1745f 100644
--- a/app-crypt/gcr/gcr-3.41.0.ebuild
+++ b/app-crypt/gcr/gcr-3.41.0.ebuild
@@ -16,7 +16,7 @@ IUSE="gtk gtk-doc +introspection systemd test +vala"
 REQUIRED_USE="vala? ( introspection )"
 RESTRICT="!test? ( test )"
 
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris"
 
 DEPEND="
 	>=dev-libs/glib-2.44.0:2
diff --git a/app-crypt/gnupg/Manifest b/app-crypt/gnupg/Manifest
index ab8826d8913b..ab9a5e33cbb1 100644
--- a/app-crypt/gnupg/Manifest
+++ b/app-crypt/gnupg/Manifest
@@ -1,8 +1,15 @@
 AUX gnupg-2.1.20-gpgscm-Use-shorter-socket-path-lengts-to-improve-tes.patch 1048 BLAKE2B 36f37b74da309100191f4d8f9c27d08a1b00d2d30fbaf169dbb74ebbe42293357a4fb62332e286fe5725dcfdc30645a602dc2a51c51924b06215b68fd5235658 SHA512 fd12827150e96cd7979ea9611d64ed4ab9e6c61cfecdd697b8fb4d162f20985b734c2bfc365a921809b9029e86a85a9b36c10ec472b3dd49c25ea18f5aef56ce
+AUX gnupg-2.2.35-status-messages-garbled.patch 1453 BLAKE2B 44f90eac5e9669c39f31eff654b29540175a67c97bd0da673e594986ef6cd1c560225a4ee53cd994183fc83cf09418bba1687beb2504fd0b9e62709f64163694 SHA512 6f7abe2b8270a7297590a1b0c6323ef49f76750a24384a1fea4a5e452eb6bc3c6201399c015dde8c965f5c66874489c7f849d62fe89bf1d35d94ddd01316f7c4
+AUX gnupg-2.3.6-status-messages-garbled.patch 1501 BLAKE2B 1f2631eb090a4e7de2b3e16929433a7dd0d3feadc0a9ed35049edb10b1c396136e024315fc928d97f1c74e21b2c3492cf8a8e2eebb5ad48f7bf6dfa821d8e357 SHA512 4b2e2e9aa24ad3ca1ebffae2b928a76c925b6d7f74fe3d18ba666f0ad2b06947bc138b889656bd1aeab30a0477cfdfebc560b1ed98709d9979a0d9d8de109c9b
 DIST gnupg-2.2.35.tar.bz2 7262687 BLAKE2B 18b5965151ded3b3f28d139824e14d7a6f1673c5192ec5f5a80366a6d5f2e04ed7fa035e2bff105e1752753584f992626ccc9ea8840c2bfa39ffe7ca39b81f7f SHA512 ad9f8d10890b7fafb15a7422e2cebaf0f85ce7cf5f880f4edd8d1dec46aa73c01f9096e601f6edd665f8684d1f5892634991a400e00b3185e6b201f549004d3e
 DIST gnupg-2.2.35.tar.bz2.sig 119 BLAKE2B d95323703c12c9474b21fa91ddb70d4d4d464c794223e21f6ae5d4de955f07a5cabde50612e977168ea6071c4b12be3262cbafe9bcaa8e9a0b009318c0ff6718 SHA512 9043894730520e974e7bc17e0f95419c319fbcd514f102faf644e2f5580e238719cecb8b5e778ecf20f9212ee2554206eb0686e8b5fce7f8c556146657660fe2
+DIST gnupg-2.2.36.tar.bz2 7273805 BLAKE2B 82f26f48380632ddffedacb5e7cff653aec7bea2cf90d88184e0ddeb4053bd2b0ed1ee7addeceb684ffcbf07ccc2cba699172d78e5ab023af2e3d777fbb702b0 SHA512 2d14000a0e8b36688d5e89372a1ef5f8a526b2724715377323d1f9abd23122aa9d0ab2c0988063c397f969afefbf205aedb7205915fd751c539336e680d8462a
+DIST gnupg-2.2.36.tar.bz2.sig 119 BLAKE2B ad6dc03c34f6c0d13080ef0bdea2db152c12ea4f129783ba1b0b7f237965b8eeec22b2e79fcf42657dafdd20cae558d781b07378bed78386979a0b4c4ef4a49b SHA512 4ad3f9041aa1fbffaab3cc4aa0df038a67dc8eb200492cdd96259dcf1e0005cb39d6e6245280f1a2a8d4db9f686381e2b0f5bb80c412edbdbcb3fc11dca044c5
 DIST gnupg-2.3.6.tar.bz2 7604761 BLAKE2B 6cbc749156c50b6633c126cde621271c6c9682a04efea51fbc5a2e92ee56493e8348814391ee0c337adcb4de4dd23293b9592db78998626905038c859ac4af6e SHA512 4540e8d2be836b491918f4987ba301a73fcdc4539b1f9abf6112a74c2d39c0e5dc3f17511212bac1dd7fd0594feecd91f95ecf78d4b2c1e70e818342a1802b85
 DIST gnupg-2.3.6.tar.bz2.sig 119 BLAKE2B c7d4cdc81580b8b1e56c7bc83236d65c9d2c1bab2d210d14a0d3c58f635d656c9b449ef9596b9601027cb891bd437cc8f2a63eb3c17742c288531511984fba7f SHA512 85d155f9809c8d0f38723d8622c085e421531c016d19fcce2ae34dc9a4aeac0bc1895f7a094ee9cdf69a15b426fb0d72ee53319fe0a05665c92caa0e950c1797
+EBUILD gnupg-2.2.35-r1.ebuild 5105 BLAKE2B c5f9f11ae2d4488df2063e68b133d502a3ced5741e604140087320e5dcfda6e50c8aa20f69f59ef60df7226c9d550e5f6485f232eecf3db7923b67191314f452 SHA512 1ba4641d151a503ee82f2081f6967391312e486e52264dd9abefd06be8665180dcc1e8228f1704d9ea71e81053eadf57c00060ea7590a9054e873f08aa21f2b6
 EBUILD gnupg-2.2.35.ebuild 5055 BLAKE2B b5be9e19cafb6e6a65aa219df93d818e0d298da4bcb961ca45edb5208df23cdac21cd8b11da22ba822ea31f4ac66157a32ddc7fb65a1cc82e2ebbd488d7be38c SHA512 25099e0c5880d46d1b89bb387a28cef5f70311ca89c7b78a155cc08dc9ef4107ba70de87d49d26a3dea1a9b67f6dcdae7a8dd7478d250277389c9520e77a3fc7
+EBUILD gnupg-2.2.36.ebuild 5063 BLAKE2B 05e91116a94f2fc3f7540a3f57a6c08fb5e29998903ca64431a9fb173f3b5b01504506e3c8ba87917f5029daa7c57c5a734ebcea4012343d28ff8883169a5110 SHA512 9bd19ba34eedfb4a8273b41834322bfd745b339fb4ce7aab60bfee047c76cbe148380d8f494fc2f43bd1e68c8bd8f7d5b65aed2423755937448d5f36577017ed
+EBUILD gnupg-2.3.6-r1.ebuild 5282 BLAKE2B 349733f8f10abd11c1daeb66eb01b948e81d61adb1f03da525db00e9150b985bff22f57ad3c94e67e23b1fcf5efae54f634a3d48149611cdb0809eb51c9faf06 SHA512 8fa60fca7896fb2e04ef841572c567dbc16b7da4ba4c3643826f140351dfe47806fdc08af197aeb2fe06ddd935cf2a41594f960e2e0db57131176a3540a869c2
 EBUILD gnupg-2.3.6.ebuild 5232 BLAKE2B 0d5a372da5867eef0a78cb46050281e7d1ed5385b6bdfd0a4df9ba5cefabf92f5cd7c363b1f5bebe7919e0114b258833be39a41f3c8b0f6b370239123d0ae3f2 SHA512 eb8b033a34b9cb2509213cb03f1c1c47a823e3009ff334ec294037fd7236ccc0a90eb035849ba7e03feb7c562997c12edf805d83be08d93616c299953009e93f
 MISC metadata.xml 1297 BLAKE2B 2d1b2b6f7e6fdf5b73797347e9a3bf7758f1efc86e53d0d0f4b2c0012152ebc50630ff4f3b2c965063f608cf03b3da2794978a3e3659957970d91d3a735ad604 SHA512 0e9f3d5255ac70d6a08b251bfd20f13ff25f63e763ab9385924fb2cb5ac233b0ae97cc43e8a2d950b9662f088ef65af87f9af4dbb355e122e3fcb118bee1c0de
diff --git a/app-crypt/gnupg/files/gnupg-2.2.35-status-messages-garbled.patch b/app-crypt/gnupg/files/gnupg-2.2.35-status-messages-garbled.patch
new file mode 100644
index 000000000000..23dbf00b1831
--- /dev/null
+++ b/app-crypt/gnupg/files/gnupg-2.2.35-status-messages-garbled.patch
@@ -0,0 +1,45 @@
+https://bugs.gentoo.org/855395
+https://marc.info/?l=oss-security&m=165657063921408&w=2
+https://git.gnupg.org/cgi-bin/gitweb.cgi?p=gnupg.git;a=commitdiff;h=7b1db7192e6e4d0cfc439b23b13831837c85bc21
+
+From 7b1db7192e6e4d0cfc439b23b13831837c85bc21 Mon Sep 17 00:00:00 2001
+From: Werner Koch <wk@gnupg.org>
+Date: Tue, 14 Jun 2022 11:33:27 +0200
+Subject: [PATCH] g10: Fix garbled status messages in NOTATION_DATA
+
+* g10/cpr.c (write_status_text_and_buffer): Fix off-by-one
+--
+
+Depending on the escaping and line wrapping the computed remaining
+buffer length could be wrong.  Fixed by always using a break to
+terminate the escape detection loop.  Might have happened for all
+status lines which may wrap.
+
+GnuPG-bug-id: T6027
+--- a/g10/cpr.c
++++ b/g10/cpr.c
+@@ -328,20 +328,15 @@ write_status_text_and_buffer (int no, const char *string,
+             }
+           first = 0;
+         }
+-      for (esc=0, s=buffer, n=len; n && !esc; s++, n--)
++      for (esc=0, s=buffer, n=len; n; s++, n--)
+         {
+           if (*s == '%' || *(const byte*)s <= lower_limit
+               || *(const byte*)s == 127 )
+             esc = 1;
+           if (wrap && ++count > wrap)
+-            {
+-              dowrap=1;
+-              break;
+-            }
+-        }
+-      if (esc)
+-        {
+-          s--; n++;
++            dowrap=1;
++          if (esc || dowrap)
++            break;
+         }
+       if (s != buffer)
+         es_fwrite (buffer, s-buffer, 1, statusfp);
diff --git a/app-crypt/gnupg/files/gnupg-2.3.6-status-messages-garbled.patch b/app-crypt/gnupg/files/gnupg-2.3.6-status-messages-garbled.patch
new file mode 100644
index 000000000000..4bac4fea0f0e
--- /dev/null
+++ b/app-crypt/gnupg/files/gnupg-2.3.6-status-messages-garbled.patch
@@ -0,0 +1,45 @@
+https://bugs.gentoo.org/855395
+https://marc.info/?l=oss-security&m=165657063921408&w=2
+https://git.gnupg.org/cgi-bin/gitweb.cgi?p=gnupg.git;a=commitdiff;h=34c649b3601383cd11dbc76221747ec16fd68e1b;hp=4dbef2addca8c76fb4953fd507bd800d2a19d3ec
+
+From 34c649b3601383cd11dbc76221747ec16fd68e1b Mon Sep 17 00:00:00 2001
+From: Werner Koch <wk@gnupg.org>
+Date: Tue, 14 Jun 2022 11:33:27 +0200
+Subject: [PATCH 1/1] g10: Fix garbled status messages in NOTATION_DATA
+
+* g10/cpr.c (write_status_text_and_buffer): Fix off-by-one
+--
+
+Depending on the escaping and line wrapping the computed remaining
+buffer length could be wrong.  Fixed by always using a break to
+terminate the escape detection loop.  Might have happened for all
+status lines which may wrap.
+
+GnuPG-bug-id: T6027
+--- a/g10/cpr.c
++++ b/g10/cpr.c
+@@ -372,20 +372,15 @@ write_status_text_and_buffer (int no, const char *string,
+             }
+           first = 0;
+         }
+-      for (esc=0, s=buffer, n=len; n && !esc; s++, n--)
++      for (esc=0, s=buffer, n=len; n; s++, n--)
+         {
+           if (*s == '%' || *(const byte*)s <= lower_limit
+               || *(const byte*)s == 127 )
+             esc = 1;
+           if (wrap && ++count > wrap)
+-            {
+-              dowrap=1;
+-              break;
+-            }
+-        }
+-      if (esc)
+-        {
+-          s--; n++;
++            dowrap=1;
++          if (esc || dowrap)
++            break;
+         }
+       if (s != buffer)
+         es_fwrite (buffer, s-buffer, 1, statusfp);
diff --git a/app-crypt/gnupg/gnupg-2.2.35-r1.ebuild b/app-crypt/gnupg/gnupg-2.2.35-r1.ebuild
new file mode 100644
index 000000000000..d78daa145003
--- /dev/null
+++ b/app-crypt/gnupg/gnupg-2.2.35-r1.ebuild
@@ -0,0 +1,160 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+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 )"
+
+# 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.8.0:=
+	>=dev-libs/libgpg-error-1.29
+	>=dev-libs/libksba-1.3.5
+	>=dev-libs/npth-1.2
+	>=net-misc/curl-7.10
+	sys-libs/zlib
+	bzip2? ( app-arch/bzip2 )
+	ldap? ( net-nds/openldap:= )
+	readline? ( sys-libs/readline:0= )
+	smartcard? ( usb? ( virtual/libusb:1 ) )
+	ssl? ( >=net-libs/gnutls-3.0:0= )
+	tofu? ( >=dev-db/sqlite-3.7 )"
+
+RDEPEND="${DEPEND}
+	app-crypt/pinentry
+	nls? ( virtual/libintl )
+	selinux? ( sec-policy/selinux-gpg )
+	wks-server? ( virtual/mta )"
+
+BDEPEND="virtual/pkgconfig
+	doc? ( sys-apps/texinfo )
+	nls? ( sys-devel/gettext )
+	verify-sig? ( sec-keys/openpgp-keys-gnupg )"
+
+DOCS=(
+	ChangeLog NEWS README THANKS TODO VERSION
+	doc/FAQ doc/DETAILS doc/HACKING doc/TRANSLATE doc/OpenPGP doc/KEYSERVER
+)
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-2.1.20-gpgscm-Use-shorter-socket-path-lengts-to-improve-tes.patch
+	"${FILESDIR}"/${P}-status-messages-garbled.patch
+)
+
+src_prepare() {
+	default
+
+	# Inject SSH_AUTH_SOCK into user's sessions after enabling gpg-agent-ssh.socket in systemctl --user mode,
+	# idea borrowed from libdbus, see
+	#   https://gitlab.freedesktop.org/dbus/dbus/-/blob/master/bus/systemd-user/dbus.socket.in#L6
+	#
+	# This cannot be upstreamed, as it requires determining the exact prefix of 'systemctl',
+	# which in turn requires discovery in Autoconf, something that upstream deeply resents.
+	sed -e "/DirectoryMode=/a ExecStartPost=-${EPREFIX}/bin/systemctl --user set-environment SSH_AUTH_SOCK=%t/gnupg/S.gpg-agent.ssh" \
+		-i doc/examples/systemd-user/gpg-agent-ssh.socket || die
+}
+
+src_configure() {
+	local myconf=(
+		$(use_enable bzip2)
+		$(use_enable nls)
+		$(use_enable smartcard scdaemon)
+		$(use_enable ssl gnutls)
+		$(use_enable test all-tests)
+		$(use_enable test tests)
+		$(use_enable tofu)
+		$(use smartcard && use_enable usb ccid-driver || echo '--disable-ccid-driver')
+		$(use_enable wks-server wks-tools)
+		$(use_with ldap)
+		$(use_with readline)
+		--with-mailprog=/usr/libexec/sendmail
+		--disable-ntbtls
+		--enable-gpg
+		--enable-gpgsm
+		--enable-large-secmem
+
+		CC_FOR_BUILD="$(tc-getBUILD_CC)"
+		GPG_ERROR_CONFIG="${ESYSROOT}/usr/bin/${CHOST}-gpg-error-config"
+		KSBA_CONFIG="${ESYSROOT}/usr/bin/ksba-config"
+		LIBASSUAN_CONFIG="${ESYSROOT}/usr/bin/libassuan-config"
+		LIBGCRYPT_CONFIG="${ESYSROOT}/usr/bin/${CHOST}-libgcrypt-config"
+		NPTH_CONFIG="${ESYSROOT}/usr/bin/npth-config"
+
+		$("${S}/configure" --help | grep -o -- '--without-.*-prefix')
+	)
+
+	if use prefix && use usb; then
+		# bug #649598
+		append-cppflags -I"${EPREFIX}/usr/include/libusb-1.0"
+	fi
+
+	# bug #663142
+	if use user-socket; then
+		myconf+=( --enable-run-gnupg-user-socket )
+	fi
+
+	# glib fails and picks up clang's internal stdint.h causing weird errors
+	tc-is-clang && export gl_cv_absolute_stdint_h="${ESYSROOT}"/usr/include/stdint.h
+
+	# Hardcode mailprog to /usr/libexec/sendmail even if it does not exist.
+	# As of GnuPG 2.3, the mailprog substitution is used for the binary called
+	# by wks-client & wks-server; and if it's autodetected but not not exist at
+	# build time, then then 'gpg-wks-client --send' functionality will not
+	# work. This has an unwanted side-effect in stage3 builds: there was a
+	# [R]DEPEND on virtual/mta, which also brought in virtual/logger, bloating
+	# the build where the install guide previously make the user chose the
+	# logger & mta early in the install.
+
+	econf "${myconf[@]}"
+}
+
+src_compile() {
+	default
+
+	use doc && emake -C doc html
+}
+
+src_test() {
+	# bug #638574
+	use tofu && export TESTFLAGS=--parallel
+
+	default
+}
+
+src_install() {
+	default
+
+	use tools &&
+		dobin \
+			tools/{convert-from-106,gpg-check-pattern} \
+			tools/{gpg-zip,gpgconf,gpgsplit,lspgpot,mail-signed-keys} \
+			tools/make-dns-cert
+
+	dosym gpg /usr/bin/gpg2
+	dosym gpgv /usr/bin/gpgv2
+	echo ".so man1/gpg.1" > "${ED}"/usr/share/man/man1/gpg2.1 || die
+	echo ".so man1/gpgv.1" > "${ED}"/usr/share/man/man1/gpgv2.1 || die
+
+	dodir /etc/env.d
+	echo "CONFIG_PROTECT=/usr/share/gnupg/qualified.txt" >> "${ED}"/etc/env.d/30gnupg || die
+
+	use doc && dodoc doc/gnupg.html/* doc/*.png
+
+	systemd_douserunit doc/examples/systemd-user/*.{service,socket}
+}
diff --git a/app-crypt/gnupg/gnupg-2.2.36.ebuild b/app-crypt/gnupg/gnupg-2.2.36.ebuild
new file mode 100644
index 000000000000..fcc6d9e01c03
--- /dev/null
+++ b/app-crypt/gnupg/gnupg-2.2.36.ebuild
@@ -0,0 +1,159 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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 )"
+
+# 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.8.0:=
+	>=dev-libs/libgpg-error-1.29
+	>=dev-libs/libksba-1.3.5
+	>=dev-libs/npth-1.2
+	>=net-misc/curl-7.10
+	sys-libs/zlib
+	bzip2? ( app-arch/bzip2 )
+	ldap? ( net-nds/openldap:= )
+	readline? ( sys-libs/readline:0= )
+	smartcard? ( usb? ( virtual/libusb:1 ) )
+	ssl? ( >=net-libs/gnutls-3.0:0= )
+	tofu? ( >=dev-db/sqlite-3.7 )"
+
+RDEPEND="${DEPEND}
+	app-crypt/pinentry
+	nls? ( virtual/libintl )
+	selinux? ( sec-policy/selinux-gpg )
+	wks-server? ( virtual/mta )"
+
+BDEPEND="virtual/pkgconfig
+	doc? ( sys-apps/texinfo )
+	nls? ( sys-devel/gettext )
+	verify-sig? ( sec-keys/openpgp-keys-gnupg )"
+
+DOCS=(
+	ChangeLog NEWS README THANKS TODO VERSION
+	doc/FAQ doc/DETAILS doc/HACKING doc/TRANSLATE doc/OpenPGP doc/KEYSERVER
+)
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-2.1.20-gpgscm-Use-shorter-socket-path-lengts-to-improve-tes.patch
+)
+
+src_prepare() {
+	default
+
+	# Inject SSH_AUTH_SOCK into user's sessions after enabling gpg-agent-ssh.socket in systemctl --user mode,
+	# idea borrowed from libdbus, see
+	#   https://gitlab.freedesktop.org/dbus/dbus/-/blob/master/bus/systemd-user/dbus.socket.in#L6
+	#
+	# This cannot be upstreamed, as it requires determining the exact prefix of 'systemctl',
+	# which in turn requires discovery in Autoconf, something that upstream deeply resents.
+	sed -e "/DirectoryMode=/a ExecStartPost=-${EPREFIX}/bin/systemctl --user set-environment SSH_AUTH_SOCK=%t/gnupg/S.gpg-agent.ssh" \
+		-i doc/examples/systemd-user/gpg-agent-ssh.socket || die
+}
+
+src_configure() {
+	local myconf=(
+		$(use_enable bzip2)
+		$(use_enable nls)
+		$(use_enable smartcard scdaemon)
+		$(use_enable ssl gnutls)
+		$(use_enable test all-tests)
+		$(use_enable test tests)
+		$(use_enable tofu)
+		$(use smartcard && use_enable usb ccid-driver || echo '--disable-ccid-driver')
+		$(use_enable wks-server wks-tools)
+		$(use_with ldap)
+		$(use_with readline)
+		--with-mailprog=/usr/libexec/sendmail
+		--disable-ntbtls
+		--enable-gpg
+		--enable-gpgsm
+		--enable-large-secmem
+
+		CC_FOR_BUILD="$(tc-getBUILD_CC)"
+		GPG_ERROR_CONFIG="${ESYSROOT}/usr/bin/${CHOST}-gpg-error-config"
+		KSBA_CONFIG="${ESYSROOT}/usr/bin/ksba-config"
+		LIBASSUAN_CONFIG="${ESYSROOT}/usr/bin/libassuan-config"
+		LIBGCRYPT_CONFIG="${ESYSROOT}/usr/bin/${CHOST}-libgcrypt-config"
+		NPTH_CONFIG="${ESYSROOT}/usr/bin/npth-config"
+
+		$("${S}/configure" --help | grep -o -- '--without-.*-prefix')
+	)
+
+	if use prefix && use usb; then
+		# bug #649598
+		append-cppflags -I"${EPREFIX}/usr/include/libusb-1.0"
+	fi
+
+	# bug #663142
+	if use user-socket; then
+		myconf+=( --enable-run-gnupg-user-socket )
+	fi
+
+	# glib fails and picks up clang's internal stdint.h causing weird errors
+	tc-is-clang && export gl_cv_absolute_stdint_h="${ESYSROOT}"/usr/include/stdint.h
+
+	# Hardcode mailprog to /usr/libexec/sendmail even if it does not exist.
+	# As of GnuPG 2.3, the mailprog substitution is used for the binary called
+	# by wks-client & wks-server; and if it's autodetected but not not exist at
+	# build time, then then 'gpg-wks-client --send' functionality will not
+	# work. This has an unwanted side-effect in stage3 builds: there was a
+	# [R]DEPEND on virtual/mta, which also brought in virtual/logger, bloating
+	# the build where the install guide previously make the user chose the
+	# logger & mta early in the install.
+
+	econf "${myconf[@]}"
+}
+
+src_compile() {
+	default
+
+	use doc && emake -C doc html
+}
+
+src_test() {
+	# bug #638574
+	use tofu && export TESTFLAGS=--parallel
+
+	default
+}
+
+src_install() {
+	default
+
+	use tools &&
+		dobin \
+			tools/{convert-from-106,gpg-check-pattern} \
+			tools/{gpg-zip,gpgconf,gpgsplit,lspgpot,mail-signed-keys} \
+			tools/make-dns-cert
+
+	dosym gpg /usr/bin/gpg2
+	dosym gpgv /usr/bin/gpgv2
+	echo ".so man1/gpg.1" > "${ED}"/usr/share/man/man1/gpg2.1 || die
+	echo ".so man1/gpgv.1" > "${ED}"/usr/share/man/man1/gpgv2.1 || die
+
+	dodir /etc/env.d
+	echo "CONFIG_PROTECT=/usr/share/gnupg/qualified.txt" >> "${ED}"/etc/env.d/30gnupg || die
+
+	use doc && dodoc doc/gnupg.html/* doc/*.png
+
+	systemd_douserunit doc/examples/systemd-user/*.{service,socket}
+}
diff --git a/app-crypt/gnupg/gnupg-2.3.6-r1.ebuild b/app-crypt/gnupg/gnupg-2.3.6-r1.ebuild
new file mode 100644
index 000000000000..c2540e9010b7
--- /dev/null
+++ b/app-crypt/gnupg/gnupg-2.3.6-r1.ebuild
@@ -0,0 +1,165 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+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 ~loong ~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 tpm tools usb user-socket wks-server"
+RESTRICT="!test? ( test )"
+REQUIRED_USE="test? ( tofu )"
+
+# 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/npth-1.2
+	>=net-misc/curl-7.10
+	sys-libs/zlib
+	bzip2? ( app-arch/bzip2 )
+	ldap? ( net-nds/openldap:= )
+	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= )
+"
+
+RDEPEND="${DEPEND}
+	app-crypt/pinentry
+	nls? ( virtual/libintl )
+	selinux? ( sec-policy/selinux-gpg )
+	wks-server? ( virtual/mta )"
+
+BDEPEND="virtual/pkgconfig
+	doc? ( sys-apps/texinfo )
+	nls? ( sys-devel/gettext )
+	verify-sig? ( sec-keys/openpgp-keys-gnupg )"
+
+DOCS=(
+	ChangeLog NEWS README THANKS TODO VERSION
+	doc/FAQ doc/DETAILS doc/HACKING doc/TRANSLATE doc/OpenPGP doc/KEYSERVER
+)
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-2.1.20-gpgscm-Use-shorter-socket-path-lengts-to-improve-tes.patch
+	"${FILESDIR}"/${P}-status-messages-garbled.patch
+)
+
+src_prepare() {
+	default
+
+	# Inject SSH_AUTH_SOCK into user's sessions after enabling gpg-agent-ssh.socket in systemctl --user mode,
+	# idea borrowed from libdbus, see
+	#   https://gitlab.freedesktop.org/dbus/dbus/-/blob/master/bus/systemd-user/dbus.socket.in#L6
+	#
+	# This cannot be upstreamed, as it requires determining the exact prefix of 'systemctl',
+	# which in turn requires discovery in Autoconf, something that upstream deeply resents.
+	sed -e "/DirectoryMode=/a ExecStartPost=-${EPREFIX}/bin/systemctl --user set-environment SSH_AUTH_SOCK=%t/gnupg/S.gpg-agent.ssh" \
+		-i doc/examples/systemd-user/gpg-agent-ssh.socket || die
+}
+
+src_configure() {
+	local myconf=(
+		$(use_enable bzip2)
+		$(use_enable nls)
+		$(use_enable smartcard scdaemon)
+		$(use_enable ssl gnutls)
+		$(use_enable test all-tests)
+		$(use_enable test tests)
+		$(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)
+		$(use_with readline)
+		--with-mailprog=/usr/libexec/sendmail
+		--disable-ntbtls
+		--enable-gpgsm
+		--enable-large-secmem
+
+		CC_FOR_BUILD="$(tc-getBUILD_CC)"
+		GPG_ERROR_CONFIG="${ESYSROOT}/usr/bin/${CHOST}-gpg-error-config"
+		KSBA_CONFIG="${ESYSROOT}/usr/bin/ksba-config"
+		LIBASSUAN_CONFIG="${ESYSROOT}/usr/bin/libassuan-config"
+		LIBGCRYPT_CONFIG="${ESYSROOT}/usr/bin/${CHOST}-libgcrypt-config"
+		NPTH_CONFIG="${ESYSROOT}/usr/bin/npth-config"
+
+		$("${S}/configure" --help | grep -o -- '--without-.*-prefix')
+	)
+
+	if use prefix && use usb; then
+		# bug #649598
+		append-cppflags -I"${ESYSROOT}/usr/include/libusb-1.0"
+	fi
+
+	# bug #663142
+	if use user-socket; then
+		myconf+=( --enable-run-gnupg-user-socket )
+	fi
+
+	# glib fails and picks up clang's internal stdint.h causing weird errors
+	tc-is-clang && export gl_cv_absolute_stdint_h="${ESYSROOT}"/usr/include/stdint.h
+
+	# Hardcode mailprog to /usr/libexec/sendmail even if it does not exist.
+	# As of GnuPG 2.3, the mailprog substitution is used for the binary called
+	# by wks-client & wks-server; and if it's autodetected but not not exist at
+	# build time, then then 'gpg-wks-client --send' functionality will not
+	# work. This has an unwanted side-effect in stage3 builds: there was a
+	# [R]DEPEND on virtual/mta, which also brought in virtual/logger, bloating
+	# the build where the install guide previously make the user chose the
+	# logger & mta early in the install.
+
+	econf "${myconf[@]}"
+}
+
+src_compile() {
+	default
+
+	use doc && emake -C doc html
+}
+
+src_test() {
+	# bug #638574
+	use tofu && export TESTFLAGS=--parallel
+
+	default
+}
+
+src_install() {
+	default
+
+	use tools &&
+		dobin \
+			tools/{convert-from-106,gpg-check-pattern} \
+			tools/{gpgconf,gpgsplit,lspgpot,mail-signed-keys} \
+			tools/make-dns-cert
+
+	dosym gpg /usr/bin/gpg2
+	dosym gpgv /usr/bin/gpgv2
+	echo ".so man1/gpg.1" > "${ED}"/usr/share/man/man1/gpg2.1 || die
+	echo ".so man1/gpgv.1" > "${ED}"/usr/share/man/man1/gpgv2.1 || die
+
+	dodir /etc/env.d
+	echo "CONFIG_PROTECT=/usr/share/gnupg/qualified.txt" >> "${ED}"/etc/env.d/30gnupg || die
+
+	use doc && dodoc doc/gnupg.html/* doc/*.png
+
+	systemd_douserunit doc/examples/systemd-user/*.{service,socket}
+}
diff --git a/app-crypt/libnitrokey/Manifest b/app-crypt/libnitrokey/Manifest
index e208714273b6..67010e6ec857 100644
--- a/app-crypt/libnitrokey/Manifest
+++ b/app-crypt/libnitrokey/Manifest
@@ -1,4 +1,4 @@
 DIST libnitrokey-3.6.tar.gz 98038 BLAKE2B 27f99e7b6de93548fc7a373f37ce784da0aa50503a5c635b4d90282e6330a5ff4c0dcc03a83a7e57045b8a1aabaab27d76a090d7c49693a6ff1037b81e75ece9 SHA512 a00a6724e5c64715eca688ec254efd979acceb5ff4cad28a205f7128e44db8674a5924634fd7da6c69d589deafca7b28b99e1d05a244c321d5cb429f2e5a3bec
-EBUILD libnitrokey-3.6.ebuild 1046 BLAKE2B 19c6e6213b1200743567759d12f9328582273c5f0f1c4fb984e14f6d73e37a0c7fb67f0d874e6f3856a6ea6fee7e213b979f16b19caa3f1559eb6e6e8f823107 SHA512 89e10ca9584e329255753c24f496087b9ca09ba18e623a8938282b9d6f91ff0df457417ebc586aa6b5947d43c632499cd1fe007bdddb91f4788bb139cceabbba
-EBUILD libnitrokey-9999.ebuild 1048 BLAKE2B e49ec7cfed9deb08f1757d14762694638230366aa674cd07e90d65de6ebfef55e9de4c6ce8685a47ef7d07eda954a2036f0874d7e408b964cbc0c852781afc3e SHA512 8f4dd941bc7150e8fc3fb126d5ffa8009f2893b2d40da5c7a64347f3efdf080d7069dac4a1bc93567e41950e3c74c0bc470170577658a4c925a570a30b0d5b7d
+EBUILD libnitrokey-3.6.ebuild 1110 BLAKE2B 8c675df63ba91e83e83314e079f9bc07042ac12584cc03f5c93bccc241ac97aa7ea1170e946559aa3a4426576bab7054d716530e71f12ef3839b8eadb714cb67 SHA512 f46adf94137b7b5f976fc566f48e46ccc97b791ec0dc03a6b8459f52c9f0bada878a8827a27d65c2e3240775f413ef6060a894c0ca89de078f5c26dcb305cf0b
+EBUILD libnitrokey-9999.ebuild 1112 BLAKE2B c2fb52f3577eb5f6343d16c4564e9a7228d9775c996770b3d52e49a65eb070a0075b67f64c74fa6ff761bff3e5c700c4a9aed19f6bf0bb1d21d8f089093a3d82 SHA512 0debea09cefd3df62598efed53028bc987bfe3eed730d1407c8ed1f3117f4654a26e0158e8b5e95214e44d1f39e219308896bdcfda1b289efd100b0a6705ab9a
 MISC metadata.xml 398 BLAKE2B fd2f4c092ed478b034cadf189ce032a24ae41bbc908b620c98125ad340a69b79ec4c1b39a3eaae065db746e16ba5e891eb9b5f6a31967fab8261bf7fd8f5b16e SHA512 657c44fed3145300a480a6b3c4765932414d1fe0f5cc1130ffbe358502b37b46effc7f8cbef4a12b751f8f19c22d64c52a1921b7ae4d19c920e08de67f39fa2d
diff --git a/app-crypt/libnitrokey/libnitrokey-3.6.ebuild b/app-crypt/libnitrokey/libnitrokey-3.6.ebuild
index ecef8c9b5c2d..dd6d0126cf31 100644
--- a/app-crypt/libnitrokey/libnitrokey-3.6.ebuild
+++ b/app-crypt/libnitrokey/libnitrokey-3.6.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
@@ -45,3 +45,11 @@ src_configure() {
 	)
 	cmake_src_configure
 }
+
+pkg_postinst() {
+	udev_reload
+}
+
+pkg_postrm() {
+	udev_reload
+}
diff --git a/app-crypt/libnitrokey/libnitrokey-9999.ebuild b/app-crypt/libnitrokey/libnitrokey-9999.ebuild
index 8687d0d1b4e3..a9135e08d5d4 100644
--- a/app-crypt/libnitrokey/libnitrokey-9999.ebuild
+++ b/app-crypt/libnitrokey/libnitrokey-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
@@ -45,3 +45,11 @@ src_configure() {
 	)
 	cmake_src_configure
 }
+
+pkg_postinst() {
+	udev_reload
+}
+
+pkg_postrm() {
+	udev_reload
+}
diff --git a/app-crypt/mkp224o/Manifest b/app-crypt/mkp224o/Manifest
index a578dd3f4276..6a2c8ce03334 100644
--- a/app-crypt/mkp224o/Manifest
+++ b/app-crypt/mkp224o/Manifest
@@ -1,3 +1,5 @@
 DIST mkp224o-1.5.0-src.tar.gz 1378324 BLAKE2B 19d38fbf23328607fa428ec9329cdc909b210b4235d85e14ff372347c9b408ecf22d41dac7122bdae06725d7bca0c3d53c81cc27272c47517e714e9b8e0625dd SHA512 aa5adc91e695dbfd8ece5fdfe3ca370056d4390a5186326b35ee37402040fa24675ede5389c48b79a1e57b624b86024ff72957741fef175602f7721f20c5cc14
+DIST mkp224o-1.6.1-src.tar.gz 1387615 BLAKE2B 271424dcee44b5b1e1a35346a0cc1c37ee5d430231fe93e0b936ac994c892f0406ea361be763732db8a8397684ecad70e26c34f5553a415e7ed0592417672310 SHA512 d0c21ee5fb5f7b2950e1c39af5dc62b1e26aef0917b53169e9c3f9a99a7febe70bb2f96ada612c71bdbdbf8cad9c1f407d175af49fca40eedd68bbe8112970a5
 EBUILD mkp224o-1.5.0.ebuild 766 BLAKE2B 8138ab3b1467e1f2164b5ffac561a7d62bdebb99c53624e5a9c9b936fb839f18615ab7165f35a0bc38c6986af1cfbc8b01dc635426db2a5d05db077f752ef232 SHA512 b678d1d3167979e9f7507b6a4359356cf859160026892fc7e3489355b9201557139223e912ccf6f09aa3e770a2577c24ad071b82bbab476e72540ff0217ddacd
+EBUILD mkp224o-1.6.1.ebuild 766 BLAKE2B 73e0e4845748b49c80f1d7814107b2f1575c8f4b7418ea1cd51ff7b742233a2266fc12b9a9bda234262598cb136dea4f095ca9f58a9fa0e9e5e0fad707755f1d SHA512 0231d6a6bfc02a6c12bef9961b18088a7a302a72eeb9af77bdeda4bc244a9f7dec003d80175fe2df8d236b0eeb6d0f2b0e8e75dc16aae1052cd7071e86c0ad01
 MISC metadata.xml 441 BLAKE2B 2d6b436d30726fdaca9272dba7629a64a36a64d84516be74d87d66d93d87c0dbbdf356254c372e2e090d0ed97a64a60483c3b91aa6a9a3944099337b1b699bda SHA512 36de72bdf964af4056ed9bf21bacfccbc56b3f4a668a4ccd307f74c8aefdb5d66c03504b86762f6d686ecf44a27b77b0119dfaf3d198a8c60d408055e52aee80
diff --git a/app-crypt/mkp224o/mkp224o-1.6.1.ebuild b/app-crypt/mkp224o/mkp224o-1.6.1.ebuild
new file mode 100644
index 000000000000..6a5af08b0f9c
--- /dev/null
+++ b/app-crypt/mkp224o/mkp224o-1.6.1.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.md )
+
+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/pgpdump/Manifest b/app-crypt/pgpdump/Manifest
index 943d4f4caacd..24ee265204d8 100644
--- a/app-crypt/pgpdump/Manifest
+++ b/app-crypt/pgpdump/Manifest
@@ -1,4 +1,6 @@
 AUX pgpdump-0.32-respect-ldflags.patch 998 BLAKE2B fefa545f3c2d1d3ed3baa5a9d2b84b9b32745626883e9b8056fff045ceb0d06a490f5068782dbda07e4956429a2d2f31865c9c0e55b91bd9aa613f9ce6016537 SHA512 ed333769ded8acbec36d34bc86d935705294d96854e84af4673d44ed3d04f5272d2c1bba38b2742afeb02b2a307a983ff61566433ad1546769e6a68f2318e760
 DIST pgpdump-0.33.tar.gz 65730 BLAKE2B 9941f55a070c219b1b6096939f1a8d775d85c8de60154f2ca93709b489605c8c3937bb4e250390fc71d152bf23c5a22f37226a64ff57036268cf49d793c215bd SHA512 976e2c185c9d72302c9c020dde1d2872b01fd9c2195be0d43441a03c3c6a4a70636f8ac2b35e3fde30e45ecc7fc1c23d7c92dcbd90fc503bbcdef73e3483e9c7
+DIST pgpdump-0.35.tar.gz 77580 BLAKE2B 2c0b8d69bccf37a0d9a192273f901c52d74fa2423f32084a9ddda9c70c2055a0b594113b486cb9bcd8e9566cef781938186400dc139e9e00439db067b38307cb SHA512 03579d7d89d98f19f50c9722c063f059904887f7ca7da3eb99a4aadc6c5361b5161c891767a93087bfb42641aa2e24a9ad6560b1e4396370217afec61a988015
 EBUILD pgpdump-0.33.ebuild 528 BLAKE2B fe80721f60647fbf31fc20c9df52a0f4317c41fb21a866c2d47e057ec281f09d28fa0013943a20123153f7f128b6c83e03405eb9c5ead4e597f3ef536b6c0737 SHA512 9399dd1fc6aba64de1896e0ebafc2b99470ea3b85b24e265653df5f267de0c958c79da487cf1266efa73197b70c50d95ed25bde880e4b48f1058356feee63b4b
-MISC metadata.xml 169 BLAKE2B 25149b73446be31f3ea3dd3a6394230987e7d4c601d1605fd3827b37bd99b3301c2e0edb95d0f59a4577ed27919f43c2cc02b1edf62c4012b935a82e709e0c05 SHA512 55c53f74b001bae56ba8c54581a4168335b6b3a28dac23a2102b76795d5fd41de33b8b3e1ec03f9acc6e7a3a77e93b1a6ff3e3967c3156dcbf22b5b5a6245ef5
+EBUILD pgpdump-0.35.ebuild 526 BLAKE2B 86186bc9bb7c5dd571075ff9f7bd816ddff46c2ecff7ad27a84808cfa796ed16551e6ec53aa09e838a8824912e20d5f41d4fc25e4a7d468055ec9fff28a78ce9 SHA512 24664603c3c271dbc2c3f9a81fe14f337f9798af032052127cb19e1bea3544add3df4caef5c2ab634bcb6627626f7efcae8cfaf8c637f80c689e2b30ba55c5cf
+MISC metadata.xml 254 BLAKE2B c39b24370eb9491088f6f7a71340e8308caeada31bf26e230402746b603099e096a8b8f80b88deabebc07f9d3055c3111da87220137814482042e50309a45f65 SHA512 fa4f3d885634d2a414f4824bd250e03bcd17fbff0832f84ca03bc27e4564e772ec0e25b4de6968117f71b1f0a9461e91ac1d80adc84d679e2c83148c12a635fa
diff --git a/app-crypt/pgpdump/metadata.xml b/app-crypt/pgpdump/metadata.xml
index bef24d2c2337..f4514f627378 100644
--- a/app-crypt/pgpdump/metadata.xml
+++ b/app-crypt/pgpdump/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <!-- maintainer-needed -->
+	<!-- maintainer-needed -->
+	<upstream>
+		<remote-id type="github">kazu-yamamoto/pgpdump</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/app-crypt/pgpdump/pgpdump-0.35.ebuild b/app-crypt/pgpdump/pgpdump-0.35.ebuild
new file mode 100644
index 000000000000..7027b53213fa
--- /dev/null
+++ b/app-crypt/pgpdump/pgpdump-0.35.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DESCRIPTION="A PGP packet visualizer"
+HOMEPAGE="https://www.mew.org/~kazu/proj/pgpdump/"
+SRC_URI="https://www.mew.org/~kazu/proj/pgpdump/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~ppc ~sparc ~x86"
+
+DEPEND="app-arch/bzip2
+	sys-libs/zlib"
+RDEPEND="${DEPEND}"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.32-respect-ldflags.patch
+)
+
+src_install() {
+	dobin pgpdump
+	doman pgpdump.1
+	dodoc CHANGES README.md
+}
diff --git a/app-crypt/seahorse/Manifest b/app-crypt/seahorse/Manifest
index 5215848d1736..82ae8bb1809f 100644
--- a/app-crypt/seahorse/Manifest
+++ b/app-crypt/seahorse/Manifest
@@ -2,5 +2,5 @@ AUX 41.0-meson-fix-gpg-version-check-for-recent-gnupg.patch 1219 BLAKE2B ad27915
 DIST seahorse-41.0.tar.xz 1371984 BLAKE2B fdfc7c6d5ba41ab83c639d93c92fe6e1c36d42a02c7a384c2055bfe594e2a16415115bfb07597de93a886e492974e38c812fbbd59c7112c0360adeed96cb437d SHA512 cc51e27a55ed646ee376aa1b1bffe28369d80e4b8c484c9711de6bdf190694714ef208579d0399b5c199b5619491d72dede1b1f6c03b89cf3a53e8519a4d4fcf
 DIST seahorse-42.0.tar.xz 1395040 BLAKE2B ae40d587c881851014b1989af986993768598a6a530f281cef3e177f0e6dbb3a97ec5128c5f39a463f69a4dfabb5c9f95af1dd3de7af12247338b8003c102ea3 SHA512 2a961a4054360c9a4fe0e9e360d6ea621a65325db8e40365e75d747cfe751c2dc3230ff51ffe0435d24766a91e8a042b8c01183fd58a70974a7ad095af8d247e
 EBUILD seahorse-41.0-r1.ebuild 1793 BLAKE2B 645023facb8b3c3bcb7eec6569396daacd086d45dfac6a8f7f75c2b0d5cf3cf5d9ed87f18433f5fdf198716d438c6a746cb4f00bb2954b00aaeae89789e8834c SHA512 c576865762a9e56d2dbbf46745e3b27e6abb6f4f8efa48a3e549a44d9bbf4f2f227deb741b5625ec172a621c65c0ca855d67a44be7b3190729f11b090e7175c5
-EBUILD seahorse-42.0.ebuild 1705 BLAKE2B 955e26e368a571f08dc58b2e8da751e61032f443de9261ab29d8b4772aa926c2f9dfac4ac6b0e0960d8c54c85b75f70fe6f657564dee99f6bf9d69d7f546ab21 SHA512 3b9567f59f63bed6ed9651d9215ab8266e98fb249de7a9ee04c78010903d4ef6ad4ba5a71ca218331221c43a7a773d47de7f2b7a9af5d84f617bac0bda74a807
+EBUILD seahorse-42.0.ebuild 1703 BLAKE2B ab700180c7f4f12df73ae6e11a58e63704e304792ee43cb55c11809c0a958d801bd02b54baedd7384be0bd3cd4e8b3ae1b121bf02f2967904cb0150ddfc334d4 SHA512 36adbce337a2de4acb885f132032be45a2579dade587ed1097776abc676791812335e80e8c541c9775ed89e65886f27b78b64d811706c33ecaaafc81049d5353
 MISC metadata.xml 743 BLAKE2B 90fed564b56f7e7a781f197eb09ebbca90ac0bd3c93ee1b65eec7e35420fcdd8bf0c0bf67cbf2109a55de590f32b48d3837a70844bb7e6e50819a8b67c868369 SHA512 99872b87aa52c0fe0584d11186fed74d0ade69e083395b030af3a22ba031a91467247c9c72e8cfa45b114192ebc13ed593a2634aec7db5a2b8efa1e2af6a0791
diff --git a/app-crypt/seahorse/seahorse-42.0.ebuild b/app-crypt/seahorse/seahorse-42.0.ebuild
index 0aeb990bc5c0..c77ad462cb6e 100644
--- a/app-crypt/seahorse/seahorse-42.0.ebuild
+++ b/app-crypt/seahorse/seahorse-42.0.ebuild
@@ -11,7 +11,7 @@ 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
diff --git a/app-crypt/signify/Manifest b/app-crypt/signify/Manifest
index 4c06d1bc7218..7c98db69ecaa 100644
--- a/app-crypt/signify/Manifest
+++ b/app-crypt/signify/Manifest
@@ -2,6 +2,9 @@ AUX signify-30-man_compress.patch 576 BLAKE2B b6c82f0737dcfd569bc781d84eaecad2c0
 DIST signify-30.sha.sig 246 BLAKE2B b5c26ad1d90ce562a5e6e8cb0a26c031da6bcc9d04cdd668f7b81410ba38ef1777db8f1a4b38fc515c251c840baf38e3df6b3f730a59a0921180ccb88f457fe5 SHA512 b0aea8736b4508ce5a45a296e11150218d694351b15d87478cad235869a6b0150d1893247d1600ea1679d47e71e87e629f5cf4932ecafa2ad4f05aa962f1743d
 DIST signify-30.tar.gz 94593 BLAKE2B 2d432cef9990a8ce23d0f05449ef02dcf7a00f4328a25dcab98cd25c2c74875fd8ea7ed7a67b7e4ac6c9f432a91564edcc1fc9260627c37352c19cc17581aea3 SHA512 4a1ebcdbf7aa74865b97cadbf5380460702306b6d0a77306e6c943bb0c3419ca929ecd3455522da4448d780a56c8eddeb26fb4d7fb006fc3bf23f69693c39e87
 DIST signify-30.tar.xz 73824 BLAKE2B 27de72ac82d9b66346185292cad71e57af0767111123ba0c618a7d5d4add2e5502b546ffd53ffa2956c66b8f00d2b1a96d21958125d5649d6efb23254c0f56ac SHA512 e760fd89de8a3fea76bd0aa52c683e1d331968620190f4ac487bbca30da00f8d6e2636bbe3c59b0e6fa925b1bbcf81516f50c0bc37707ae7e7465b61fee5c372
+DIST signify-31.sha.sig 246 BLAKE2B bb2dc91aeaa6dde10a1cc43f26385479509ade9d02ea6839b3305ae51623f60c281ca881097b66839b6e3297bdf25d4b2daa1e49b82ea0cdfbf628c7e21f7f28 SHA512 c83453a81382b8841054c749fdaef8d122edc9a96a0a92cead8f7141dcb57cfe18770e7777e7dcd1908ddc7d4c747088d5979537a3484b0859ce8d530db6d65c
+DIST signify-31.tar.xz 83480 BLAKE2B 090d0b326d549cd89f6f8fd86063455670d1d3915a8ab31ddc732cabb0b72b6ba8e00b3354b61369bde7caeec67eef41c012be66dd2e3212112f9a97cc63afbf SHA512 f39597ea278a7eb10b786909752fde59e16405f0bc76c9906f8014e9e7f6801b4733479eec765fb960b6062359954caf54a3460ff67258a9cff93fa978951962
 EBUILD signify-30-r2.ebuild 1181 BLAKE2B 2879a19c8cf90ff0fa5e3d076edab26c686af9c368e6beeef77cb039ae5ea7f32b4a7115b04d7650d16cbf695b6a1f198d7b070ad0e790f19c255e835ee19707 SHA512 3b5f3ab4508e9d7e3bf4e7521aaecf37ebafe6e00f0b86c03f0acd9f998f7d32d392b9c5dbd47f10d83d85764cde033d4bd3ed7dac8f80b61169342536ae02c4
 EBUILD signify-30.ebuild 616 BLAKE2B 970eeb3f56883853c77608f81af3f712d8057bb71cd5c99565a551a5e1a267358cf21e52c9e020461c8cfff09b18170cb3fb26645e8c811f9694e3169494de89 SHA512 3973c9115bf57c8582575a3791dae541bd3125241b0bfee2c046c795e627d818db8910fba83acb997fc8c27525df172908c136435006bc3fd4da571d5611f0b1
+EBUILD signify-31.ebuild 1187 BLAKE2B cca26c100e6472889291ffb7ff42f360a4793eb607706a2f221f2cf9d2818e1c2cf13873b078ee33a33c2153fcc9b1fea73c6dec72b70bd85ddeeeadc621096c SHA512 a21c250a9dce0f9f2bea7fdca4fa20f4c4766188f7f982404ee18d09f0e8ced40de3de8a88a829f5ba8d1fc188d3b2eef09ddff1b0cd011ddca07f858b2223ae
 MISC metadata.xml 437 BLAKE2B 75f7f8a4b2475b052a41134e41ab274386c5f59847bad67ad3d8bd447984a2b42a119bbc60b13df0ebed9988f98ea5382c4aff4fa093cf44c7c8d2907d0db26a SHA512 ce3b623779a2b51556bb440df1b08f386f9fcdca641d1c0b06b3c2f0d1e98649ca8b45d8b32406f7b2b53a6f781c58121da09802c1fedb76e0c604c0a3627f44
diff --git a/app-crypt/signify/signify-31.ebuild b/app-crypt/signify/signify-31.ebuild
new file mode 100644
index 000000000000..aa839d08ee4c
--- /dev/null
+++ b/app-crypt/signify/signify-31.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+VERIFY_SIG_METHOD="signify"
+inherit toolchain-funcs verify-sig
+
+DESCRIPTION="Cryptographically sign and verify files"
+HOMEPAGE="http://www.openbsd.org/ https://github.com/aperezdc/signify"
+SRC_URI="
+	https://github.com/aperezdc/${PN}/releases/download/v${PV}/${P}.tar.xz
+	verify-sig? (
+		https://github.com/aperezdc/${PN}/releases/download/v${PV}/SHA256.sig
+			-> ${P}.sha.sig
+	)"
+
+LICENSE="BSD-1"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
+
+RDEPEND="!net-mail/signify
+	>=dev-libs/libbsd-0.7"
+DEPEND="${RDEPEND}"
+BDEPEND="verify-sig? ( sec-keys/signify-keys-signify )"
+
+PATCHES=( "${FILESDIR}"/${PN}-30-man_compress.patch )
+
+VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}/usr/share/signify-keys/${PN}-30.pub"
+
+src_unpack() {
+	if use verify-sig; then
+		# Too many levels of symbolic links
+		cp "${DISTDIR}"/${P}.{sha.sig,tar.xz} "${WORKDIR}" || die
+		verify-sig_verify_signed_checksums \
+			${P}.sha.sig sha256 ${P}.tar.xz
+	fi
+	default
+}
+
+src_configure() {
+	tc-export CC
+}
+
+src_install() {
+	emake DESTDIR="${ED}" PREFIX="/usr" install
+	einstalldocs
+}