gentoo resync : 12.05.2022

author: V3n3RiX <venerix@koprulu.sector> 2022-05-12 16:42:50 +0300
committer: V3n3RiX <venerix@koprulu.sector> 2022-05-12 16:42:50 +0300
commit: 752d6256e5204b958b0ef7905675a940b5e9172f (patch)
tree: 330d16e6362a49cbed8875a777fe641a43376cd3 /app-crypt
parent: 0c100b7dd2b30e75b799d806df4ef899fd98e1ea (diff)
110 files changed, 505 insertions, 1544 deletions
diff --git a/app-crypt/Manifest.gz b/app-crypt/Manifest.gz
index dd4dca522207..5d17f871c317 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 c1ab262f66c3..570652869b6a 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.2.tar.gz 248581 BLAKE2B 13d13a86a904909272c271d52d579065a7c84263ef2169b282b3bf270f33c7a8405aca640724120c08d1f495ea2a39035d46e1ec7f7eecfc093ce4dfa7c33b7d SHA512 6bd40951df02e3eaa1ed0efd8767acb5245e9c26c666ec7087db2cd0a38b65ea3c79ade98be954b4fbde0e89b6a988ac1c85ce2a6bd77b33574fb3fc0266ea03
-EBUILD acme-sh-3.0.2-r1.ebuild 1176 BLAKE2B a3556e98d9a7fda0b106568bd941e0fd47b66a1bb30f4849e07e352606f486e00a91dff59ed52e93bdaf92495795c37aa7d9b4770183bf06b8acb45f7e612196 SHA512 d27105ac59311219987d5fccd61a48e5090d79bf12880fe036a282da5be270c6a48193271fd7087a469de42fffa0481f307938abc09b656807bc6b63ef8bfb4a
+DIST acme.sh-3.0.3.tar.gz 253111 BLAKE2B 43b97b033e5e16412e8a958966077ba6b26c49b17206cda5af848b7f9fbf8a8f8bc406b63a13f792dfa93ff7b0759da03a0f599c43f92d25587b582feb59a3cf SHA512 b26f20422a3b40d6c1acbdd52d41124962975313f4187cf918746ad9dc047600a92e529cd1e66ede5b456e253522920b574cb614f455dd73aac707a18f34ad35
+EBUILD acme-sh-3.0.3.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.2-r1.ebuild b/app-crypt/acme-sh/acme-sh-3.0.3.ebuild
index 388ce2e32f48..388ce2e32f48 100644
--- a/app-crypt/acme-sh/acme-sh-3.0.2-r1.ebuild
+++ b/app-crypt/acme-sh/acme-sh-3.0.3.ebuild
diff --git a/app-crypt/acme/Manifest b/app-crypt/acme/Manifest
index 15eced4c2cb9..bdae7dadf702 100644
--- a/app-crypt/acme/Manifest
+++ b/app-crypt/acme/Manifest
@@ -1,8 +1,8 @@
-DIST certbot-1.24.0.tar.gz 1360049 BLAKE2B e1c7f4b56ac66b73f74eb8c9d6c31bc12529c2e7a1a51679e715227e61a2e72a30aa5053abe1684be9d665e399ca67f2d11afcc5c60c76bb86d1c0feb68308ca SHA512 fa2a45e650107f48da1e5d7d7469e8a23598e0e0e1127bc62a66ba2351a8fe518da6ec3e53370f7042631ee74e82c65fcc323c71e8f485911363e805ccb6f045
 DIST certbot-1.25.0.tar.gz 1362891 BLAKE2B c109f7777328dcaa2760b524a005f648f8695518a3a052a1d3ff20367f0b704c2a15c912ede091ef6f0f2faf2838caaa74d3bdac6deeb4cc069e6ca16cfb26a7 SHA512 e32cac530d7854cb626aed6d7bac7b4482b7c3634d94fbabd6fa767f9c1268ed3baed0c945362df247e4fc7d51147e5561825850d52c1a8f11b3a1fb2827bd4a
 DIST certbot-1.26.0.tar.gz 1364070 BLAKE2B f9b13df8fb424e579293280202b71756c37a3ec7f986da38a5fd318d00ab7e2ed89223c62a20448ad30271783bb3c44db11a0ce4afebced9f1e9ca4e4c6de3f2 SHA512 bd27cb0a0ef6fc143a3d0dcf5d530d336b93a24d7010e6427c25614befb815f33076b4a3043bb247cafdfad17b8714a19ead43257c64f4fd72ac99f02cb07cde
-EBUILD acme-1.24.0.ebuild 1140 BLAKE2B c7d9a0aadb9fc19e0952bf952efd9ee9b9279a0f2a01725df139116cbf63ee5d7ba2cac0d87ec27d83017c764c3720c5045aa5a2154a8533910c085baa6f9f6d SHA512 e74f2386ba68c226740e5e61f8a76088bf26a8f13e1f269b8c11c7e978da13b0852b6ca2b129021febd690c2a2ba490c332edd68420a4667bde0fd17c5ad0d6c
-EBUILD acme-1.25.0.ebuild 1142 BLAKE2B 53a5d26bdec0161638b21e37b8f274de986e029568ec4ac83fa92fe4ba5596f7b30b6cc07527f2c251a3009ab851ea57ff7c1c298d59defa65fde67647815c0f SHA512 dcb6317e211f649b2b4923d3912761454e72094bab3ca505194eef240deabadade81f7bf49c42e42d3b1e77398130c7dd85092ea593523b66c3ade7d82273d5b
-EBUILD acme-1.26.0.ebuild 1142 BLAKE2B 53a5d26bdec0161638b21e37b8f274de986e029568ec4ac83fa92fe4ba5596f7b30b6cc07527f2c251a3009ab851ea57ff7c1c298d59defa65fde67647815c0f SHA512 dcb6317e211f649b2b4923d3912761454e72094bab3ca505194eef240deabadade81f7bf49c42e42d3b1e77398130c7dd85092ea593523b66c3ade7d82273d5b
+DIST certbot-1.27.0.tar.gz 1366469 BLAKE2B e9ec47520e027a9d348e861ea7d070eff4857301be0d42be6965e4159d85ef60866aa70de76edd5e68b0d40d9544075aa28e9aa07a8e04dfbf3e1a7dd77fd1de SHA512 5db7836ae2eda27c088476c149e736ce7f41b85d871cf563c69e021dd8af2d64ed85c1482049edf0dffe6fd0c9591d66be3e22fbf617068600e12691c4802e5e
+EBUILD acme-1.25.0.ebuild 1140 BLAKE2B 93b2947d02cb8de8680b605bccc0b8aa1197e9962d423943826b617f7f9702cbc8312143468c26101c0950d668ec17d697d4e51805119f2ae83e129ccb17fdb1 SHA512 a570b29c4fb3d6081df33667ffe40f35e93439952e72e7d7c63b435f470aa011fe184303bde315d8a6773ccc004dd737b679eaeb3fdff97f6fd5cb8901cea8db
+EBUILD acme-1.26.0.ebuild 1140 BLAKE2B 93b2947d02cb8de8680b605bccc0b8aa1197e9962d423943826b617f7f9702cbc8312143468c26101c0950d668ec17d697d4e51805119f2ae83e129ccb17fdb1 SHA512 a570b29c4fb3d6081df33667ffe40f35e93439952e72e7d7c63b435f470aa011fe184303bde315d8a6773ccc004dd737b679eaeb3fdff97f6fd5cb8901cea8db
+EBUILD acme-1.27.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.25.0.ebuild b/app-crypt/acme/acme-1.25.0.ebuild
index be518d606627..da63ed453043 100644
--- a/app-crypt/acme/acme-1.25.0.ebuild
+++ b/app-crypt/acme/acme-1.25.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.26.0.ebuild
index be518d606627..da63ed453043 100644
--- a/app-crypt/acme/acme-1.26.0.ebuild
+++ b/app-crypt/acme/acme-1.26.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.24.0.ebuild b/app-crypt/acme/acme-1.27.0.ebuild
index d0b11ae153a4..be518d606627 100644
--- a/app-crypt/acme/acme-1.24.0.ebuild
+++ b/app-crypt/acme/acme-1.27.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
 
@@ -27,7 +27,7 @@ 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/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}]
diff --git a/app-crypt/argon2/Manifest b/app-crypt/argon2/Manifest
index 63522adaa4d0..acac90f30fe0 100644
--- a/app-crypt/argon2/Manifest
+++ b/app-crypt/argon2/Manifest
@@ -1,3 +1,3 @@
 DIST argon2-20190702.tar.gz 1505307 BLAKE2B fa9c3dde7b39c8d797a3d6b52992ebfe35f5eba1c7d7b3aa02c440edc36a3f5186cacee2e39e27ed7c6356dc1970dac0e8198d6f2065eb63ff77f9dfb2937cf8 SHA512 0a4cb89e8e63399f7df069e2862ccd05308b7652bf4ab74372842f66bcc60776399e0eaf979a7b7e31436b5e6913fe5b0a6949549d8c82ebd06e0629b106e85f
-EBUILD argon2-20190702-r1.ebuild 1363 BLAKE2B 49cf923442a666901226ab667275dd0037430cf7c6e2ba32596d43cb6a0277f024feeaaab58ef5baf89399cbe4bebf59772a840eedd0afe8f1bd2c2faaaef546 SHA512 447c0603229045d479a95451105b72b370d01f1bcc9afc6ade6b1e124bf1ccd1cd72471ff75429d4ce1c3f361795088c2259726d3020d8d94f5ec46112564be9
+EBUILD argon2-20190702-r1.ebuild 1370 BLAKE2B f48159ebdfc179378bbb9bc8f61c33a0e00cdd9ba50b2d3df3c4aa3e5b7876c0e5940b137dc2090e15455f86ba4d297d5a8bc8e5be903b4fc4b007e8aaef0177 SHA512 331201bf0ef489c383e28529a0d058d0e9a3bf1cb5e82ed57dcd12af15b2f59afa7380e6fa59db204f4e069963c148fe973b5a596f1ee806d15b8ecb308705ca
 MISC metadata.xml 669 BLAKE2B a29e9ed5c8f1d6a91cefed3273a3e6a81258c44d4653e98cc32c5a92c3b5d7ea88a316795f56c345c18e0cc6166939ae85e05d538c24245c7141e1dc5c644745 SHA512 acf451c558fc2b080d398c8f94f9d0a42b6c15b13bd8020271199f3616774207c820ee3e2d5d3c674b56e2f7de8b8a60bef171c1eab7fc9fe16dd9bfcd9245a8
diff --git a/app-crypt/argon2/argon2-20190702-r1.ebuild b/app-crypt/argon2/argon2-20190702-r1.ebuild
index 1c8889d043d4..c7862036ebec 100644
--- a/app-crypt/argon2/argon2-20190702-r1.ebuild
+++ b/app-crypt/argon2/argon2-20190702-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/P-H-C/phc-winner-argon2/archive/${PV}.tar.gz -> ${P}
 
 LICENSE="|| ( Apache-2.0 CC0-1.0 )"
 SLOT="0/1"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 IUSE="static-libs"
 
 S="${WORKDIR}/phc-winner-${P}"
diff --git a/app-crypt/certbot-apache/Manifest b/app-crypt/certbot-apache/Manifest
index caf3d9194a11..8c4f9017e47d 100644
--- a/app-crypt/certbot-apache/Manifest
+++ b/app-crypt/certbot-apache/Manifest
@@ -1,8 +1,8 @@
-DIST certbot-1.24.0.tar.gz 1360049 BLAKE2B e1c7f4b56ac66b73f74eb8c9d6c31bc12529c2e7a1a51679e715227e61a2e72a30aa5053abe1684be9d665e399ca67f2d11afcc5c60c76bb86d1c0feb68308ca SHA512 fa2a45e650107f48da1e5d7d7469e8a23598e0e0e1127bc62a66ba2351a8fe518da6ec3e53370f7042631ee74e82c65fcc323c71e8f485911363e805ccb6f045
 DIST certbot-1.25.0.tar.gz 1362891 BLAKE2B c109f7777328dcaa2760b524a005f648f8695518a3a052a1d3ff20367f0b704c2a15c912ede091ef6f0f2faf2838caaa74d3bdac6deeb4cc069e6ca16cfb26a7 SHA512 e32cac530d7854cb626aed6d7bac7b4482b7c3634d94fbabd6fa767f9c1268ed3baed0c945362df247e4fc7d51147e5561825850d52c1a8f11b3a1fb2827bd4a
 DIST certbot-1.26.0.tar.gz 1364070 BLAKE2B f9b13df8fb424e579293280202b71756c37a3ec7f986da38a5fd318d00ab7e2ed89223c62a20448ad30271783bb3c44db11a0ce4afebced9f1e9ca4e4c6de3f2 SHA512 bd27cb0a0ef6fc143a3d0dcf5d530d336b93a24d7010e6427c25614befb815f33076b4a3043bb247cafdfad17b8714a19ead43257c64f4fd72ac99f02cb07cde
-EBUILD certbot-apache-1.24.0.ebuild 945 BLAKE2B 11822156671a8a090c234685393f7a1e832f03eb168d7c65775163fbbfde98cf47e106466e68f11b0036536bd380764bc153ce7f73e9b2b1115893324ad8a621 SHA512 aa6605c150f841510e7b1eee3ef4a8a2edd4f9cccb28dd66d3c3ad9aac029c0b3c6c0aff189ca9e2621fba93ad0cb11a80a6f7ea75892d4c32876cd381752c6f
-EBUILD certbot-apache-1.25.0.ebuild 947 BLAKE2B 57472217512ae222c82d13b4f4d9ad0298c4ecf3f177714e0fa82486e94b6f49a2db45ec125c1af349e63cd24c432f3e24d67f61e2725da031988d38aa8dfa09 SHA512 2712fed72fa6a444ec6fd048cb47760580c432eb73ae2bd6167523a7e512489b241d7f7eef567980b2d188c9755abc35b3cd304044b6e5304aa002901c5cf9b3
-EBUILD certbot-apache-1.26.0.ebuild 947 BLAKE2B 57472217512ae222c82d13b4f4d9ad0298c4ecf3f177714e0fa82486e94b6f49a2db45ec125c1af349e63cd24c432f3e24d67f61e2725da031988d38aa8dfa09 SHA512 2712fed72fa6a444ec6fd048cb47760580c432eb73ae2bd6167523a7e512489b241d7f7eef567980b2d188c9755abc35b3cd304044b6e5304aa002901c5cf9b3
+DIST certbot-1.27.0.tar.gz 1366469 BLAKE2B e9ec47520e027a9d348e861ea7d070eff4857301be0d42be6965e4159d85ef60866aa70de76edd5e68b0d40d9544075aa28e9aa07a8e04dfbf3e1a7dd77fd1de SHA512 5db7836ae2eda27c088476c149e736ce7f41b85d871cf563c69e021dd8af2d64ed85c1482049edf0dffe6fd0c9591d66be3e22fbf617068600e12691c4802e5e
+EBUILD certbot-apache-1.25.0.ebuild 945 BLAKE2B 11822156671a8a090c234685393f7a1e832f03eb168d7c65775163fbbfde98cf47e106466e68f11b0036536bd380764bc153ce7f73e9b2b1115893324ad8a621 SHA512 aa6605c150f841510e7b1eee3ef4a8a2edd4f9cccb28dd66d3c3ad9aac029c0b3c6c0aff189ca9e2621fba93ad0cb11a80a6f7ea75892d4c32876cd381752c6f
+EBUILD certbot-apache-1.26.0.ebuild 945 BLAKE2B 11822156671a8a090c234685393f7a1e832f03eb168d7c65775163fbbfde98cf47e106466e68f11b0036536bd380764bc153ce7f73e9b2b1115893324ad8a621 SHA512 aa6605c150f841510e7b1eee3ef4a8a2edd4f9cccb28dd66d3c3ad9aac029c0b3c6c0aff189ca9e2621fba93ad0cb11a80a6f7ea75892d4c32876cd381752c6f
+EBUILD certbot-apache-1.27.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.25.0.ebuild b/app-crypt/certbot-apache/certbot-apache-1.25.0.ebuild
index cf0c9621b1ae..85b55229a0d2 100644
--- a/app-crypt/certbot-apache/certbot-apache-1.25.0.ebuild
+++ b/app-crypt/certbot-apache/certbot-apache-1.25.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.26.0.ebuild
index cf0c9621b1ae..85b55229a0d2 100644
--- a/app-crypt/certbot-apache/certbot-apache-1.26.0.ebuild
+++ b/app-crypt/certbot-apache/certbot-apache-1.26.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.24.0.ebuild b/app-crypt/certbot-apache/certbot-apache-1.27.0.ebuild
index 85b55229a0d2..cf0c9621b1ae 100644
--- a/app-crypt/certbot-apache/certbot-apache-1.24.0.ebuild
+++ b/app-crypt/certbot-apache/certbot-apache-1.27.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-nginx/Manifest b/app-crypt/certbot-nginx/Manifest
index 3e24039ced2b..721363470e7d 100644
--- a/app-crypt/certbot-nginx/Manifest
+++ b/app-crypt/certbot-nginx/Manifest
@@ -1,8 +1,8 @@
-DIST certbot-1.24.0.tar.gz 1360049 BLAKE2B e1c7f4b56ac66b73f74eb8c9d6c31bc12529c2e7a1a51679e715227e61a2e72a30aa5053abe1684be9d665e399ca67f2d11afcc5c60c76bb86d1c0feb68308ca SHA512 fa2a45e650107f48da1e5d7d7469e8a23598e0e0e1127bc62a66ba2351a8fe518da6ec3e53370f7042631ee74e82c65fcc323c71e8f485911363e805ccb6f045
 DIST certbot-1.25.0.tar.gz 1362891 BLAKE2B c109f7777328dcaa2760b524a005f648f8695518a3a052a1d3ff20367f0b704c2a15c912ede091ef6f0f2faf2838caaa74d3bdac6deeb4cc069e6ca16cfb26a7 SHA512 e32cac530d7854cb626aed6d7bac7b4482b7c3634d94fbabd6fa767f9c1268ed3baed0c945362df247e4fc7d51147e5561825850d52c1a8f11b3a1fb2827bd4a
 DIST certbot-1.26.0.tar.gz 1364070 BLAKE2B f9b13df8fb424e579293280202b71756c37a3ec7f986da38a5fd318d00ab7e2ed89223c62a20448ad30271783bb3c44db11a0ce4afebced9f1e9ca4e4c6de3f2 SHA512 bd27cb0a0ef6fc143a3d0dcf5d530d336b93a24d7010e6427c25614befb815f33076b4a3043bb247cafdfad17b8714a19ead43257c64f4fd72ac99f02cb07cde
-EBUILD certbot-nginx-1.24.0.ebuild 963 BLAKE2B ef69ff6b60789e3339091a31c52b8b3ca8ede1cb84c877e741eb975e860d295d03b85345a3ace63baf2f24fb3f6fd8dc14e81e769ed09fb92efe17e37d155299 SHA512 05c3214eb5ae0fb4ae2df86da5196d1c45627431d7e7462d650a71f7e7645a4cb991cd31c4be03a72919d222fa8b228a549374c6442c4f0055c8dab87a41047e
-EBUILD certbot-nginx-1.25.0.ebuild 965 BLAKE2B 7b098dd3c540c9fe96750722a696386de685db8e4bc62689e08cc298b3d53fd8561411f7e8366b93999a49aaf2f7dcca7c5b483a49ba873ef7c746f49a36001c SHA512 4acb894e4d79fd1b989cc03cc738a6bc81605eb6d889c31f73a2398aead9b46a5cfbea8c0adc07f079adc21dbcb10655135024bbe2d091fdb748d71b0ff98539
-EBUILD certbot-nginx-1.26.0.ebuild 965 BLAKE2B 7b098dd3c540c9fe96750722a696386de685db8e4bc62689e08cc298b3d53fd8561411f7e8366b93999a49aaf2f7dcca7c5b483a49ba873ef7c746f49a36001c SHA512 4acb894e4d79fd1b989cc03cc738a6bc81605eb6d889c31f73a2398aead9b46a5cfbea8c0adc07f079adc21dbcb10655135024bbe2d091fdb748d71b0ff98539
+DIST certbot-1.27.0.tar.gz 1366469 BLAKE2B e9ec47520e027a9d348e861ea7d070eff4857301be0d42be6965e4159d85ef60866aa70de76edd5e68b0d40d9544075aa28e9aa07a8e04dfbf3e1a7dd77fd1de SHA512 5db7836ae2eda27c088476c149e736ce7f41b85d871cf563c69e021dd8af2d64ed85c1482049edf0dffe6fd0c9591d66be3e22fbf617068600e12691c4802e5e
+EBUILD certbot-nginx-1.25.0.ebuild 963 BLAKE2B ef69ff6b60789e3339091a31c52b8b3ca8ede1cb84c877e741eb975e860d295d03b85345a3ace63baf2f24fb3f6fd8dc14e81e769ed09fb92efe17e37d155299 SHA512 05c3214eb5ae0fb4ae2df86da5196d1c45627431d7e7462d650a71f7e7645a4cb991cd31c4be03a72919d222fa8b228a549374c6442c4f0055c8dab87a41047e
+EBUILD certbot-nginx-1.26.0.ebuild 963 BLAKE2B ef69ff6b60789e3339091a31c52b8b3ca8ede1cb84c877e741eb975e860d295d03b85345a3ace63baf2f24fb3f6fd8dc14e81e769ed09fb92efe17e37d155299 SHA512 05c3214eb5ae0fb4ae2df86da5196d1c45627431d7e7462d650a71f7e7645a4cb991cd31c4be03a72919d222fa8b228a549374c6442c4f0055c8dab87a41047e
+EBUILD certbot-nginx-1.27.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.25.0.ebuild b/app-crypt/certbot-nginx/certbot-nginx-1.25.0.ebuild
index e66a6b39887e..3566b27d06f7 100644
--- a/app-crypt/certbot-nginx/certbot-nginx-1.25.0.ebuild
+++ b/app-crypt/certbot-nginx/certbot-nginx-1.25.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.26.0.ebuild
index e66a6b39887e..3566b27d06f7 100644
--- a/app-crypt/certbot-nginx/certbot-nginx-1.26.0.ebuild
+++ b/app-crypt/certbot-nginx/certbot-nginx-1.26.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.24.0.ebuild b/app-crypt/certbot-nginx/certbot-nginx-1.27.0.ebuild
index 3566b27d06f7..e66a6b39887e 100644
--- a/app-crypt/certbot-nginx/certbot-nginx-1.24.0.ebuild
+++ b/app-crypt/certbot-nginx/certbot-nginx-1.27.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/Manifest b/app-crypt/certbot/Manifest
index fdf78ad56ae5..e8a8cbc27be1 100644
--- a/app-crypt/certbot/Manifest
+++ b/app-crypt/certbot/Manifest
@@ -1,8 +1,8 @@
-DIST certbot-1.24.0.tar.gz 1360049 BLAKE2B e1c7f4b56ac66b73f74eb8c9d6c31bc12529c2e7a1a51679e715227e61a2e72a30aa5053abe1684be9d665e399ca67f2d11afcc5c60c76bb86d1c0feb68308ca SHA512 fa2a45e650107f48da1e5d7d7469e8a23598e0e0e1127bc62a66ba2351a8fe518da6ec3e53370f7042631ee74e82c65fcc323c71e8f485911363e805ccb6f045
 DIST certbot-1.25.0.tar.gz 1362891 BLAKE2B c109f7777328dcaa2760b524a005f648f8695518a3a052a1d3ff20367f0b704c2a15c912ede091ef6f0f2faf2838caaa74d3bdac6deeb4cc069e6ca16cfb26a7 SHA512 e32cac530d7854cb626aed6d7bac7b4482b7c3634d94fbabd6fa767f9c1268ed3baed0c945362df247e4fc7d51147e5561825850d52c1a8f11b3a1fb2827bd4a
 DIST certbot-1.26.0.tar.gz 1364070 BLAKE2B f9b13df8fb424e579293280202b71756c37a3ec7f986da38a5fd318d00ab7e2ed89223c62a20448ad30271783bb3c44db11a0ce4afebced9f1e9ca4e4c6de3f2 SHA512 bd27cb0a0ef6fc143a3d0dcf5d530d336b93a24d7010e6427c25614befb815f33076b4a3043bb247cafdfad17b8714a19ead43257c64f4fd72ac99f02cb07cde
-EBUILD certbot-1.24.0.ebuild 1198 BLAKE2B a68e47a00da38c01662214ba5c8fc7ee424eab0e5901891bf532c662df0313cdadaeb2f6e6275f88219259f72ddccc7e15cc05f3179dbe67f8047be59810cf2a SHA512 801f729a2b7dceb289d61549a7f9659658bae7230337f4b373b1bce680fb21cec06896d4227ffaa8e3d05b620b89af3f42c0870ca82a946e486097e06b097f31
-EBUILD certbot-1.25.0.ebuild 1201 BLAKE2B ad7fab99d0f48ee39b4e5a3a730e02b38cac87f88e491afe2a094eafefd2458aa90c7e54f9ee2f892952d872d1f224034efa3497bd31ad74d1e8c03f6c2301ed SHA512 ed209dfe4b42ba1b2a8d839ad40dab0a18a690b0db1e8388f647b3e1b8e67876015f6d34ee0448d1ab5236f4bfb91a907deb00af0fc43fb8e170152bb5831f49
-EBUILD certbot-1.26.0.ebuild 1201 BLAKE2B ad7fab99d0f48ee39b4e5a3a730e02b38cac87f88e491afe2a094eafefd2458aa90c7e54f9ee2f892952d872d1f224034efa3497bd31ad74d1e8c03f6c2301ed SHA512 ed209dfe4b42ba1b2a8d839ad40dab0a18a690b0db1e8388f647b3e1b8e67876015f6d34ee0448d1ab5236f4bfb91a907deb00af0fc43fb8e170152bb5831f49
+DIST certbot-1.27.0.tar.gz 1366469 BLAKE2B e9ec47520e027a9d348e861ea7d070eff4857301be0d42be6965e4159d85ef60866aa70de76edd5e68b0d40d9544075aa28e9aa07a8e04dfbf3e1a7dd77fd1de SHA512 5db7836ae2eda27c088476c149e736ce7f41b85d871cf563c69e021dd8af2d64ed85c1482049edf0dffe6fd0c9591d66be3e22fbf617068600e12691c4802e5e
+EBUILD certbot-1.25.0.ebuild 1199 BLAKE2B 648f76ab1ddca25e5434f3ece8fbbad530bb8a2f27884b791982decb309600689ed0dfd9e71415cdc662485708110335514c5f9a112a7a5211c9528c68d11863 SHA512 6bc32a620c086ac106e09c1768a9c8b6bd79bad797c4179c66437237e71a6acca2da4822103a577ff979c32a48e9605a235d26eab3439323a19477fce26ea1d6
+EBUILD certbot-1.26.0.ebuild 1199 BLAKE2B 648f76ab1ddca25e5434f3ece8fbbad530bb8a2f27884b791982decb309600689ed0dfd9e71415cdc662485708110335514c5f9a112a7a5211c9528c68d11863 SHA512 6bc32a620c086ac106e09c1768a9c8b6bd79bad797c4179c66437237e71a6acca2da4822103a577ff979c32a48e9605a235d26eab3439323a19477fce26ea1d6
+EBUILD certbot-1.27.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.25.0.ebuild b/app-crypt/certbot/certbot-1.25.0.ebuild
index 0040de76755a..2d3795642b7b 100644
--- a/app-crypt/certbot/certbot-1.25.0.ebuild
+++ b/app-crypt/certbot/certbot-1.25.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}
 
diff --git a/app-crypt/certbot/certbot-1.26.0.ebuild b/app-crypt/certbot/certbot-1.26.0.ebuild
index 0040de76755a..2d3795642b7b 100644
--- a/app-crypt/certbot/certbot-1.26.0.ebuild
+++ b/app-crypt/certbot/certbot-1.26.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}
 
diff --git a/app-crypt/certbot/certbot-1.24.0.ebuild b/app-crypt/certbot/certbot-1.27.0.ebuild
index 625b320d8f65..0040de76755a 100644
--- a/app-crypt/certbot/certbot-1.24.0.ebuild
+++ b/app-crypt/certbot/certbot-1.27.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}
 
@@ -29,7 +29,7 @@ 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-2019.3[${PYTHON_USEDEP}]
diff --git a/app-crypt/coolkey/Manifest b/app-crypt/coolkey/Manifest
index b5161042f5dc..6068b0598d20 100644
--- a/app-crypt/coolkey/Manifest
+++ b/app-crypt/coolkey/Manifest
@@ -1,5 +1,4 @@
 DIST coolkey-1.1.0-patches-003.tar.gz 21263 BLAKE2B 27025b8aa24df45f8efa872122a1c3699db6d0d627861182c7eb1d61b921d026d7e3355d1b3d12608747ed1d214eee764b53dbbc5599c452b347e191e1516eca SHA512 25a5fac68ca041fcf9e927d134d0179fa286e6de75019e7bbf205edeaf73222d9fb9fd3861a8f6e0d933d1a09229e3e727278c3a9b3cc63390ef07774c46390d
 DIST coolkey-1.1.0.tar.gz 432808 BLAKE2B 7e443cdb0dedcec5de32cf5c7cc5eb2d81f1d51fbc2e580fda302153d3f8a919bc89d2308b8799cf395c89d16150e09bd33bc76eacb8af855c54b961bb5d082a SHA512 4b61de9b40abcf620fbb519d5e3cf1e93ebdd0470854cb63a597fc91e0182998217353014327f7bc4f255d22515d8ea2b08d36b3a831f5f09134fdcd418bc08b
-EBUILD coolkey-1.1.0-r7.ebuild 2019 BLAKE2B ded7d0f8142132e7c44702103e5f63d9bae0da84dbdd79b0a9977a221ee29644e10d8394e42d4b4b297e1bacea43a393ad890bf3f27ede7a797551b09d6ba58c SHA512 5bd6912bd7f9945e96995aaaa8794c151fed4d3a41e5ba2c86846bb0dbebe5c9fd09414cb5111bfaad98162bbe032683be0f7204fa07bd98878cf1f75e7de8f1
 EBUILD coolkey-1.1.0-r9.ebuild 2096 BLAKE2B cf968723617586ea25279011bdf3cb2de557be52f68e90d71500094f0e134c9b8f4601ff97d95231b6b5a15de5f425806e4980cfe830226bb9be6963aed9ffb2 SHA512 833e5196d2da412686ac4c89203bea7206e806bb7022fb1e7fcf68800bf94dacbc30d5e54e5f1b28be16bfa46faeddc8757d5fc35eb4ea7da21892160a909afd
 MISC metadata.xml 168 BLAKE2B 2e0e000b4c3b6ca04c12903fdbe278415c05a822623c52e9aa95cbbf3d50bcb1246b7edbda7d2f6b559af8950c6374e6e0a69b76319964cfe686bf50b0604a57 SHA512 4dcf45d1809e8390a2d8155c8ebfe0dd610203e392aeab0ccd8a10f42cc8532a4925eff32b35e7a6c35598a4efd288229034ec0732299dbd8cfa0acff705fed3
diff --git a/app-crypt/coolkey/coolkey-1.1.0-r7.ebuild b/app-crypt/coolkey/coolkey-1.1.0-r7.ebuild
deleted file mode 100644
index 4a15201f3fba..000000000000
--- a/app-crypt/coolkey/coolkey-1.1.0-r7.ebuild
+++ /dev/null
@@ -1,82 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PATCHVER="003"
-
-DESCRIPTION="Linux Driver support for the CoolKey and CAC products"
-HOMEPAGE="https://directory.fedora.redhat.com/wiki/CoolKey"
-SRC_URI="https://directory.fedora.redhat.com/download/coolkey/${P}.tar.gz
-	mirror://gentoo/${P}-patches-${PATCHVER}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="debug"
-
-RDEPEND=">=sys-apps/pcsc-lite-1.6.4
-	dev-libs/nss[utils]
-	sys-libs/zlib"
-DEPEND="${RDEPEND}
-	>=app-crypt/ccid-1.4.0"
-BDEPEND="virtual/pkgconfig"
-
-PATCHES=(
-	"${WORKDIR}/${PN}-patches"
-)
-
-pkg_setup() {
-	pk="pk11install"
-	dbdir="/etc/pki/nssdb"
-	ck_mod_name="CoolKey PKCS #11 Module"
-
-	if ! [[ -x $dbdir ]]; then
-		ewarn "No /etc/pki/nssdb found; check under \$HOME/.pki and"
-		ewarn "follow the suggested commands using the correct path."
-	fi
-}
-
-src_configure() {
-	econf \
-		--enable-pk11install \
-		$(use_enable debug)
-}
-
-src_compile() {
-	emake CFLAGS+="-fno-strict-aliasing" -j1
-}
-
-src_install() {
-	emake DESTDIR="${D}" install -j1
-	einstalldocs
-}
-
-pkg_postinst() {
-	if [[ -x $dbdir ]]; then
-		if ! $(modutil -rawlist -dbdir $dbdir | grep libcoolkeypk11); then
-			elog "You still need to install libcoolkey in your PKCS11 library:"
-			elog "$pk -p $dbdir 'name=$ck_mod_name library=libcoolkeypk11.so'"
-
-		fi
-	else
-		elog ""
-		elog "You still need to setup your PKCS11 library, or at least"
-		elog "find where it is (perhaps \$HOME/.pki/nssdb).  Once you"
-		elog "find it, use 'modutil -rawlist -dbdir \$db' to look for"
-		elog "libcoolkeypk11.so, and if not found, add it using:"
-		elog ""
-		elog "$pk -p \$db 'name=$ck_mod_name library=libcoolkeypk11.so'"
-		elog ""
-		elog "where \$db is the full path to your pki/nssdb directory."
-		elog ""
-	fi
-}
-
-pkg_postrm() {
-	if [[ -x $dbdir ]]; then
-		if $(modutil -rawlist -dbdir $dbdir | grep libcoolkeypk11); then
-			elog "You should remove libcoolkey from your PKCS11 library."
-		fi
-	fi
-}
diff --git a/app-crypt/dieharder/Manifest b/app-crypt/dieharder/Manifest
index 226f8ce2572d..30d32ab71d1e 100644
--- a/app-crypt/dieharder/Manifest
+++ b/app-crypt/dieharder/Manifest
@@ -2,5 +2,5 @@ AUX dieharder-3.31.1-build.patch 4500 BLAKE2B 03317321419ef75c0d20300c3ae178702c
 AUX dieharder-3.31.1-cross-compile.patch 2048 BLAKE2B aee35b8d192a2e78fe1da2a35ad662c30764cc07dbf861d3ded9d551f880b5473d63a29acbd67eed50b3622c9ecd294f99f211fe14a13b4a5cb8dadef95f2b66 SHA512 effb05cc65ef8b5ca565abaebffa947b162b0d51fa3ae97d7cdff4b278737339a6a3524acc114b462df8756c07180478ea0f82be961d6dc7cc4025941d2c261f
 AUX dieharder-3.31.1-urandom-64bit.patch 2034 BLAKE2B 989640b3d5a946f3d81ec5cee9747329ecb7246b5ab0473b906d42e5faa971d1aaad43ac54be7b7cad1483cc5605ad70c0f71338b9cf9a22616d2662318bed57 SHA512 2a8d7f766b1eff4911e6aa7cd788cbbffe6ed05cfd27053042d8631786164383ca56783c43a2b4403e5cbf45c2d3d83fd46e427490d3bc2dd8eca880ea3e93da
 DIST dieharder-3.31.1.tgz 1149780 BLAKE2B 12937b54e713ce87d6cb815b9b1e00989085b7661538316649caea4a514518528039441d0d42f377c363c62db179f362feb9d64612a75f724ac363744f884a47 SHA512 e01ed4266b4fe5d5fadde3c92c30e430d0ca5f7fedd26b26ed2ab98b7602aa9c35bb5c8fd9314ef2f5235b5087645ab13e5e6550156e26643baa5aeb77088dc5
-EBUILD dieharder-3.31.1-r4.ebuild 1160 BLAKE2B f15ce36751d025742af93828961bf5c35bd411c56ac244594cdf4f050b2597eea6a5c70b286d274098e65fe2696d573c43213ef299b37f9be6f974a5cfd6414d SHA512 8c4ea4e25cbc9a82758be7d2d0b1778d0fc541c46c1078c9ae50039696332231f117c806d343988046ad8a4c318cc91f0e648307c7f840791502c01917f689b7
+EBUILD dieharder-3.31.1-r4.ebuild 1167 BLAKE2B 28826c2b9c4200e1d523a4d7db0d927c70640fb546248b636b78090daf48cda459adffb456b09b310e85f2303b72922618857e4896fcd0fe242b6edfca3aa62a SHA512 7282d3b51bfe416a36878a7a3e62da2c04f698c7660c7c9b61ee8c041c1d45ace1acfac1f2f3e0f838b67ae3d86643a3fc0bed9e9ce43f78c83898c3b3b1ae49
 MISC metadata.xml 168 BLAKE2B 2e0e000b4c3b6ca04c12903fdbe278415c05a822623c52e9aa95cbbf3d50bcb1246b7edbda7d2f6b559af8950c6374e6e0a69b76319964cfe686bf50b0604a57 SHA512 4dcf45d1809e8390a2d8155c8ebfe0dd610203e392aeab0ccd8a10f42cc8532a4925eff32b35e7a6c35598a4efd288229034ec0732299dbd8cfa0acff705fed3
diff --git a/app-crypt/dieharder/dieharder-3.31.1-r4.ebuild b/app-crypt/dieharder/dieharder-3.31.1-r4.ebuild
index 75ad6f0f329b..c6ed2a02f63b 100644
--- a/app-crypt/dieharder/dieharder-3.31.1-r4.ebuild
+++ b/app-crypt/dieharder/dieharder-3.31.1-r4.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://www.phy.duke.edu/~rgb/General/${PN}/${P}.tgz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
 IUSE="doc"
 RESTRICT="test" # Way too long
 
diff --git a/app-crypt/gcr/Manifest b/app-crypt/gcr/Manifest
index 9227bb8a1ca9..ea3717ac505d 100644
--- a/app-crypt/gcr/Manifest
+++ b/app-crypt/gcr/Manifest
@@ -1,5 +1,8 @@
 AUX 3.38.0-optional-vapi.patch 2278 BLAKE2B 7011aec6831b9488ba19efd41b6f3772af101dac4e2e9759f354a59a7243c45eae4a03583f7a717099fe5b08c813c898228ceeed8afac7b28d4bdb77fe9ac4e0 SHA512 95a9109217cf255e921bbf2504918345d1e32e454a8c44c726cb1df522cca73de785db31e9e71a88d3bfa802c49ae89caaa9c64edc3834c5b491ef15f853313e
 AUX gcr-3.40.0-meson-0.61-build.patch 1634 BLAKE2B 99593b9614831a4a2a47ff4890d1f3a92ceb3fe861bdcd3fa748b51b19645196392e6482dea8bb4330bd39484ecddb74dd8d6dea17beb26f87bb05727b506ee3 SHA512 343c02730611ac4792e572dbfbd14bee5525c9ac00f739b12ce1711b059f00a3c9869e60db33e0dd7010b78dd4bb5309c1cecb29052d97fe68429d0118b98ecc
+AUX gcr-3.41.0-Unbreak-build-without-systemd.patch 766 BLAKE2B 005ba225708f0a676be937e809511e7e478ec16610d1bf068ca9e01c210e3d2567e8a3cdbf513c51b3cff57ad0834526e22f17490432dd7c6fa80a16dec4351a SHA512 2192e3556fb134ebbf0bab7e23f6d3b12da601286532e8a5c8fa52d69ac31a1ec3d8e941ff4d5d91737001306aa594996de58449498b2c93d07f53dec83a8401
 DIST gcr-3.40.0.tar.xz 1011044 BLAKE2B 6b1016f74e5fd3ace32a534a59575db9c39b5deefd2f4f3a747ef7e87a43c7c00b33500d8151009347af9fe6b073c390895bb6e17c577c6e150c780c487b997e SHA512 7118608e7bef7d0cf2eea33cb3286b7f9c3622a38892ce88cf33ed453d343cc33e070831e7b4d0c5cdb43c2e57b3f0b91c7cbd6aa8463982d3af8844b59bcb81
-EBUILD gcr-3.40.0.ebuild 1842 BLAKE2B b9d91ce7515920993d3fd2f6adb2d3ac0c91411786f06bd0e5bbe4f1f9a672c03f65066ac2a7422d988f2c1f1848168ec69f1e9df81620754e2e083595e6b3ff SHA512 dbb13ce757a0ea6fce9af7c9949c63948694b609b5cccf4d458a9e9d95205d090bb84feaaf7e1b8f055b5ebcb7e1056d0f3efa8a5b3f496e593aec96fbe9b377
+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 2005 BLAKE2B 07cea180c588b3b17b0b09b086a7b7244474b5743b26d60458115ba42c70d7d742947bf0953bb16859167e6a3e1d4f11983e7310334aa95cc6591ef864986ea9 SHA512 b354604c63af598162d5bfb239d68e6a7bf3e8687d0b33eea39cb4225626f6f0200047a5f86591605eee4f74193141fbce0e20881b7bfe37224062e5ef67f8b0
 MISC metadata.xml 250 BLAKE2B 8f7f0fe023d43e380e7861e897e6afcb5de4baefb42ea9c65a57dfc0d204c6f787a99295141832e732ebb08be218da56ba77e2dd9639e4e3aabf718ce4db1d0c SHA512 2684e772dd6d83e4b49f08f2ba22d8a0a753e7b46863489eff1b5d1f2f147ad80ffd93245ca405ac4c747249bc1b754454ec9865fe16da70f9b257051e105fd8
diff --git a/app-crypt/gcr/files/gcr-3.41.0-Unbreak-build-without-systemd.patch b/app-crypt/gcr/files/gcr-3.41.0-Unbreak-build-without-systemd.patch
new file mode 100644
index 000000000000..eac12c0a34a2
--- /dev/null
+++ b/app-crypt/gcr/files/gcr-3.41.0-Unbreak-build-without-systemd.patch
@@ -0,0 +1,27 @@
+From 96e76ee482dad2a0d71f9a5a5a6558d272d538ca Mon Sep 17 00:00:00 2001
+From: Antoine Jacoutot <ajacoutot@gnome.org>
+Date: Sun, 24 Oct 2021 10:26:03 +0200
+Subject: [PATCH] Unbreak build without systemd.
+
+This fixes the check for WITH_SYSTEMD and prevents a fatal error:
+'systemd/sd-daemon.h' file not found when building with systemd disabled.
+---
+ gcr/gcr-ssh-agent-service.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/gcr/gcr-ssh-agent-service.c b/gcr/gcr-ssh-agent-service.c
+index 3b5a4ca..b7e8928 100644
+--- a/gcr/gcr-ssh-agent-service.c
++++ b/gcr/gcr-ssh-agent-service.c
+@@ -39,7 +39,7 @@
+ #include <glib/gstdio.h>
+ #include <gcr/gcr-base.h>
+ 
+-#ifdef WITH_SYSTEMD
++#if WITH_SYSTEMD
+ #include <systemd/sd-daemon.h>
+ #endif
+ 
+-- 
+2.35.1
+
diff --git a/app-crypt/gcr/gcr-3.40.0.ebuild b/app-crypt/gcr/gcr-3.40.0.ebuild
index 3a367dc36429..e3ac13de0bef 100644
--- a/app-crypt/gcr/gcr-3.40.0.ebuild
+++ b/app-crypt/gcr/gcr-3.40.0.ebuild
@@ -17,7 +17,7 @@ IUSE="gtk gtk-doc +introspection test +vala"
 REQUIRED_USE="vala? ( introspection )"
 RESTRICT="!test? ( test )"
 
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~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/gcr/gcr-3.41.0.ebuild b/app-crypt/gcr/gcr-3.41.0.ebuild
new file mode 100644
index 000000000000..6a5988f3730b
--- /dev/null
+++ b/app-crypt/gcr/gcr-3.41.0.ebuild
@@ -0,0 +1,89 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit gnome.org gnome2-utils meson python-any-r1 vala xdg
+
+DESCRIPTION="Libraries for cryptographic UIs and accessing PKCS#11 modules"
+HOMEPAGE="https://gitlab.gnome.org/GNOME/gcr"
+
+LICENSE="GPL-2+ LGPL-2+"
+SLOT="0/1" # subslot = suffix of libgcr-base-3 and co
+
+IUSE="gtk gtk-doc +introspection systemd test +vala"
+REQUIRED_USE="vala? ( introspection )"
+RESTRICT="!test? ( test )"
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris"
+
+DEPEND="
+	>=dev-libs/glib-2.44.0:2
+	>=dev-libs/libgcrypt-1.2.2:0=
+	>=app-crypt/p11-kit-0.19.0
+	>=app-crypt/libsecret-0.20
+	systemd? ( sys-apps/systemd:= )
+	gtk? ( >=x11-libs/gtk+-3.22:3[introspection?] )
+	>=sys-apps/dbus-1
+	introspection? ( >=dev-libs/gobject-introspection-1.58:= )
+"
+RDEPEND="${DEPEND}"
+PDEPEND="app-crypt/gnupg"
+BDEPEND="
+	${PYTHON_DEPS}
+	gtk? ( dev-libs/libxml2:2 )
+	dev-util/gdbus-codegen
+	dev-util/glib-utils
+	gtk-doc? (
+		>=dev-util/gtk-doc-1.9
+		app-text/docbook-xml-dtd:4.1.2
+	)
+	>=sys-devel/gettext-0.19.8
+	test? ( app-crypt/gnupg )
+	virtual/pkgconfig
+	vala? ( $(vala_depend) )
+"
+
+PATCHES=(
+	"${FILESDIR}"/3.38.0-optional-vapi.patch
+	"${FILESDIR}"/${PN}-3.40.0-meson-0.61-build.patch
+	"${FILESDIR}"/${P}-Unbreak-build-without-systemd.patch
+)
+
+pkg_setup() {
+	python-any-r1_pkg_setup
+}
+
+src_prepare() {
+	default
+	use vala && vala_setup
+	xdg_environment_reset
+}
+
+src_configure() {
+	local emesonargs=(
+		$(meson_use introspection)
+		$(meson_use gtk)
+		$(meson_use gtk-doc gtk_doc)
+		-Dgpg_path="${EPREFIX}"/usr/bin/gpg
+		-Dssh_agent=true
+		$(meson_feature systemd)
+		$(meson_use vala vapi)
+	)
+	meson_src_configure
+}
+
+src_test() {
+	dbus-run-session meson test -C "${BUILD_DIR}" || die 'tests failed'
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	gnome2_schemas_update
+}
+
+pkg_postrm() {
+	xdg_pkg_postrm
+	gnome2_schemas_update
+}
diff --git a/app-crypt/gnupg/Manifest b/app-crypt/gnupg/Manifest
index 1ee41dc2c13b..0e26d3f11b87 100644
--- a/app-crypt/gnupg/Manifest
+++ b/app-crypt/gnupg/Manifest
@@ -1,12 +1,11 @@
 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.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-r2.ebuild 4788 BLAKE2B 9600cdcf3fb44958d5580caf6d862fbe1ea083618ca0a1c8061213af627df67a104c2d57a359d27421db79da55bd5769edff05255810bc0db47abc450bf18752 SHA512 cd682ba946d0b67dcc491b1bda78617ebf3d23fb371233d65f78a361a9d48fafd73f0a5fae2dc66c88e9da346e094b5b512ae80901a0210241b53d5ca1a8ef77
-EBUILD gnupg-2.2.33-r2.ebuild 4788 BLAKE2B 9600cdcf3fb44958d5580caf6d862fbe1ea083618ca0a1c8061213af627df67a104c2d57a359d27421db79da55bd5769edff05255810bc0db47abc450bf18752 SHA512 cd682ba946d0b67dcc491b1bda78617ebf3d23fb371233d65f78a361a9d48fafd73f0a5fae2dc66c88e9da346e094b5b512ae80901a0210241b53d5ca1a8ef77
+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.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.34-r1.ebuild 4981 BLAKE2B e5b17c8ba84a9d809fb1554bfdf70c08dbe90c75a2a04108f17c51cb9ba72c29249320a99ddae50896a2b51bbb0369047ec3155a1f9b90fdf89f3e9760bcc776 SHA512 5a4cd0c8340f2d5bef91c607a36e00879da1ff7f5793644c0d1e1a1b2392b070afc20cbfc135f8e86360b39754560a9a47b0de8d6963e2a222c42576f17a9b15
-EBUILD gnupg-2.3.4-r2.ebuild 5180 BLAKE2B 4747022264956b033e4180ce32b264986b286980d8fff79a4912ed183b7c53365f5a03da3d3fa872bad540d9294c11d287662f714fd9d00456966dfc3b921acb SHA512 287b25ed9a44d1fe19ac1698f69ff6bcec110a8a145ad62f9622f72b4213532453d19953a035049a30f1acd8d65a5399ab436ce37b4870e33eeb265265a76c9d
+EBUILD gnupg-2.2.35.ebuild 4989 BLAKE2B 6251ec00e3e78f3b0e686c7995b50e884b2202cc8245a3dbd1a9ef8cf089b956e91abf69c21f3e66fdac3595c978564019bbbbaa94e0a3bf8de6c966f968fc85 SHA512 ecb052f9f1beb977ea1a427feb511317d81dc646305d7667e1ce4430a67b46882a6bed637f7df1e6f8e15f16c1314f625d0e317194d083ee641558cf823a9c9b
+EBUILD gnupg-2.3.6.ebuild 5189 BLAKE2B b1ba9b8414bb52c6e217d0a313eba6090a12fb5dc974585bf9b2aa94e11d3ce58d7f84eadf20479d195113ab9a74b6183de515ea5c11db225f2dc360289db69d SHA512 37b1b81b92b9f3476a49513271c9059655e759e57cbc564294c42f7a0d5a173f6d3e65d71f7e6ee83601c55e02346e262d170abde5a4a46eccb81145d94b3111
 MISC metadata.xml 1297 BLAKE2B 2d1b2b6f7e6fdf5b73797347e9a3bf7758f1efc86e53d0d0f4b2c0012152ebc50630ff4f3b2c965063f608cf03b3da2794978a3e3659957970d91d3a735ad604 SHA512 0e9f3d5255ac70d6a08b251bfd20f13ff25f63e763ab9385924fb2cb5ac233b0ae97cc43e8a2d950b9662f088ef65af87f9af4dbb355e122e3fcb118bee1c0de
diff --git a/app-crypt/gnupg/gnupg-2.2.33-r2.ebuild b/app-crypt/gnupg/gnupg-2.2.33-r2.ebuild
deleted file mode 100644
index 85e5a170bf22..000000000000
--- a/app-crypt/gnupg/gnupg-2.2.33-r2.ebuild
+++ /dev/null
@@ -1,153 +0,0 @@
-# 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
-
-MY_P="${P/_/-}"
-
-DESCRIPTION="The GNU Privacy Guard, a GPL OpenPGP implementation"
-HOMEPAGE="https://gnupg.org/"
-SRC_URI="mirror://gnupg/gnupg/${MY_P}.tar.bz2"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="bzip2 doc ldap nls readline selinux +smartcard ssl tofu tools usb user-socket wks-server"
-
-# Existence of executables is checked during configuration.
-# 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
-	bzip2? ( app-arch/bzip2 )
-	ldap? ( net-nds/openldap:= )
-	readline? ( sys-libs/readline:0= )
-	smartcard? ( usb? ( virtual/libusb:1 ) )
-	ssl? ( >=net-libs/gnutls-3.0:0= )
-	sys-libs/zlib
-	tofu? ( >=dev-db/sqlite-3.7 )"
-
-RDEPEND="${DEPEND}
-	app-crypt/pinentry
-	nls? ( virtual/libintl )
-	selinux? ( sec-policy/selinux-gpg )
-	wks-server? ( virtual/mta )"
-
-BDEPEND="virtual/pkgconfig
-	doc? ( sys-apps/texinfo )
-	nls? ( sys-devel/gettext )"
-
-S="${WORKDIR}/${MY_P}"
-
-DOCS=(
-	ChangeLog NEWS README THANKS TODO VERSION
-	doc/FAQ doc/DETAILS doc/HACKING doc/TRANSLATE doc/OpenPGP doc/KEYSERVER
-)
-
-PATCHES=(
-	"${FILESDIR}/${PN}-2.1.20-gpgscm-Use-shorter-socket-path-lengts-to-improve-tes.patch"
-)
-
-src_prepare() {
-	default
-
-	# Inject SSH_AUTH_SOCK into user's sessions after enabling gpg-agent-ssh.socket in systemctl --user mode,
-	# idea borrowed from libdbus, see
-	#   https://gitlab.freedesktop.org/dbus/dbus/-/blob/master/bus/systemd-user/dbus.socket.in#L6
-	#
-	# This cannot be upstreamed, as it requires determining the exact prefix of 'systemctl',
-	# which in turn requires discovery in Autoconf, something that upstream deeply resents.
-	sed -e "/DirectoryMode=/a ExecStartPost=-${EPREFIX}/bin/systemctl --user set-environment SSH_AUTH_SOCK=%t/gnupg/S.gpg-agent.ssh" \
-		-i doc/examples/systemd-user/gpg-agent-ssh.socket || die
-}
-
-src_configure() {
-	local myconf=(
-		$(use_enable bzip2)
-		$(use_enable nls)
-		$(use_enable smartcard scdaemon)
-		$(use_enable ssl gnutls)
-		$(use_enable tofu)
-		$(use smartcard && use_enable usb ccid-driver || echo '--disable-ccid-driver')
-		$(use_enable wks-server wks-tools)
-		$(use_with ldap)
-		$(use_with readline)
-		--with-mailprog=/usr/libexec/sendmail
-		--disable-ntbtls
-		--enable-all-tests
-		--enable-gpg
-		--enable-gpgsm
-		--enable-large-secmem
-		CC_FOR_BUILD="$(tc-getBUILD_CC)"
-		GPG_ERROR_CONFIG="${ESYSROOT}/usr/bin/${CHOST}-gpg-error-config"
-		KSBA_CONFIG="${ESYSROOT}/usr/bin/ksba-config"
-		LIBASSUAN_CONFIG="${ESYSROOT}/usr/bin/libassuan-config"
-		LIBGCRYPT_CONFIG="${ESYSROOT}/usr/bin/${CHOST}-libgcrypt-config"
-		NPTH_CONFIG="${ESYSROOT}/usr/bin/npth-config"
-		$("${S}/configure" --help | grep -o -- '--without-.*-prefix')
-	)
-
-	if use prefix && use usb; then
-		# bug #649598
-		append-cppflags -I"${EPREFIX}/usr/include/libusb-1.0"
-	fi
-
-	#bug 663142
-	if use user-socket; then
-		myconf+=( --enable-run-gnupg-user-socket )
-	fi
-
-	# glib fails and picks up clang's internal stdint.h causing weird errors
-	[[ ${CC} == *clang ]] && \
-		export gl_cv_absolute_stdint_h=/usr/include/stdint.h
-
-	# Hardcode mailprog to /usr/libexec/sendmail even if it does not exist.
-	# As of GnuPG 2.3, the mailprog substitution is used for the binary called
-	# by wks-client & wks-server; and if it's autodetected but not not exist at
-	# build time, then then 'gpg-wks-client --send' functionality will not
-	# work. This has an unwanted side-effect in stage3 builds: there was a
-	# [R]DEPEND on virtual/mta, which also brought in virtual/logger, bloating
-	# the build where the install guide previously make the user chose the
-	# logger & mta early in the install.
-
-	econf "${myconf[@]}"
-}
-
-src_compile() {
-	default
-
-	use doc && emake -C doc html
-}
-
-src_test() {
-	#Bug: 638574
-	use tofu && export TESTFLAGS=--parallel
-	default
-}
-
-src_install() {
-	default
-
-	use tools &&
-		dobin \
-			tools/{convert-from-106,gpg-check-pattern} \
-			tools/{gpg-zip,gpgconf,gpgsplit,lspgpot,mail-signed-keys} \
-			tools/make-dns-cert
-
-	dosym gpg /usr/bin/gpg2
-	dosym gpgv /usr/bin/gpgv2
-	echo ".so man1/gpg.1" > "${ED}"/usr/share/man/man1/gpg2.1 || die
-	echo ".so man1/gpgv.1" > "${ED}"/usr/share/man/man1/gpgv2.1 || die
-
-	dodir /etc/env.d
-	echo "CONFIG_PROTECT=/usr/share/gnupg/qualified.txt" >> "${ED}"/etc/env.d/30gnupg || die
-
-	use doc && dodoc doc/gnupg.html/* doc/*.png
-
-	systemd_douserunit doc/examples/systemd-user/*.{service,socket}
-}
diff --git a/app-crypt/gnupg/gnupg-2.2.32-r2.ebuild b/app-crypt/gnupg/gnupg-2.2.35.ebuild
index 85e5a170bf22..ee9470ef9e05 100644
--- a/app-crypt/gnupg/gnupg-2.2.32-r2.ebuild
+++ b/app-crypt/gnupg/gnupg-2.2.35.ebuild
@@ -3,17 +3,20 @@
 
 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"
+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.
@@ -40,9 +43,8 @@ RDEPEND="${DEPEND}
 
 BDEPEND="virtual/pkgconfig
 	doc? ( sys-apps/texinfo )
-	nls? ( sys-devel/gettext )"
-
-S="${WORKDIR}/${MY_P}"
+	nls? ( sys-devel/gettext )
+	verify-sig? ( sec-keys/openpgp-keys-gnupg )"
 
 DOCS=(
 	ChangeLog NEWS README THANKS TODO VERSION
diff --git a/app-crypt/gnupg/gnupg-2.3.4-r2.ebuild b/app-crypt/gnupg/gnupg-2.3.6.ebuild
index ae1c94f31494..e3e7a5c34b64 100644
--- a/app-crypt/gnupg/gnupg-2.3.4-r2.ebuild
+++ b/app-crypt/gnupg/gnupg-2.3.6.ebuild
@@ -16,7 +16,7 @@ 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"
+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 )"
@@ -34,7 +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 )
+	tpm? ( >=app-crypt/tpm2-tss-2.4.0:= )
 	ssl? ( >=net-libs/gnutls-3.0:0= )
 	sys-libs/zlib
 "
@@ -56,7 +56,7 @@ DOCS=(
 )
 
 PATCHES=(
-	"${FILESDIR}/${PN}-2.1.20-gpgscm-Use-shorter-socket-path-lengts-to-improve-tes.patch"
+	"${FILESDIR}"/${PN}-2.1.20-gpgscm-Use-shorter-socket-path-lengts-to-improve-tes.patch
 )
 
 src_prepare() {
diff --git a/app-crypt/gorilla/Manifest b/app-crypt/gorilla/Manifest
index 706ac0871c33..99165177c97e 100644
--- a/app-crypt/gorilla/Manifest
+++ b/app-crypt/gorilla/Manifest
@@ -1,4 +1,4 @@
 AUX gorilla-script-destdir.patch 407 BLAKE2B 156782385c31eea65d35d37c506e900b575a83de54330cf2b8aa293266e717bc57e2e1e59255369b1e4a8e5ccec2ecbd45b5d3b0803876b8d75f854be2332238 SHA512 785cbdd268e73f9cdc2ae5e36c9ce6435dc173353e7df0d895195f77516867f7f57f9749a4cadb9c533c1d36985e919433a0ddb508125b8135054545e53d23a4
 DIST gorilla-1.4.tar.gz 190766 BLAKE2B f537ef4b7d7324dd04124450a8c84bd56fc52cc1f40669bda26c9770fc279a81d034e161807ab8b98a7ae779fe85b067f9ab8b7e208a656e96ac6922a8fb9bc9 SHA512 56328068506309e99f9bc8b095048840eabacb794c742b36c4b855501d2973646e6e5ef7755f0aa29e636c5f5463fa1b24f0f627cb691511e4a48e1f062ce44b
-EBUILD gorilla-1.4-r1.ebuild 742 BLAKE2B 1bc5dba05d378712a766301ebbd24bfac36cb7b2d2f8aee5c028e8aea422ea12e8578d7e2f879d92296f698b19aab3a51e8d80816a03a0f9c5fb1d8f02ab721b SHA512 1d8531a30d55f27308a5c67a72f4aa687a2061e1e5933eba14dc9d387c8e19c22c3f09eb26f470018f9d87f354421f61be03d11fcf80b113b43b7bf874372e16
+EBUILD gorilla-1.4-r2.ebuild 742 BLAKE2B 1ade4267ddf31ac8a4ff0d3db46aef4d802fd3662a585d4b51469c4d7864b05b13d4146d5251c3ae4dc195841c5b3d2e09e1a63dd3e7cb352d227c0d7c08d122 SHA512 5fbf8cad28e76fc74508c7310fae59544f0a0d49fddc1376124d6986fa1811bf1c5730e731e9a4c8497d5ef2cd266c4e7ba911345bc8c2729e997b816ba7ef07
 MISC metadata.xml 250 BLAKE2B f694ce42960d60f65f16826f289f2b1cfed894940dfe914b79c7db7a75c8f79b4af8f47131f28864318aa240fc83e465e5446cc0cb16ad939266f4029aab09ee SHA512 e2a5a713312329bd39f948ff01fccabdda7f9856e91bd7489d4696cc2d175db7de3fcc29bbcdebf09a4a0172309e68cb1e25fe4e9a572b00857615362201cdd4
diff --git a/app-crypt/gorilla/gorilla-1.4-r1.ebuild b/app-crypt/gorilla/gorilla-1.4-r2.ebuild
index fdb790d0430d..860983172a00 100644
--- a/app-crypt/gorilla/gorilla-1.4-r1.ebuild
+++ b/app-crypt/gorilla/gorilla-1.4-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=7
@@ -12,8 +12,8 @@ SLOT="0"
 KEYWORDS="amd64 x86"
 
 DEPEND="
-	>=dev-lang/tcl-8.4.19:0
-	>=dev-lang/tk-8.4.19:0
+	>=dev-lang/tcl-8.4.19:=
+	>=dev-lang/tk-8.4.19:=
 	dev-tcltk/iwidgets
 	dev-tcltk/bwidget
 "
diff --git a/app-crypt/gpgme/Manifest b/app-crypt/gpgme/Manifest
index 005ac1691a18..b4e8c72ff840 100644
--- a/app-crypt/gpgme/Manifest
+++ b/app-crypt/gpgme/Manifest
@@ -1,15 +1,9 @@
 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.15.1.tar.bz2.sig 119 BLAKE2B d1f8a940973fa25531d2e958aad6a3b2c7844a07679f639716778d43b33e53fc46a6d364a1be274b01394717b92b37206b9da161ee6497e9255b1be50458c13b SHA512 2f893c4978c6f34dddc0c0fe01c77017d49cda97429e0573083740551e612a8a3e94c5b19087e2b637387628e4eebc508118e91dfc9fde8ef2e677b62770bb7a
 DIST gpgme-1.16.0.tar.bz2 1718913 BLAKE2B da55e695b148e949a1c0770d0298d7a8c9f87d7a1f9e45d380f8c13c472bd44cb4266adb9a113e2b1dcc2596291744f48fdf998ff2de876059d89d184dc87f3a SHA512 69487be69612e9bf0221ff56ae687248bd13635db1b7087130e93c1670e38f3c810bbca17723555c04fe207976c35871bbc3da005179ce099504321cf33636e4
 DIST gpgme-1.16.0.tar.bz2.sig 119 BLAKE2B abf363142f67a005d1a4c13c2d3d944d0fd449e2297ad5a853fc145e106757e639b5bf5c23de6475055578633e12d8dc7d11ebb689ee6c74283c7cfe28058e65 SHA512 0c230b55bb0b24af85cd6df9e6be6ef8245d29af0fb8348fe044979ab75250987fafbd709d1898852a23df99fb16dd61b0b2bc6a821ed1c1b9aadd86182e5b9a
-DIST gpgme-1.17.0.tar.bz2 1748416 BLAKE2B 32df1e3e579275d39507cb013ab7eded12149735f27a5eb1f4c3142df6b97864947a64c7fa58736e6cdea4ae623fb42eeb007596ec08ac5fdfb2af7826447550 SHA512 7ab379c6be2031ff24334a636e596f01c9d491627b695cc6cce7a361e78c6054b7891c521f07becea3c5da10c58043c1acffbba6058bbbfaa515241d75dd6c46
-DIST gpgme-1.17.0.tar.bz2.sig 119 BLAKE2B 1cfa90bb80ef09b2984a91c27a49bb34da8fb630822f4152c9e1cee7423345d16159947f5209b2cd34d399bb4ff2ffdf512a27a22e405762c640c8100405d953 SHA512 f9968c2f90188ca483cb4fe2867980ea474c784ff4056c5baa3b209fb2c049e4e72604d6b33cbbdb3fffb06150310243a36144502db73579deb80b6e1197684b
 DIST gpgme-1.17.1.tar.bz2 1747692 BLAKE2B 44cf9309cbad038f23aa7c5c77fd85be23faf3d8e1eb7abdb87a737ad1ade1ee269a95ce618dba327bbd06e6f4b2a91e2446744ee08f09ea6fb3b2dad44431c5 SHA512 e6399c3de1e430e38f2692bf5ec0c02ecb36ea3dbb56ff29dc3a438a5be4900a77a0559dc5b673dc1ffbff5e7f589e548e19176b2644fe8f63e00c6b9181b920
 DIST gpgme-1.17.1.tar.bz2.sig 119 BLAKE2B 31832424c0e029dc520d3302a71b086d9fcb044c74344cc0fb4b6c6a02d0dd840e62e7eb60acfaf004e6f3650d58436b58e645ef2a50b948ecaf3ca162bf577a SHA512 e1a4213d0d39f2efd0d5c007a0449c76bd650e76e002a9acb673eef0579912db06d844df11a4f7cb821e1d8468d2d6c1303f1c5d915a5c3c9cb5abacfbd004fc
-EBUILD gpgme-1.15.1.ebuild 2931 BLAKE2B 9ae29a6e09abb1ea5bf51571587d8c4a22d99eb361c1f1d94a0b409d4749988c6157d08616d267262711927c23d017fae9f1343bc4140050a7c6b3c826859f3d SHA512 e943705697eb483773acdc9e49b69153cad4f94686a40b8b621ea79770922d289711937db575d06d13e85ae05ad4ff291d5758bf612a6c19d1e42711744bf2e8
 EBUILD gpgme-1.16.0.ebuild 3034 BLAKE2B c807335ac78d88b1170f57b3c4eb771b8dd78b02ea54a8df4aaa062334d3a430459a274ddbe7977c3e1fd66995582a3e30dc2e3deceefabc05db296afb51822d SHA512 06d033131be2310cc8e96b5e3b65ec3cb6f70c9f01fa35ea57ffb97b95c80237bbc27b4923d2e9a99b0c94f779a50a89b38c30ce31fd5684f7a0ec7db2bd378e
-EBUILD gpgme-1.17.0-r1.ebuild 3148 BLAKE2B 58a131d29e40ffb0858232d7ca0c1137978d7fad931760448ac4d3d3e0934aa626fd506f09bfef00864d536f486f37d8fcee49cee00667edf6cc128f26f0b9b6 SHA512 5e154eae2bdd861706793cf6f028cfbf7df85184517b23ddaba6a2be7ce6e57567b33d6262d2b16636096646de36a10ba51030b61f481a7748d26dc21f140225
-EBUILD gpgme-1.17.1.ebuild 3218 BLAKE2B c4a238a19ca6b3529f05e7dd339f71b26b7f9db2b7515faf57368b18f3fd4b2542bf4f85a134aa1aa73bdba6a4b334c132de964ec46fe4ec3d985a7b92338b4c SHA512 b1a040b991b8240f9b7e6f191836dc176ff7310a081760fafd1b385afe2d20279fad29edd97a765fcad8aabd534ce892a42bc8f786ae654c71e513e391b52bcf
+EBUILD gpgme-1.17.1.ebuild 3225 BLAKE2B 5df274608b45c8cf3e20dd211698603df2f4f775baa81b13f938ef73304fd11811112540f56e9caa65c227ed624d5333977fbf86f74a11f7681c08d21544653d SHA512 7822cbc4a43b82dcc8a7b7e0d8eb43a7d8f583bbd4cc362616d3a8d90cac37acf7a75b34c95f3dfe2e37b5aeda5f6f5fba067f5df0280c4b9620e010f7eb32d5
 MISC metadata.xml 333 BLAKE2B 6dd18b63ec1f7656ab8bd705242bec45d7820db8be31f326172cad400711e6d7268c156d6b81facfdfa79118c04728ac910a8f8de36a11454227a1399235a582 SHA512 21b8d7bf3f14b5ab7e2ea587027395cdd881ecddd5a4f70237cafc70dc904b396a33f70dd7ef37519df5a204f4e3a89d9ea6ffc221df41bd9cbf23e69863f12f
diff --git a/app-crypt/gpgme/gpgme-1.15.1.ebuild b/app-crypt/gpgme/gpgme-1.15.1.ebuild
deleted file mode 100644
index e97532eb1c13..000000000000
--- a/app-crypt/gpgme/gpgme-1.15.1.ebuild
+++ /dev/null
@@ -1,114 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8..10} )
-DISTUTILS_OPTIONAL=1
-VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/gnupg.asc
-
-inherit distutils-r1 flag-o-matic libtool qmake-utils toolchain-funcs verify-sig
-
-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
-	verify-sig? ( mirror://gnupg/gpgme/${P}.tar.bz2.sig )"
-
-LICENSE="GPL-2 LGPL-2.1"
-SLOT="1/11" # subslot = soname major version
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="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 )
-	verify-sig? ( sec-keys/openpgp-keys-gnupg )"
-
-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
-	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"
-	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 && make -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.0-r1.ebuild b/app-crypt/gpgme/gpgme-1.17.0-r1.ebuild
deleted file mode 100644
index 6320a41831a1..000000000000
--- a/app-crypt/gpgme/gpgme-1.17.0-r1.ebuild
+++ /dev/null
@@ -1,117 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} )
-DISTUTILS_OPTIONAL=1
-VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/gnupg.asc
-
-inherit distutils-r1 flag-o-matic libtool qmake-utils toolchain-funcs verify-sig
-
-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
-	verify-sig? ( mirror://gnupg/gpgme/${P}.tar.bz2.sig )"
-
-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 )
-	verify-sig? ( sec-keys/openpgp-keys-gnupg )"
-
-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
index 21d96ca5627f..1865282c490a 100644
--- a/app-crypt/gpgme/gpgme-1.17.1.ebuild
+++ b/app-crypt/gpgme/gpgme-1.17.1.ebuild
@@ -19,7 +19,7 @@ LICENSE="GPL-2 LGPL-2.1"
 # 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"
+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="common-lisp static-libs +cxx python qt5"
 
 # Note: On each bump, update dep bounds on each version from configure.ac!
diff --git a/app-crypt/heimdal/Manifest b/app-crypt/heimdal/Manifest
index ed09c96de824..06441dd68901 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-r4.ebuild 4597 BLAKE2B 2369cfa9ba5a035bf6ee409007c83fed021f8c9cfdfa0db11e3198083ff185b838c7afd9385c7814f13bce5145113ea8dc70dd3a877702265e47fde1b54fd65a SHA512 161de0346918579f541ce098faab39404f2d9c5f5ef32916c13f92340807a01497b7a48db1fe60ba94f5f990b561b19d9aeca2986ecbb1dabedf78937084b09a
+EBUILD heimdal-7.7.0-r5.ebuild 4541 BLAKE2B 71163aebd3522b946e02c0bb84a6d5325f121068ca9c896ba54822f070dee1d706ba0f62754ae373d294c8c5d9fbebc9144e9778aafb9d9426e1991ff682a5dc SHA512 3e679784ae4c859b1ff1589c1331238dd83e9f2dc17169a387d8673a69454ecdcb8d6119ce62e9093749a75801281544b2417570b9b0afedbc7df88712dbf626
 MISC metadata.xml 571 BLAKE2B 3e6c723e5f9823cb72741fb666a67c14c52a6b206624c4d5329b19921c8305c03c8f1e586ee087000ffd189c8d4ca84ab413c79d35d2aa039369e2e2064c2866 SHA512 35020bf848f8caa61ea7bb46bddd9acc28fdcd9a9bab2f0dfdb701a0689d20ad38a09c03c141d106234363ed805fea575b47c1e79fc0dbd950bb75ea4b294026
diff --git a/app-crypt/heimdal/heimdal-7.7.0-r4.ebuild b/app-crypt/heimdal/heimdal-7.7.0-r5.ebuild
index 8036cbeb0073..bce9deb32fc0 100644
--- a/app-crypt/heimdal/heimdal-7.7.0-r4.ebuild
+++ b/app-crypt/heimdal/heimdal-7.7.0-r5.ebuild
@@ -29,10 +29,7 @@ CDEPEND="
 	lmdb? ( dev-db/lmdb:= )
 	caps? ( sys-libs/libcap-ng )
 	>=dev-db/sqlite-3.8.2[${MULTILIB_USEDEP}]
-	|| (
-		>=sys-fs/e2fsprogs-1.46.4-r51[${MULTILIB_USEDEP}]
-		sys-libs/e2fsprogs-libs[${MULTILIB_USEDEP}]
-	)
+	>=sys-fs/e2fsprogs-1.46.4-r51[${MULTILIB_USEDEP}]
 	sys-libs/ncurses:0=
 	>=sys-libs/readline-6.2_p5-r1:0=[${MULTILIB_USEDEP}]
 	afs? ( net-fs/openafs )
diff --git a/app-crypt/ima-evm-utils/Manifest b/app-crypt/ima-evm-utils/Manifest
index e0359c72bd16..d330f0d200de 100644
--- a/app-crypt/ima-evm-utils/Manifest
+++ b/app-crypt/ima-evm-utils/Manifest
@@ -7,6 +7,6 @@ DIST ima-evm-utils-1.3.2.tar.gz 100373 BLAKE2B 04717a934795f7e2a351b1f59388d2d42
 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-1.4.ebuild 1201 BLAKE2B 0f01e3c5e65155daf2e869307436adf869fc4257dc722b884977292a832691e3abea1cd03440d067efc0e6d4e7df583618d332e325eff19b50256ebf84c51c6e SHA512 0fbe3f919c7c8c5658bbb274479d61d62bb5847e29c8fbf8707fab65701883bff426a9d7bf1db8ab75184f2b1c80d912ae33c356e70b270f0f76da581c97a6a4
-EBUILD ima-evm-utils-9999.ebuild 1186 BLAKE2B 0c7e9419d4886165fd938d8058b68e168e2ddb656a246806ced171a7d7e39a6ccbc87dd04e3ff45de91625f26d0a9e324379afc9ea7c3b3731d7d3de09601b4a SHA512 b522120664f846af5829062f2ac59538645c89f0c317977675d2d68374d5f64c81d0308c1aa7bffb25ec6bec6d29510cecfe1f6400cce786f7045e2382cb6741
+EBUILD ima-evm-utils-1.4-r1.ebuild 1203 BLAKE2B b18552fe7bef0bb06aff3bdcab41cd1047059770ebbb212d6acce0ba7174df7d304701c9751f3eb08f700aebabe60eb4e9a7a8cbfe8066952572a0df3c0d8b56 SHA512 668eb2d436a8812880dfb56e845d425e5c91e64efd565e22c1e8922775e9cdc750edd979c405c5b0496dcb6b4e56019f41a0be818e452618b4d8221da1e44aeb
+EBUILD ima-evm-utils-9999.ebuild 1188 BLAKE2B 94a8a5356ba34f946547afa764bb416e93746746ab62f5be8b11661e1ca59c2ac0599b709ab33d905ff5a15882e1cd5a6ce22c04cc322de5916a7df1c4df2038 SHA512 19dca7d305be58d3b1756c60af7c89f14184d3d53eeb6246cb4bf1945e82f9d0bccbc62a14025a55324e9bca79ca8bd6f900b6b47f8778fc03b90bd9b7ef95be
 MISC metadata.xml 392 BLAKE2B c837347437c375cfc21f3b3708942ffbcbc3c3456aef565046c1a01b27dba3d900ad9a755af8c1ba2fcdd4ebc7298cf3fbcc346ada5f2ce7c8b45fcc0286f63a SHA512 44cba0b9d16b1f89ff587ac7ac675fe4965f18165d719c29d88f4d4257e59fd9a87373f2b30c24731a4e2e3a8a2afb0f394612c65dba51f0e8a7ec9764663023
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-r1.ebuild
index 3f32ba3defbf..89252bd4e730 100644
--- a/app-crypt/ima-evm-utils/ima-evm-utils-1.4.ebuild
+++ b/app-crypt/ima-evm-utils/ima-evm-utils-1.4-r1.ebuild
@@ -17,7 +17,7 @@ IUSE="debug test tpm"
 RDEPEND="
 	dev-libs/openssl:0=
 	sys-apps/keyutils:=
-	tpm? ( app-crypt/tpm2-tss )"
+	tpm? ( app-crypt/tpm2-tss:= )"
 DEPEND="${RDEPEND}"
 BDEPEND="
 	app-text/asciidoc
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 7237825ff877..f749bed88fe6 100644
--- a/app-crypt/ima-evm-utils/ima-evm-utils-9999.ebuild
+++ b/app-crypt/ima-evm-utils/ima-evm-utils-9999.ebuild
@@ -16,7 +16,7 @@ IUSE="debug test tpm"
 RDEPEND="
 	dev-libs/openssl:0=
 	sys-apps/keyutils:=
-	tpm? ( app-crypt/tpm2-tss )"
+	tpm? ( app-crypt/tpm2-tss:= )"
 DEPEND="${RDEPEND}"
 BDEPEND="
 	app-text/asciidoc
diff --git a/app-crypt/libb2/Manifest b/app-crypt/libb2/Manifest
index 861d240dfc10..cd9c7d4523dc 100644
--- a/app-crypt/libb2/Manifest
+++ b/app-crypt/libb2/Manifest
@@ -1,5 +1,5 @@
 AUX libb2-0.98.1-distcc.patch 473 BLAKE2B 245a73813769d12c83089893d2a82fcb9f6f7f5a284b12997132d271484a4e5ca8df1891a83514a2c9aae984bd003424290ac4700c2e24a9885694c4e5bdedc3 SHA512 9684f9358dff01b23a799c74c0e72f3af9bec1a5577e66620c24b0a0e91a0e17fd6ab426b42e238375529eed4fbd47b5974764bd136907614abccd21c13d0c65
 DIST libb2-0.98.1.tar.gz 280826 BLAKE2B aa8c3dee3032f457410479be12d00c79a6ca6a7c0376a5c70265d30ff25b50663171f7096141834d4faa4dd5027f38b23b774e59be63475a3ecba855337fb1aa SHA512 a666fdbd1efa9cfff3028e953c62f21ba092c6733ccd12d4d04f1f836fc9747fc90053bc9166510d251d332b91e133853d2cc9b61c279517bd65b05e8483250b
 EBUILD libb2-0.98.1-r2.ebuild 1798 BLAKE2B d84698611e48979dec05fc77875a6533638c7983d1837cd82d79b071d75474627ef6d7d0255a28591a58b40373770e1cc741c3a8095cc241f6001654ed67cda0 SHA512 621396eb76005614e94cd30bda8a533c31ba7726a5cbd1e2027276a38597d51e8e9b1189248fa22fb6074daa537fce090351940e3a0d216bb2ce45337b9e2e0c
-EBUILD libb2-0.98.1-r3.ebuild 1851 BLAKE2B da6aa81c00b9aec7986a9f85eac28b141a51643beb5f8dce380f22e0cefec0cdff9743ed6a4d1aa055a2f07f86a5b6e299757d675095bb45602ca6d14a1b39cb SHA512 b42ad61f5fb71ba6a1fee7d967526cbd0f63b00f4405185e83098fdc2c3474c76d554de5f4915a0788c0904fed59eb7beb25014d518c3088c99d5c25670fdf8a
+EBUILD libb2-0.98.1-r3.ebuild 1858 BLAKE2B 9c9a7864f80e9b1d665ae59b9a13494547dd06d77b7ea7294aa7a8e53d071491e15c22adcb90a78540f0274dd93aca83fd9276c0b26a1de053b64db7eb2860dc SHA512 fc0f3cce20f590bf356f71542b3d1c99bb15a36003c590db90608989fad9a39c50ed54932e27f5838900df4c9acb620124205cf89f55324da17cac41049439ec
 MISC metadata.xml 689 BLAKE2B 9eb064a552296b211579b85776b4f3ef323e3019c2350753424aabf354d10069360a27e05b671dc46fdd098cd08498727da9d184cfd62ac2b7216da6d507d5bf SHA512 644eb156edd6b23c748472c2cf18428dade618784f607e83629ad9c45cb1fd3bbd5ae11443232b0d4f1184b3d3b4ac3f09c6e6641234546cba41686de4777083
diff --git a/app-crypt/libb2/libb2-0.98.1-r3.ebuild b/app-crypt/libb2/libb2-0.98.1-r3.ebuild
index 3470ad02948c..24a130333c1a 100644
--- a/app-crypt/libb2/libb2-0.98.1-r3.ebuild
+++ b/app-crypt/libb2/libb2-0.98.1-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
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/BLAKE2/libb2/archive/${GITHASH}.tar.gz -> ${P}.tar.g
 
 LICENSE="CC0-1.0"
 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 ~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="static-libs native-cflags openmp"
 
 DEPEND="
diff --git a/app-crypt/libmd/Manifest b/app-crypt/libmd/Manifest
index a07e14672127..3ea4387d5c19 100644
--- a/app-crypt/libmd/Manifest
+++ b/app-crypt/libmd/Manifest
@@ -1,4 +1,4 @@
 DIST libmd-1.0.4.tar.xz 264472 BLAKE2B ddc2da74635f5cc009c66a58ae82b83e6e0930e18af8a6b0ecec7cbf378246707b493a99fb97d3491d0d626a0d5ef068baea6a3ba2ec311c5a1516ba5b4e2fd5 SHA512 731553ecc5e0e1eb228cced8fccd531fe31fb5c7627ca30013d287e1aeb8222959cf7498fbb7414bbabb967b25d4e8b0edd54fc47f6ccf55fc91087db0725ce3
-EBUILD libmd-1.0.4.ebuild 643 BLAKE2B 2d081aabd76f4b8f2a637acdbe0eab3eed11c6e13457e8699621f0cbd12cccf6208fdca27c2fd90a3332bacf5fdbacdf30f7724a202a5f5dcc3dbed74eed4319 SHA512 920799d6f40f4a8fb670ee3e378268fc0f1e35bb73b030dd800e73ece0542f7610416361ab50c968b12cae52f91dc8382383f36c99567aa0abbbdb64b7859d80
+EBUILD libmd-1.0.4.ebuild 650 BLAKE2B cbdc3289f2cad022e2512ee8e669bec998da08534a3beeb6e4bc4c3be8f973b6cb23ebfc5285565348216a285485c7a43e19fba6c643573821eaf756ccc3208b SHA512 2492c2d6a0bdaab6e8d1cb2f93180ddd40d8da9225cc0ee840ce915e27b232103848233a90770c3a68b1c611b2309f0a73f00bbae42f53f8de130633abc09959
 EBUILD libmd-9999.ebuild 567 BLAKE2B c31c8d0780cd63516fae57497f80340712547fe78d17e16ad8d1c1f7320681ef914d0ffefc459593b2de6e0db054860296c72060bea33a4ef47de42dc3da8a14 SHA512 82345337a69a40c8f7199a3be295b18e530be415c712af1259b4e110f7cc80d50705559ad92ce0b7c001c8f6f95ad7d5fae3d09b3ec527a1b860e8577d078ed6
 MISC metadata.xml 167 BLAKE2B 868e3b584722eaacf68273db062bb773d8c7e5d7ab2b81ca7e8397643bf7cc106c3a1033594401c99c54f667bb45d6b73f9048fc335580bbd44b4589ad26a832 SHA512 30caadd1496c3b9969136038239a1d8e01f236726b4022c2d7e19ca7575f25f735e556835e581afbf44fbd3e4104c40f2b5ef5fa70118d75c881fdf871962d0a
diff --git a/app-crypt/libmd/libmd-1.0.4.ebuild b/app-crypt/libmd/libmd-1.0.4.ebuild
index ec9a537d5a42..95989a9ac9f9 100644
--- a/app-crypt/libmd/libmd-1.0.4.ebuild
+++ b/app-crypt/libmd/libmd-1.0.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=8
@@ -11,7 +11,7 @@ SRC_URI="https://archive.hadrons.org/software/libmd/${P}.tar.xz"
 
 LICENSE="|| ( BSD BSD-2 ISC BEER-WARE public-domain )"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
 
 multilib_src_configure() {
 	ECONF_SOURCE="${S}" econf
diff --git a/app-crypt/libsecret/Manifest b/app-crypt/libsecret/Manifest
index d02fc241ecbf..76267eba5027 100644
--- a/app-crypt/libsecret/Manifest
+++ b/app-crypt/libsecret/Manifest
@@ -1,4 +1,4 @@
 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-r3.ebuild 3719 BLAKE2B c89de8dc1e1255fafa208606ed0e9fe46601262112feeaa8aa2c220bb13433ccfe76c6b456cb6ca9351f94626a5d4aad53c75aca31480859e0e322b542ceb89d SHA512 1415cdeb327f6887f85871db2d4ed158d4200df06ea37b7ae50eb43c1568b02554366dc7b0d2fbf586e6044d93245451e44d12838940872d1cd9edda0387c437
 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-r3.ebuild
index da95f0a7ad31..c16fe9ac3396 100644
--- a/app-crypt/libsecret/libsecret-0.20.5-r1.ebuild
+++ b/app-crypt/libsecret/libsecret-0.20.5-r3.ebuild
@@ -20,16 +20,16 @@ REQUIRED_USE="
 	gtk-doc? ( crypt )
 "
 
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~loong ~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 )
+	tpm? ( >=app-crypt/tpm2-tss-3.0.3:= )
 	introspection? ( >=dev-libs/gobject-introspection-1.54:= )
 "
-RDEPEND="${DEPEND}
-	virtual/secret-service"
+RDEPEND="${DEPEND}"
+PDEPEND="virtual/secret-service"
 BDEPEND="
 	app-text/docbook-xml-dtd:4.2
 	dev-libs/libxslt
@@ -50,7 +50,7 @@ BDEPEND="
 		tpm? (
 			app-crypt/swtpm
 			app-crypt/tpm2-abrmd
-			>=app-crypt/tpm2-tss-3.2.0
+			>=app-crypt/tpm2-tss-3.2.0:=
 		)
 	)
 	vala? ( $(vala_depend) )
diff --git a/app-crypt/mit-krb5/Manifest b/app-crypt/mit-krb5/Manifest
index 33050a14d363..ec3584b3a41f 100644
--- a/app-crypt/mit-krb5/Manifest
+++ b/app-crypt/mit-krb5/Manifest
@@ -17,6 +17,6 @@ AUX mit-krb5kpropd.socket 122 BLAKE2B 2ce51e67b909c6955d9796f80f7985c9209af398ad
 AUX mit-krb5kpropd_at.service 162 BLAKE2B ccd1dea2419656a95ea1e5068457ea45a765a831f36e7abe3e27cdd9b42f2b703cd6ddad1ac60d75feff4d74bf31dbf146ee2cbfdd34ac38c11908d44162e77a SHA512 4b7121da07b11fa65db4edc185c57197ebb25ed5c49797e36bc31b8b7bbb22a6f512f4a986c8430dfc31b1b8fcfba66dcfe154cd6eeb8b4bb445d5006fff3802
 DIST krb5-1.19.2.tar.gz 8741053 BLAKE2B 963722721201e75381c91a2af6e982f569a5b1602beb2d1ded83d35f6f914235a6ed91e5d54f56c97e94921a32ed27c49aded258327966ee13d39485208c38d8 SHA512 b90d6ed0e1e8a87eb5cb2c36d88b823a6a6caabf85e5d419adb8a930f7eea09a5f8491464e7e454cca7ba88be09d19415962fe0036ad2e31fc584f9fc0bbd470
 DIST krb5-1.19.3.tar.gz 8741343 BLAKE2B 79e68237ee82affa85299060c509e303453c0fab965adc6b9ed305ab64a1f73bd51e65df1b3faadc60815cd506ffefaeed535765ca060d393a9141812f85b48a SHA512 18235440d6f7d8a72c5d7ca5cd8c6465e8adf091d85c483225c7b00d64b4688c1c7924cb800c2fc17e590b2709f1a9de48e6ec79f6debd11dcb7d6fa16c6f351
-EBUILD mit-krb5-1.19.2-r3.ebuild 4296 BLAKE2B c31e4bf5aad51bc53d636bf28c84ae32f6abaad02b751c6c004905aac5717abd7b75a8d7d5c46911c8439c973003231048ce17787122e51f2f7dbbe0a7699d6f SHA512 486ad4bb6cb8e2714ee7b2031198797c913a5428d8f3ebed73b1652a6e4f299dbd9a0dc2878399b46c14730b065df001b8de404e934c4d5c8436d6720f035ee1
-EBUILD mit-krb5-1.19.3-r1.ebuild 4261 BLAKE2B 0e5140e3f38fe9514b1e07aae157e5e1f6fbf9e55c9a046648eb4d80a16185a0a926c022972232c599f275dcb414dd82e0655d5f4c756c9291b3df4258fce02d SHA512 cf6d577a392097a4305d178d844b3fb74cc96daac266535d81e3df30fb4b7ee8f1ec0673704a66a104b228d9561bed4ce2564b0faf10234abdfdcb851bdba874
+EBUILD mit-krb5-1.19.2-r4.ebuild 4240 BLAKE2B a2e6580cf7fe53c850a3ad83ffe749dbb75835423ab2b0dd8f9b75a47deecec8449ccd32511cbfcee2219689899b578d39f71ff46577b0429a8276f8692bd7ab SHA512 135b5f3dc618aef1b87e56f9931559d1981e993830d3d9af2a4813789959161a59c104b5374657a15ad59e7beaa24be8adbbb907ee5343c3a66ab4617c98fa8f
+EBUILD mit-krb5-1.19.3-r2.ebuild 4212 BLAKE2B 46b4a2a47a41e332587510fdb19540ed6eaaf49e2122213438b646243a9abc526c889cf52a094ab223e18428e91cfb7f52648309233423e07101334316f8f05f SHA512 2e2de2baaaa91ef4b6d922baba1a19ae3f0c7ae62b17d042fbccc5edfe2daeff5413f7cd0bba3bb8bb2de8707dd3b2718b8a24258b33c117eb7aecf4dd372ed5
 MISC metadata.xml 824 BLAKE2B 7f8486768dd9da718f2514da9a9b6928a89c43d26fd73f4be651438a4b02cd7a1db7839c580ca4f0812387e77cd002fa3caba86163ec2ecc1c2cdbcd1ffa4270 SHA512 0c075a303679455bd7f288b9345855bb38aa59da73e93f31b697688062399713dae64b39c775f4c74fa1f46fc1c3567732217ddcac7588bf3ae77c3e20e64144
diff --git a/app-crypt/mit-krb5/mit-krb5-1.19.2-r3.ebuild b/app-crypt/mit-krb5/mit-krb5-1.19.2-r4.ebuild
index 7d1a0a4f9c81..a88217f5154c 100644
--- a/app-crypt/mit-krb5/mit-krb5-1.19.2-r3.ebuild
+++ b/app-crypt/mit-krb5/mit-krb5-1.19.2-r4.ebuild
@@ -22,10 +22,7 @@ RESTRICT="test"
 
 DEPEND="
 	!!app-crypt/heimdal
-	|| (
-		>=sys-fs/e2fsprogs-1.46.4-r51[${MULTILIB_USEDEP}]
-		sys-libs/e2fsprogs-libs[${MULTILIB_USEDEP}]
-	)
+	>=sys-fs/e2fsprogs-1.46.4-r51[${MULTILIB_USEDEP}]
 	|| (
 		>=dev-libs/libverto-0.2.5[libev,${MULTILIB_USEDEP}]
 		>=dev-libs/libverto-0.2.5[libevent,${MULTILIB_USEDEP}]
diff --git a/app-crypt/mit-krb5/mit-krb5-1.19.3-r1.ebuild b/app-crypt/mit-krb5/mit-krb5-1.19.3-r2.ebuild
index a0d69b73690b..e90b52a26ebe 100644
--- a/app-crypt/mit-krb5/mit-krb5-1.19.3-r1.ebuild
+++ b/app-crypt/mit-krb5/mit-krb5-1.19.3-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 ~loong ~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
@@ -22,10 +22,7 @@ RESTRICT="test"
 
 DEPEND="
 	!!app-crypt/heimdal
-	|| (
-		>=sys-fs/e2fsprogs-1.46.4-r51[${MULTILIB_USEDEP}]
-		sys-libs/e2fsprogs-libs[${MULTILIB_USEDEP}]
-	)
+	>=sys-fs/e2fsprogs-1.46.4-r51[${MULTILIB_USEDEP}]
 	|| (
 		>=dev-libs/libverto-0.2.5[libev,${MULTILIB_USEDEP}]
 		>=dev-libs/libverto-0.2.5[libevent,${MULTILIB_USEDEP}]
diff --git a/app-crypt/mkp224o/Manifest b/app-crypt/mkp224o/Manifest
index a7eb8ecab353..a578dd3f4276 100644
--- a/app-crypt/mkp224o/Manifest
+++ b/app-crypt/mkp224o/Manifest
@@ -1,3 +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
+MISC metadata.xml 441 BLAKE2B 2d6b436d30726fdaca9272dba7629a64a36a64d84516be74d87d66d93d87c0dbbdf356254c372e2e090d0ed97a64a60483c3b91aa6a9a3944099337b1b699bda SHA512 36de72bdf964af4056ed9bf21bacfccbc56b3f4a668a4ccd307f74c8aefdb5d66c03504b86762f6d686ecf44a27b77b0119dfaf3d198a8c60d408055e52aee80
diff --git a/app-crypt/mkp224o/metadata.xml b/app-crypt/mkp224o/metadata.xml
index 6bbe7e963edf..e9ab26926571 100644
--- a/app-crypt/mkp224o/metadata.xml
+++ b/app-crypt/mkp224o/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <maintainer type="person">
     <email>matthew@gentoo.org</email>
diff --git a/app-crypt/p11-kit/Manifest b/app-crypt/p11-kit/Manifest
index 0ada716fdce1..15384f286725 100644
--- a/app-crypt/p11-kit/Manifest
+++ b/app-crypt/p11-kit/Manifest
@@ -1,5 +1,5 @@
 DIST p11-kit-0.23.22.tar.xz 830016 BLAKE2B 4e1edfd9e2441d237c07a16c003aee5ffde38f1cf545c26e435645429f2cfa4fe7ca61cdc3c3940390aa040ba991f2ee3995b14cc31bb886d5eeffa8ed5e1721 SHA512 098819e6ca4ad9cc2a0bc2e478aea67354d051a4f03e6c7d75d13d2469b6dc7654f26b15530052f6ed51acb35531c2539e0f971b31e29e6673e857c903afb080
 DIST p11-kit-0.24.1.tar.xz 838304 BLAKE2B e5cb98881279199e2674e2ff4f12d72c4d126c54429ee7ece6dd56ad1987f84abf58a67b8bf2405b19a5bca9d1106f8ec901364ac3d2488f65b3f92b51f850fe SHA512 8cf170c714bb9e0cf3df93e8ec55b8e3c55cabf2c6a27f177ac6de8b8028985df2ca0216d3215d6828dc2ae3095c4e1a4febe8cb26b88ec321defc66bb011e81
 EBUILD p11-kit-0.23.22.ebuild 2008 BLAKE2B e2c6140ad7266ed68c605c3fd157776bca69900f8f123d6a9c469ca8877099a809bc92b99a9e57605e75940955c52e0de5794b68f9e2865fe58dac0a540d875f SHA512 be9bab7ce91c482bdf6d6413573926bebb77b987b5a8a620b610347d07bba36c502e7067d90e8e1bbb9023aa63c706c0929fec30e957a590675f97ecc2046839
-EBUILD p11-kit-0.24.1.ebuild 2016 BLAKE2B 398926e3cde31f37933e9f7d8ac6e1625d1847586c0c0944e0076a3b152c43446faabe5bed2a47f57872b606d971294b5ee0cd0c2cf74cebbe97e8d24e3b1edb SHA512 37cced4acc1c62c4a1f1f2577b99057d8c8648233eac2c8013efbb413fa64e50d4f7f623a2d3573a984db84921229309d70b678b8475e7adfed98b2648f844df
+EBUILD p11-kit-0.24.1.ebuild 2023 BLAKE2B e6651ca25841b0889b8b4ad09fc4acb1d7c7cf0a8c93b65d328016324f857e7969882017b49c77464b785d152318609f5159bce50054f03fecf8df34f24a1fa8 SHA512 c94907529b0623cd3c812be604d324d7c04b2409536d962920d46459fc262441f470aa9b2314046106c6bcbecd54f567993aa415ad13a7c66f35480b1c4a0e7a
 MISC metadata.xml 462 BLAKE2B fa827cf8466907f22be017b9e86f15dff3107e681db7d799c09c75ce4ba5a3f2bde34e925945646b13c8a20973ab85884075810201720629f3868066832a8bab SHA512 e142dce54418ca0be110b2a1826c2234cada11110c5c0f8c6699f34405640cd8334638e9c35e1ff765cb2a68d40207cea01d4ba041fac3d8ba183ec1c18f062f
diff --git a/app-crypt/p11-kit/p11-kit-0.24.1.ebuild b/app-crypt/p11-kit/p11-kit-0.24.1.ebuild
index fff77f340333..94d342c7b28b 100644
--- a/app-crypt/p11-kit/p11-kit-0.24.1.ebuild
+++ b/app-crypt/p11-kit/p11-kit-0.24.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/p11-glue/p11-kit/releases/download/${PV}/${P}.tar.xz
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="+asn1 debug +libffi systemd +trust"
 REQUIRED_USE="trust? ( asn1 )"
 
diff --git a/app-crypt/pesign/Manifest b/app-crypt/pesign/Manifest
index ddc0018d7c6b..3e385ae1df1a 100644
--- a/app-crypt/pesign/Manifest
+++ b/app-crypt/pesign/Manifest
@@ -1,10 +1,6 @@
-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-113-enum-conversion.patch b/app-crypt/pesign/files/pesign-113-enum-conversion.patch
deleted file mode 100644
index 89a57e460fbe..000000000000
--- a/app-crypt/pesign/files/pesign-113-enum-conversion.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-From c555fd74c009242c3864576bd5f17a1f8f4fdffd Mon Sep 17 00:00:00 2001
-From: Peter Jones <pjones@redhat.com>
-Date: Tue, 18 Feb 2020 16:28:56 -0500
-Subject: [PATCH] pesigcheck: Fix a wrong assignment
-
-gcc says:
-
-  pesigcheck.c: In function 'check_signature':
-  pesigcheck.c:321:17: error: implicit conversion from 'enum <anonymous>' to 'enum <anonymous>' [-Werror=enum-conversion]
-  321 |    reason->type = siBuffer;
-      |                 ^
-  pesigcheck.c:333:17: error: implicit conversion from 'enum <anonymous>' to 'enum <anonymous>' [-Werror=enum-conversion]
-  333 |    reason->type = siBuffer;
-      |                 ^
-  cc1: all warnings being treated as errors
-
-And indeed, that line of code makes no sense at all - it was supposed to
-be reason->sig.type.
-
-Signed-off-by: Peter Jones <pjones@redhat.com>
----
- src/pesigcheck.c | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/src/pesigcheck.c b/src/pesigcheck.c
-index 524cce3..8fa0f1a 100644
---- a/src/pesigcheck.c
-+++ b/src/pesigcheck.c
-@@ -318,7 +318,7 @@ check_signature(pesigcheck_context *ctx, int *nreasons,
- 			reason->type = SIGNATURE;
- 			reason->sig.data = data;
- 			reason->sig.len = datalen;
--			reason->type = siBuffer;
-+			reason->sig.type = siBuffer;
- 			nreason += 1;
- 			is_invalid = true;
- 		}
-@@ -330,7 +330,7 @@ check_signature(pesigcheck_context *ctx, int *nreasons,
- 			reason->type = SIGNATURE;
- 			reason->sig.data = data;
- 			reason->sig.len = datalen;
--			reason->type = siBuffer;
-+			reason->sig.type = siBuffer;
- 			nreason += 1;
- 			has_valid_cert = true;
- 		}
diff --git a/app-crypt/pesign/files/pesign-113-nss.patch b/app-crypt/pesign/files/pesign-113-nss.patch
deleted file mode 100644
index 5a227a87268b..000000000000
--- a/app-crypt/pesign/files/pesign-113-nss.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-From b535d1ac5cbcdf18a97d97a92581e38080d9e521 Mon Sep 17 00:00:00 2001
-From: Peter Jones <pjones@redhat.com>
-Date: Tue, 14 May 2019 11:28:38 -0400
-Subject: [PATCH] efikeygen: Fix the build with nss 3.44
-
-NSS 3.44 adds some certificate types, which changes a type and makes
-some encoding stuff weird.  As a result, we get:
-
-gcc8 -I/wrkdirs/usr/ports/sysutils/pesign/work/pesign-0.110/include -O2 -pipe  -fstack-protector-strong -Wl,-rpath=/usr/local/lib/gcc8 -isystem /usr/local/include -fno-strict-aliasing  -g -O0 -g -O0  -Wall -fshort-wchar -fno-strict-aliasing -fno-merge-constants --std=gnu99 -D_GNU_SOURCE -Wno-unused-result -Wno-unused-function -I../include/  -I/usr/local/include/nss -I/usr/local/include/nss/nss -I/usr/local/include/nspr  -Werror -fPIC -isystem /usr/local/include -DCONFIG_amd64 -DCONFIG_amd64 -c efikeygen.c -o efikeygen.o
-In file included from /usr/local/include/nss/nss/cert.h:22,
-                 from efikeygen.c:39:
-efikeygen.c: In function 'add_cert_type':
-/usr/local/include/nss/nss/certt.h:445:5: error: unsigned conversion from 'int' to 'unsigned char' changes value from '496' to '240' [-Werror=overflow]
-     (NS_CERT_TYPE_SSL_CLIENT | NS_CERT_TYPE_SSL_SERVER | NS_CERT_TYPE_EMAIL | \
-     ^
-efikeygen.c:208:23: note: in expansion of macro 'NS_CERT_TYPE_APP'
-  unsigned char type = NS_CERT_TYPE_APP;
-                       ^~~~~~~~~~~~~~~~
-cc1: all warnings being treated as errors
-
-This is fixed by just making it an int.
-
-Fixes github issue #48.
-
-Signed-off-by: Peter Jones <pjones@redhat.com>
-Upstream-Status: Accepted
-[https://github.com/rhboot/pesign/commit/b535d1ac5cbcdf18a97d97a92581e38080d9e521]
----
- src/efikeygen.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/efikeygen.c b/src/efikeygen.c
-index ede76ef..2cd953e 100644
---- a/src/efikeygen.c
-+++ b/src/efikeygen.c
-@@ -208,7 +208,7 @@ static int
- add_cert_type(cms_context *cms, void *extHandle, int is_ca)
- {
- 	SECItem bitStringValue;
--	unsigned char type = NS_CERT_TYPE_APP;
-+	int type = NS_CERT_TYPE_APP;
- 
- 	if (is_ca)
- 		type |= NS_CERT_TYPE_SSL_CA |
--- 
-2.22.0
-
diff --git a/app-crypt/pesign/pesign-113.ebuild b/app-crypt/pesign/pesign-113.ebuild
deleted file mode 100644
index 1b6a9bf475c8..000000000000
--- a/app-crypt/pesign/pesign-113.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit flag-o-matic 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:0=
-	dev-libs/popt
-	sys-apps/util-linux
-	sys-libs/efivar
-"
-DEPEND="${RDEPEND}
-	sys-boot/gnu-efi
-"
-BDEPEND="
-	sys-apps/help2man
-	virtual/pkgconfig
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-113-nss.patch
-	"${FILESDIR}"/${PN}-113-enum-conversion.patch
-)
-
-src_configure() {
-	append-cflags -O1 #721934
-	default
-}
-
-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)"
-}
-
-src_install() {
-	emake DESTDIR="${ED}" VERSION="${PVR}" 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/pinentry/Manifest b/app-crypt/pinentry/Manifest
index ed70d9c47122..c94035f2cf1f 100644
--- a/app-crypt/pinentry/Manifest
+++ b/app-crypt/pinentry/Manifest
@@ -4,5 +4,5 @@ AUX pinentry-1.0.0-make-icon-work-under-Plasma-Wayland.patch 1606 BLAKE2B bebea2
 DIST pinentry-1.1.1.tar.bz2 515723 BLAKE2B f257fe552852e6d1ff2c23aeb0c1127b43e3a60e44c78dfa764d569e659ccb78528ce3ee863114af273a4b6f6c24686cda2cb14bb04995eb8c41ccd4541a9fbd SHA512 d6ab5af8ac2f3c9c05e09703e95d8e2676f9b2b7ceb97f6a31d101d0e9da7a1e106a6d3eabe86cab1bb35a4b119a7cba1380ac64bf13c61af0b3c48803116c12
 DIST pinentry-1.2.0.tar.bz2 498390 BLAKE2B 6e97b55fe39e9c17f8a87fa669d23fca56c1095c2533a9eebe459fafc95a3fcb0a5ea502077aae5480b5259a3096c5f85e05d4872c0b19ad33f3d9084a220cc7 SHA512 19cea79aa3982d1f0d75220c8e24ca38d6c49475c6f4c5aa7101151b4690db23ed316096a4a411136e716ba4eb471f48f9b09556e5c9837533c2356b9b384b63
 EBUILD pinentry-1.1.1-r1.ebuild 2312 BLAKE2B a195bb8d27f3f9af602dee69f329b712165ebc6f9bdb74736514e3ba6a8388fad1e26cce3fd45868033fd2b8d686aa973c6190c634f0fff20bc8d303be6bc2b5 SHA512 29bef11fe06782dba8e0776098a0eb9ba813778008b66e4442af545dcd0c91cda7852bc7a9b729c6ad049ea1c4f72bdf4467f6cb34ee92c78ced1ebf9e6d37dd
-EBUILD pinentry-1.2.0.ebuild 2312 BLAKE2B a195bb8d27f3f9af602dee69f329b712165ebc6f9bdb74736514e3ba6a8388fad1e26cce3fd45868033fd2b8d686aa973c6190c634f0fff20bc8d303be6bc2b5 SHA512 29bef11fe06782dba8e0776098a0eb9ba813778008b66e4442af545dcd0c91cda7852bc7a9b729c6ad049ea1c4f72bdf4467f6cb34ee92c78ced1ebf9e6d37dd
+EBUILD pinentry-1.2.0.ebuild 2319 BLAKE2B d37abc9c1bddcf0fb35f0a8e6cbf635b8f922824322cbeb5fb9e2591c02e0493599c1c471523c83247b7d18249655f4ad987c82383b98945b6d9c42865f76fe0 SHA512 1fa8f923cca7b59497b614c14a03c4f2978b9d8e88f17a7cf5b051049f06c43c110ea59e9beb99811d7b77326599dc89cb969981216c8ac767b250e3dc218bac
 MISC metadata.xml 452 BLAKE2B a2aef88d14b75ddb8f8cced6ee2dc1d0d66ac52ac5c686bd8d230bd9291146fa3fc0411682488e0a45c05b20640cf8b4093ee71a0ec60e02fe507dda2910c5fa SHA512 0517e56cd5cb905f4951205f4f7db6d01a14d28e1578612f91bfaee5dfc93a56eff4896201cf3c02f9ca02329b8597d6469187f60f429f7c5f6995fa0023aaf7
diff --git a/app-crypt/pinentry/pinentry-1.2.0.ebuild b/app-crypt/pinentry/pinentry-1.2.0.ebuild
index 90e78ab84267..367449ba15b4 100644
--- a/app-crypt/pinentry/pinentry-1.2.0.ebuild
+++ b/app-crypt/pinentry/pinentry-1.2.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="mirror://gnupg/${PN}/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+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="caps efl emacs gnome-keyring gtk ncurses qt5"
 
 DEPEND="
diff --git a/app-crypt/rainbowcrack/Manifest b/app-crypt/rainbowcrack/Manifest
index 7acdfab4ae1e..cf492e0b37ad 100644
--- a/app-crypt/rainbowcrack/Manifest
+++ b/app-crypt/rainbowcrack/Manifest
@@ -1,3 +1,3 @@
 DIST rainbowcrack-1.8-linux64.zip 220109 BLAKE2B 164894ccb07490756a0c9b297b1497d6305fade66b31fd712914261219dd957632cd285ab2e7ad7a683dd3c0a425eb1969676ea23136abf7d688fcde9e445e74 SHA512 84dbf3431605fb5dcc8e7cd305a43e9b239ebd6e5ef120edd951a3180c38498fe3a26157e3b55d114c6630f8ac1382a610d8e6230779c5b12cbc42c04e9aff57
-EBUILD rainbowcrack-1.8.ebuild 1447 BLAKE2B d42fba4089ca60b033bc713ec51b9bd7b5f363aec79c7eef696ee1840fe3454ce03c3af70c8c47606514314a4832160852126be7a419112309eec1904d78b007 SHA512 012c65e86eacc1f830b30cd1f656e23a5696b38bd615b30ad9ed961e79ad0f5ea21df944f237fcdfeade0b47decb2eb2eec81bf80c2859fadead165c8e5230ec
+EBUILD rainbowcrack-1.8.ebuild 1445 BLAKE2B 154c6f071d01b62bf9e3aff61eb5bcca3b3c89212e24841c912975ca810cb798c228277dcb43d438362c7027c50b2cb59a8a9dc63fe78c363de36aee28850c4b SHA512 7ec72e9b4ba52886f40a05d5360f279caa600934c7250681de6d76f947e779fc65670cfedcebe9f987285bf9cbb81f73c189618048cd34ff2ecf12d60bb3a5f8
 MISC metadata.xml 988 BLAKE2B 7a0e914a701cfeabc474191f86a4561beb0581f5b0fba09924400a84d269b638c85d67d76cb845860b636b705fd5c9cfa01d0b9c8504133b1b1f7af69c7c4eab SHA512 7e6668b418dd61bf34e587e1fac633c2f278c41ae8858eae1cb4c593826405c7a79f7223042ecf4edae1f79c3b448a3a79250fc36a488d25aa1800cfa1c96bbf
diff --git a/app-crypt/rainbowcrack/rainbowcrack-1.8.ebuild b/app-crypt/rainbowcrack/rainbowcrack-1.8.ebuild
index cffa5b85eb9b..647525cb2007 100644
--- a/app-crypt/rainbowcrack/rainbowcrack-1.8.ebuild
+++ b/app-crypt/rainbowcrack/rainbowcrack-1.8.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
@@ -6,8 +6,8 @@ EAPI=7
 inherit wrapper
 
 DESCRIPTION="Hash cracker that precomputes plaintext - ciphertext pairs in advance"
-HOMEPAGE="https://project-rainbowcrack.com/"
-SRC_URI="https://project-${PN}.com/${P}-linux64.zip"
+HOMEPAGE="http://project-rainbowcrack.com/"
+SRC_URI="http://project-${PN}.com/${P}-linux64.zip"
 
 LICENSE="all-rights-reserved"
 SLOT="0"
diff --git a/app-crypt/rhash/Manifest b/app-crypt/rhash/Manifest
index db90ada8300f..81e3cb3bf227 100644
--- a/app-crypt/rhash/Manifest
+++ b/app-crypt/rhash/Manifest
@@ -1,4 +1,4 @@
 AUX rhash-1.4.2-clang.patch 2775 BLAKE2B 0160a245931d58eb4809e95b5ab8a515fadf1459714378f254c597d56f3c4336ee59b17152c3fc23ae4ca39a4cc076eb78783e609b847b0c276c8f8c37fdd940 SHA512 3b28f8234d42f7dc46a8b890e5ba6f49e61f3db26019e81bfe8d4318b28d71ca781c49f0ee09c387a1cbef626ad016fc3177037f2d504be7572d56ed836ff954
 DIST rhash-1.4.2-src.tar.gz 416853 BLAKE2B 06322825116cb00aa4987b01610d967eb57c94aa29b43348ec2c31f053fd471a900fcee776714263213e9a79eaf389b2e79d7b34a5afd3e98d68198193b5cbe7 SHA512 41df57e8b3f32c93d8e6f2ac668b32aaa23eb2eaf90a83f109e61e511404a5036ea88bcf2854e19c1ade0f61960e0d9edf01f3d82e1c645fed36579e9d7a6a25
-EBUILD rhash-1.4.2.ebuild 2060 BLAKE2B b654ecd535292a557e449914abb5f81300bbc54bf968f7683fde6ab9eaef5106204b8ecbcb5de659e8fada0f2c6b3e71534d1f494781e7e6c57edb582682ad01 SHA512 2862f7d61dc6b3d8dbe3a56985481f840e9fe7343b5ab576ea046ccdda664fa3818c177e7145cd52b20e8f19837f37aa34cd625f50e3c796ed81f4f4dfcb99a3
+EBUILD rhash-1.4.2.ebuild 2067 BLAKE2B 4e11b3ed29cc0741ae3c1fab950343df0f605e4d7c204262a687acc476f9694366ab659b59b4ecb9ed25bbbf8c1e61dd732df3510db0519aad9e665291b96cea SHA512 cb08d598b66308dfa20adcdb66d4b8f090f496efe77caf8de3e8692ea06a396e46810e9ac68157fcb54861a1948fd17ccd37d45bca5cfff2a77b823baf4075f6
 MISC metadata.xml 817 BLAKE2B eeb15cde9e06507f73330759d44dca59dea3bbcb972cb25af71d91f065eb64dbd1ddc61e43f8fad50c264c269542f92efdace36d3397647c3c53972e695da22f SHA512 3e2f688b57c74e051fcfb90d34685346c459c5e9f425266fd3d8e099f586037b14c2bfdac76f135a046c77cc850bb49954c0e7d8dc9ded1db47bf0919ab3ea93
diff --git a/app-crypt/rhash/rhash-1.4.2.ebuild b/app-crypt/rhash/rhash-1.4.2.ebuild
index d57cf5e83c4d..28eb73baa382 100644
--- a/app-crypt/rhash/rhash-1.4.2.ebuild
+++ b/app-crypt/rhash/rhash-1.4.2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}-src.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~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 ~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="debug nls ssl static-libs"
 
 RDEPEND="
diff --git a/app-crypt/seahorse-sharing/Manifest b/app-crypt/seahorse-sharing/Manifest
deleted file mode 100644
index 9f5bd6ac94e6..000000000000
--- a/app-crypt/seahorse-sharing/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST seahorse-sharing-58db1e5b8615d74afaa5d888237ef6556368147b.tar.gz 101549 BLAKE2B c0ac487e826426c5f0a7fcfdc1078bd9b96442751821ac6597da3ffae3f5ab06b3fa4c4cf514536f9b8375f2a36529768942e6b15d6f4ea57ada543e7d95586c SHA512 6b91a8498f6065a0ddfcc53edf96dbf7720f82a73bc904ce6af18b1f52b559459e21ad9c3d550fc24730e3200c2ff9acaa9bdfe64b5bd83939b55db97ea116d9
-EBUILD seahorse-sharing-3.8.0_p20181216.ebuild 1503 BLAKE2B 6c8752123be3acbe723bf3eba65fad5c2abd5a5d60a56736d80f716b6239bd54788e1875276e32e832752ee11c92e2fa837b297f2cdf2bb709532a569e4f3e00 SHA512 812e385faf7d855355c137f266497b89e87bbf9560d2de1da823057f84b290c549f24337462d5459be85a79ef67afbb3f74fd36f4e9f5dd095f5da93406257df
-MISC metadata.xml 250 BLAKE2B 8f7f0fe023d43e380e7861e897e6afcb5de4baefb42ea9c65a57dfc0d204c6f787a99295141832e732ebb08be218da56ba77e2dd9639e4e3aabf718ce4db1d0c SHA512 2684e772dd6d83e4b49f08f2ba22d8a0a753e7b46863489eff1b5d1f2f147ad80ffd93245ca405ac4c747249bc1b754454ec9865fe16da70f9b257051e105fd8
diff --git a/app-crypt/seahorse-sharing/metadata.xml b/app-crypt/seahorse-sharing/metadata.xml
deleted file mode 100644
index 7b343b06be8a..000000000000
--- a/app-crypt/seahorse-sharing/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>gnome@gentoo.org</email>
-	<name>Gentoo GNOME Desktop</name>
-</maintainer>
-</pkgmetadata>
diff --git a/app-crypt/seahorse-sharing/seahorse-sharing-3.8.0_p20181216.ebuild b/app-crypt/seahorse-sharing/seahorse-sharing-3.8.0_p20181216.ebuild
deleted file mode 100644
index 2fb2f6507630..000000000000
--- a/app-crypt/seahorse-sharing/seahorse-sharing-3.8.0_p20181216.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-GCONF_DEBUG="yes" # disable asserts
-GNOME2_EAUTORECONF="yes"
-
-inherit gnome2
-
-DESCRIPTION="Daemon for PGP public key sharing using DNS-SD and HKP"
-HOMEPAGE="https://projects.gnome.org/seahorse/"
-SRC_URI="https://gitlab.gnome.org/GNOME/${PN}/-/archive/master/${PN}-58db1e5b8615d74afaa5d888237ef6556368147b.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-COMMON_DEPEND="
-	app-crypt/seahorse
-	dev-libs/glib:2
-	>=net-dns/avahi-0.6:=[dbus]
-	net-libs/libsoup:2.4
-	>=x11-libs/gtk+-3:3
-
-	>=app-crypt/gpgme-1
-	>=app-crypt/gnupg-1.4
-"
-RDEPEND="${COMMON_DEPEND}
-	!<app-crypt/seahorse-3.2
-"
-# ${PN} was part of seahorse before 3.2
-DEPEND="${COMMON_DEPEND}
-	>=dev-util/intltool-0.35
-	sys-devel/gettext
-	virtual/pkgconfig
-"
-
-S="${WORKDIR}/${PN}-master-58db1e5b8615d74afaa5d888237ef6556368147b"
-
-src_prepare() {
-	DOCS="AUTHORS MAINTAINERS NEWS" # ChangeLog has nothing useful
-	# Do not pass --enable-tests to configure - package has no tests
-
-	gnome2_src_prepare
-}
-
-pkg_postinst() {
-	gnome2_pkg_postinst
-
-	if ! has_version net-dns/avahi && \
-		! rc-config list default | grep -q "avahi-daemon" ; then
-		elog "To use ${PN}, the Avahi daemon must be running. On an OpenRC"
-		elog "system, you can start the Avahi daemon by"
-		elog "# /etc/init.d/avahi-daemon start"
-		elog "To start Avahi automatically, add it to the default runlevel:"
-		elog "# rc-update add avahi-daemon default"
-	fi
-}
diff --git a/app-crypt/seahorse/Manifest b/app-crypt/seahorse/Manifest
index 14b1f55d2606..46be25a1bb82 100644
--- a/app-crypt/seahorse/Manifest
+++ b/app-crypt/seahorse/Manifest
@@ -1,3 +1,4 @@
+AUX 41.0-meson-fix-gpg-version-check-for-recent-gnupg.patch 1219 BLAKE2B ad27915be295cec6d8afb3019c8ba4054da7840d4b79f4725a770e15ee6cacf17052e17dddaf7d4a6a6cb8428aa1ff6e14f4f3fe4ddb0b4bae46675008ed2de3 SHA512 9d595508f9fc7b0ae0188f4fd832918869adfa7094f83eeb3d4eaa0c8ab30a813d792043e74ce7fe8b4177aa4ca8db182104483c63fff582f2033e369ed47e9b
 DIST seahorse-41.0.tar.xz 1371984 BLAKE2B fdfc7c6d5ba41ab83c639d93c92fe6e1c36d42a02c7a384c2055bfe594e2a16415115bfb07597de93a886e492974e38c812fbbd59c7112c0360adeed96cb437d SHA512 cc51e27a55ed646ee376aa1b1bffe28369d80e4b8c484c9711de6bdf190694714ef208579d0399b5c199b5619491d72dede1b1f6c03b89cf3a53e8519a4d4fcf
-EBUILD seahorse-41.0-r1.ebuild 1626 BLAKE2B 8a1ae85a4f8918bf669eacb4ee79032bedae547f773e3e81b6dd82c93dbb1a6dd246659145ca7433b34d399015759304f6a4605cce1a7d08af8bbeeef49c832b SHA512 cad8007442c024645b08aef029f195c5c1087348f5f2a57e2700acdf161fe1e761620f3a109f9b712cc78637fbc50ad132505171f2487d29bc5f51e16eeb276a
+EBUILD seahorse-41.0-r1.ebuild 1793 BLAKE2B 645023facb8b3c3bcb7eec6569396daacd086d45dfac6a8f7f75c2b0d5cf3cf5d9ed87f18433f5fdf198716d438c6a746cb4f00bb2954b00aaeae89789e8834c SHA512 c576865762a9e56d2dbbf46745e3b27e6abb6f4f8efa48a3e549a44d9bbf4f2f227deb741b5625ec172a621c65c0ca855d67a44be7b3190729f11b090e7175c5
 MISC metadata.xml 743 BLAKE2B 90fed564b56f7e7a781f197eb09ebbca90ac0bd3c93ee1b65eec7e35420fcdd8bf0c0bf67cbf2109a55de590f32b48d3837a70844bb7e6e50819a8b67c868369 SHA512 99872b87aa52c0fe0584d11186fed74d0ade69e083395b030af3a22ba031a91467247c9c72e8cfa45b114192ebc13ed593a2634aec7db5a2b8efa1e2af6a0791
diff --git a/app-crypt/seahorse/files/41.0-meson-fix-gpg-version-check-for-recent-gnupg.patch b/app-crypt/seahorse/files/41.0-meson-fix-gpg-version-check-for-recent-gnupg.patch
new file mode 100644
index 000000000000..2d205e49a43f
--- /dev/null
+++ b/app-crypt/seahorse/files/41.0-meson-fix-gpg-version-check-for-recent-gnupg.patch
@@ -0,0 +1,29 @@
+From 38a82911f9c35617e96587e59f796e4616d62483 Mon Sep 17 00:00:00 2001
+From: Marc-Antoine Perennou <Marc-Antoine@Perennou.com>
+Date: Tue, 22 Mar 2022 09:37:17 +0100
+Subject: [PATCH] meson: fix gpg version check for recent gnupg
+
+Signed-off-by: Marc-Antoine Perennou <Marc-Antoine@Perennou.com>
+---
+ meson.build | 5 ++++-
+ 1 file changed, 4 insertions(+), 1 deletion(-)
+
+diff --git a/meson.build b/meson.build
+index e3242323..12ce3d56 100644
+--- a/meson.build
++++ b/meson.build
+@@ -51,7 +51,10 @@ gpgme_dep = dependency('gpgme', version: '>= 1.14.0', required: get_option('pgp-
+ 
+ if get_option('pgp-support')
+   gpg_version_check = run_command([gpg_check_version, gpg_bin.path(), accepted_gpg_versions ])
+-  gpg_version = gpg_version_check.stdout()
++  # GnuPG now outputs e.g. 2.3.4-unknown so we need to drop this extra cruft
++  gpg_version_raw = gpg_version_check.stdout()
++  gpg_version_raw_split = gpg_version_raw.split('-')
++  gpg_version = gpg_version_raw_split[0]
+   message('GnuPG Version: @0@'.format(gpg_version))
+   if get_option('check-compatible-gpg') and gpg_version_check.returncode() != 0
+     error('Incompatible version of GnuPG. Accepted versions are: @0@'.format(accepted_gpg_versions))
+-- 
+2.35.1
+
diff --git a/app-crypt/seahorse/seahorse-41.0-r1.ebuild b/app-crypt/seahorse/seahorse-41.0-r1.ebuild
index bd31322686a1..aa0c3a9e03fe 100644
--- a/app-crypt/seahorse/seahorse-41.0-r1.ebuild
+++ b/app-crypt/seahorse/seahorse-41.0-r1.ebuild
@@ -2,7 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-inherit gnome.org gnome2-utils meson xdg vala
+PYTHON_COMPAT=( python3_{8..10} )
+inherit gnome.org gnome2-utils meson python-any-r1 xdg vala
 
 DESCRIPTION="Manage your passwords and encryption keys"
 HOMEPAGE="https://wiki.gnome.org/Apps/Seahorse"
@@ -34,6 +35,7 @@ DEPEND="${RDEPEND}
 	gui-libs/libhandy:1[vala]
 "
 BDEPEND="
+	${PYTHON_DEPS}
 	app-text/docbook-xml-dtd:4.2
 	app-text/docbook-xsl-stylesheets
 	dev-libs/appstream-glib
@@ -45,9 +47,14 @@ BDEPEND="
 	virtual/pkgconfig
 "
 
+PATCHES=(
+	"${FILESDIR}"/${PV}-meson-fix-gpg-version-check-for-recent-gnupg.patch
+)
+
 src_prepare() {
-	xdg_src_prepare
+	default
 	vala_src_prepare
+	gnome2_environment_reset
 }
 
 src_configure() {
diff --git a/app-crypt/signify/Manifest b/app-crypt/signify/Manifest
index fef387f7f3d2..4c06d1bc7218 100644
--- a/app-crypt/signify/Manifest
+++ b/app-crypt/signify/Manifest
@@ -2,6 +2,6 @@ AUX signify-30-man_compress.patch 576 BLAKE2B b6c82f0737dcfd569bc781d84eaecad2c0
 DIST signify-30.sha.sig 246 BLAKE2B b5c26ad1d90ce562a5e6e8cb0a26c031da6bcc9d04cdd668f7b81410ba38ef1777db8f1a4b38fc515c251c840baf38e3df6b3f730a59a0921180ccb88f457fe5 SHA512 b0aea8736b4508ce5a45a296e11150218d694351b15d87478cad235869a6b0150d1893247d1600ea1679d47e71e87e629f5cf4932ecafa2ad4f05aa962f1743d
 DIST signify-30.tar.gz 94593 BLAKE2B 2d432cef9990a8ce23d0f05449ef02dcf7a00f4328a25dcab98cd25c2c74875fd8ea7ed7a67b7e4ac6c9f432a91564edcc1fc9260627c37352c19cc17581aea3 SHA512 4a1ebcdbf7aa74865b97cadbf5380460702306b6d0a77306e6c943bb0c3419ca929ecd3455522da4448d780a56c8eddeb26fb4d7fb006fc3bf23f69693c39e87
 DIST signify-30.tar.xz 73824 BLAKE2B 27de72ac82d9b66346185292cad71e57af0767111123ba0c618a7d5d4add2e5502b546ffd53ffa2956c66b8f00d2b1a96d21958125d5649d6efb23254c0f56ac SHA512 e760fd89de8a3fea76bd0aa52c683e1d331968620190f4ac487bbca30da00f8d6e2636bbe3c59b0e6fa925b1bbcf81516f50c0bc37707ae7e7465b61fee5c372
-EBUILD signify-30-r2.ebuild 1175 BLAKE2B 7b341ab95bb70a3a426c1e79b58caf739f2b03e54b9ea00c83a7b0eb7f4cf149cfc2b5ea950a26f5d91c0520c8f7da0d2d88de35fb2857773611a25de2882980 SHA512 0d8fa956f84dfc93aefcce797a43f050e29aa197d63ff44b9a9655c9e49a034b77b543d03bd0e7078dde7f0eb7ac7a4d017995535db16a6b6e7b95687c10d431
+EBUILD signify-30-r2.ebuild 1181 BLAKE2B 2879a19c8cf90ff0fa5e3d076edab26c686af9c368e6beeef77cb039ae5ea7f32b4a7115b04d7650d16cbf695b6a1f198d7b070ad0e790f19c255e835ee19707 SHA512 3b5f3ab4508e9d7e3bf4e7521aaecf37ebafe6e00f0b86c03f0acd9f998f7d32d392b9c5dbd47f10d83d85764cde033d4bd3ed7dac8f80b61169342536ae02c4
 EBUILD signify-30.ebuild 616 BLAKE2B 970eeb3f56883853c77608f81af3f712d8057bb71cd5c99565a551a5e1a267358cf21e52c9e020461c8cfff09b18170cb3fb26645e8c811f9694e3169494de89 SHA512 3973c9115bf57c8582575a3791dae541bd3125241b0bfee2c046c795e627d818db8910fba83acb997fc8c27525df172908c136435006bc3fd4da571d5611f0b1
 MISC metadata.xml 437 BLAKE2B 75f7f8a4b2475b052a41134e41ab274386c5f59847bad67ad3d8bd447984a2b42a119bbc60b13df0ebed9988f98ea5382c4aff4fa093cf44c7c8d2907d0db26a SHA512 ce3b623779a2b51556bb440df1b08f386f9fcdca641d1c0b06b3c2f0d1e98649ca8b45d8b32406f7b2b53a6f781c58121da09802c1fedb76e0c604c0a3627f44
diff --git a/app-crypt/signify/signify-30-r2.ebuild b/app-crypt/signify/signify-30-r2.ebuild
index 376a87a347f8..242864f55575 100644
--- a/app-crypt/signify/signify-30-r2.ebuild
+++ b/app-crypt/signify/signify-30-r2.ebuild
@@ -17,7 +17,7 @@ SRC_URI="
 
 LICENSE="BSD-1"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc x86"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc x86"
 
 RDEPEND="!net-mail/signify
 	>=dev-libs/libbsd-0.7"
diff --git a/app-crypt/signing-party/Manifest b/app-crypt/signing-party/Manifest
index 66fec293a108..3200f6da2c58 100644
--- a/app-crypt/signing-party/Manifest
+++ b/app-crypt/signing-party/Manifest
@@ -1,5 +1,3 @@
-DIST signing-party_2.10.orig.tar.gz 222778 BLAKE2B b2225ba3038037a8f841e5f2ee8c5f08f3fe294e617c42396269aadf348965a17151bb31b11a76b2d84806e060cb0eb1093963f72e17bb5549ac6fbec0e332fb SHA512 82e51b91c282a72e9d16d920b87560c66aeafc0219e91615ea47d2f1a5df903fb459201f34368e6fa7ea1e2d2ca46a73096f30a068c8c35322af2f3ea256b269
 DIST signing-party_2.11.orig.tar.gz 224706 BLAKE2B 6ef03d9e7e5652b7da77facc3206d25de63958a56ef64c0393b9964e1653c099dc022be5c80a02041418aee9dcb74e4fc0c448198b1deade79e59372cb8308c0 SHA512 9a34bde415bf779859b48eaab12e5c6a1a3f08d0292cd5cd691518e398fe40a73b878926d3ea1ef12ccca40179933478d03ec16ec4d9200fb726aaade541505d
-EBUILD signing-party-2.10-r1.ebuild 2797 BLAKE2B 0ed8ba0f6cea19101471b9edc3df44e78753dcc69c03670d6ab4ccd0ffa45a75906d5914f889be4071f7f88441fae2f8797a1c9836d306f778679f902f958c6e SHA512 e18d0896f5a4a5947567e2b646bc2d061930b6b64e2e0f2835a6617da5b257008a3e1f92f1640c1a2d69af5fab95c3effe449ff9a30be831dac675f3304c3830
-EBUILD signing-party-2.11.ebuild 2800 BLAKE2B df7caa0bc9684fb37d2b0a138df51ea0e0bf4b5cb515c1cab0067b323ed2ad6847fb43a8e4df02e4d9310c8226d1755a41929291a525a9540613701409b19001 SHA512 3b9ad46879f57f94378cb9c17afbabfbd8f022e81351346a8dce9ed37256614eddae5bdf303a8b795c9c2e22c2520fb48bf894c3d20adae0a5049c01f1d8fcd2
+EBUILD signing-party-2.11.ebuild 2797 BLAKE2B 8637eb68c610eac572c95a43290ab24f3fff96098961b298c1bae95b6b4ca64ef362236627db0f0ccf29ef97a5a92b03221a6be18986d7ade8558599b0f45e2a SHA512 a1b0e215b6a2e1f772110ab9583206da6d2e4ece76d678d5f13f09047d99ab934d41fafe0fde45a90aa08e225749e55313285487ad3b8016019d856a04cabc52
 MISC metadata.xml 244 BLAKE2B 94b04f9b5ade506f66b25651b1fdabfaf11febaff3175956406893e90548e87145186ef43a617e24803bd22d9da3f90ea8d72cfea7847aea521974b3138e92ad SHA512 20225e64357a690e86df86aa4d784300459d28b775e3989f77fd31e752ef968de63e41b59bb3c78b331e817f9eceab6dd6ef01131451753a1b5d3a309770611a
diff --git a/app-crypt/signing-party/signing-party-2.10-r1.ebuild b/app-crypt/signing-party/signing-party-2.10-r1.ebuild
deleted file mode 100644
index 8cd2f3ebb114..000000000000
--- a/app-crypt/signing-party/signing-party-2.10-r1.ebuild
+++ /dev/null
@@ -1,115 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit toolchain-funcs autotools
-
-DESCRIPTION="A collection of several tools related to OpenPGP"
-HOMEPAGE="https://salsa.debian.org/signing-party-team/signing-party"
-SRC_URI="mirror://debian/pool/main/s/signing-party/${PN}_${PV}.orig.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc x86"
-
-DEPEND="dev-lang/perl
-	app-crypt/libmd"
-RDEPEND="${DEPEND}
-	>=app-crypt/gnupg-1.3.92
-	dev-perl/GnuPG-Interface
-	dev-perl/Text-Template
-	dev-perl/MIME-tools
-	net-mail/qprint
-	>=dev-perl/MailTools-1.62
-	dev-perl/Net-IDN-Encode
-	virtual/mailx
-	virtual/mta
-	|| (
-		dev-perl/libintl-perl
-		dev-perl/Text-Iconv
-		app-text/recode
-	)"
-
-src_prepare() {
-	default
-
-	# app-crypt/keylookup
-	rm -r keylookup || die
-	sed -i -e 's#keylookup/keylookup##' Makefile || die
-
-	# media-gfx/springgraph
-	rm -r springgraph || die
-
-	find . -name Makefile | xargs sed -i -e 's/CFLAGS:=/CFLAGS=/' -e 's/CPPFLAGS:=/CPPFLAGS=/' -e 's/LDFLAGS:=/LDFLAGS=/'
-
-	sed -i -e 's/autoreconf/true/g' keyanalyze/Makefile || die
-	pushd keyanalyze/pgpring || die
-	eautoreconf
-	popd || die
-}
-
-src_compile() {
-	emake \
-		CC="$(tc-getCC)" \
-		CPPFLAGS="${CPPFLAGS}" \
-		CFLAGS="${CFLAGS}" \
-		LDFLAGS="${LDFLAGS}" \
-		STRIP=true
-}
-
-src_install() {
-	einstalldocs
-
-	# Check Makefile when a new tool is introduced to this package.
-	# caff
-	dobin caff/caff caff/pgp-clean caff/pgp-fixkey
-	docinto caff
-	dodoc caff/{README*,THANKS,TODO,caffrc.sample}
-	# gpgdir
-	dobin gpgdir/gpgdir
-	docinto gpgdir
-	dodoc gpgdir/{VERSION,LICENSE,README,INSTALL,CREDITS,ChangeLog*}
-	# gpg-key2ps
-	dobin gpg-key2ps/gpg-key2ps
-	docinto gpg-key2ps
-	dodoc gpg-key2ps/README
-	# gpglist
-	dobin gpglist/gpglist
-	# gpg-mailkeys
-	dobin gpg-mailkeys/gpg-mailkeys
-	docinto gpg-mailkeys
-	dodoc gpg-mailkeys/{example.gpg-mailkeysrc,README}
-	# gpgparticipants
-	dobin gpgparticipants/gpgparticipants
-	# gpgwrap
-	dobin gpgwrap/bin/gpgwrap
-	docinto gpgwrap
-	dodoc gpgwrap/{LICENSE,NEWS,README}
-	doman gpgwrap/doc/gpgwrap.1
-	# gpgsigs
-	dobin gpgsigs/gpgsigs
-	insinto /usr/share/signing-party
-	# keyanalyze
-	# TODO: some of the scripts are intended for webpages, and not really
-	# packaging, so they are NOT installed yet.
-	newbin keyanalyze/pgpring/pgpring pgpring-keyanalyze
-	dobin keyanalyze/{keyanalyze,process_keys}
-	docinto keyanalyze
-	dodoc keyanalyze/{README,Changelog}
-	# See app-crypt/keylookup instead
-	#dobin keylookup/keylookup
-	#docinto keylookup
-	#dodoc keylookup/NEWS
-	# sig2dot
-	dobin sig2dot/sig2dot
-	dodoc sig2dot/README.sig2dot
-	# gog-key2latex
-	dobin gpg-key2latex/gpg-key2latex
-	# See media-gfx/springgraph instead
-	#dobin springgraph/springgraph
-	#dodoc springgraph/README.springgraph
-	# all other manpages, and the root doc
-	doman */*.1
-	dodoc README
-}
diff --git a/app-crypt/signing-party/signing-party-2.11.ebuild b/app-crypt/signing-party/signing-party-2.11.ebuild
index 9b85ae41781d..b152b15cee90 100644
--- a/app-crypt/signing-party/signing-party-2.11.ebuild
+++ b/app-crypt/signing-party/signing-party-2.11.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,7 +11,7 @@ SRC_URI="mirror://debian/pool/main/s/signing-party/${PN}_${PV}.orig.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="amd64 ppc x86"
 
 DEPEND="dev-lang/perl
 	app-crypt/libmd"
diff --git a/app-crypt/swtpm/Manifest b/app-crypt/swtpm/Manifest
index f6397fdf27a9..4eff88326187 100644
--- a/app-crypt/swtpm/Manifest
+++ b/app-crypt/swtpm/Manifest
@@ -1,6 +1,6 @@
 AUX swtpm-0.5.0-build-sys-Remove-WError.patch 431 BLAKE2B 8b0d63dcab783a322c72aab6b8f7cd3de53509716d48fd2f30d136279bb2a52a6a942f43a2c87e6f66db9f3470f0486255db8056da8c49b2b788048af62aa3ba SHA512 981a1fe5bf25c7a820dc5913b0384bc48b0bc50cd84e04921f0f64a4be6dd6b2a815d4cba39370b2e62c4473f2edbdc6bba7b09ce74b9e441f1b8df3166eb959
 AUX swtpm-0.6.0-fix-localca-path.patch 1321 BLAKE2B 06d9e7409dda7554bd819a822e2ec4e3e1b8b0a9a41bcb4c45705e082b887d4739d7bd23481dd0c528f957b78e1c84d0e33a0e8b211ee2266018c79014b83afa SHA512 c90c438ad805db4310b2fd2b8c985f86c30e4010f08be9cae2de65d8ba4c4c65df8f80eb62636b30b2cc1d5df3ebc4a225bc32f77434d603aa71ee917560d5c8
 AUX swtpm-0.7.2-Conditionalize-test-dependencies.patch 1065 BLAKE2B 359cf6e692691317255d8c456abee7fe59a5370bf94f0bdd37ee6bb16ceb80340939f3f0a348398c6c93177690f4e2dc141d2b6c9f12319586c5a850dec2cd5c SHA512 8a2731b9d9c49fa2a8ea2732b20dbbd7264b1c93b00848e67f83e5d54f8ed150e97ff940422ccf46de21ae8d81fbf951314b3908ef0377d8548adebc4872474f
-DIST swtpm-0.7.2.tar.gz 353941 BLAKE2B e4d69919b5d255cff5eb9cda4c98e84e9fd53290360312742f95d63444ad5279fc7808e7f2e040cc2c87475c409b3c0f22e54ca301e8cb18bee71290f661ecc8 SHA512 91a8f9371a13f5f6bb329ef4bd7638fb9abe5ec84631b1d22e7eb9abcb91b7f3cccfdf147f65d54c03bf4d8a141b6b5fb6385d90f78d35096bd3b8ce140d39cb
-EBUILD swtpm-0.7.2.ebuild 1452 BLAKE2B d3371c8191093994df3abef65d564c98c1f84cf5b2c9d83c2bb4a6eea094adf9da527eef5fcec5c7b61c1d888d02059578155390adb87aa7205a35236aa86224 SHA512 385e9ab56f278bcf18289d3587df6ac117b7648c539f4c0a01c1075b3b996a9ab316fff4d9187a4a4b83683e3c1b22d806bbfc1a101916a7c12b9df717e1d43c
+DIST swtpm-0.7.3.tar.gz 354088 BLAKE2B 687e3161cbc08be68427648187ba2fb05749bcaaf9929b951eea4884bd4210c6105a2494f5e7d51915e5be1b700b13889cd83c96d22e00d621ea9336221ee67b SHA512 7f4cdf7ca2539f28e3a78e2a081b24983f3305905c7cafcac0957b14f5c06c8ee9485a0adaf3710561091f9ee85e00822fe1ff874389808218c1e17f938c45d9
+EBUILD swtpm-0.7.3.ebuild 1420 BLAKE2B 43119b0f563fecffbab95fddaf62ec4596543534b8aa3601891ecc797814f8db7128cfe53354a13a0c462c11de4316614e41e1cc5ab17ac32226e0cf4c29a186 SHA512 6da595f4e70856c61c16a733eecb090313deca9ba19f9e85a1e9b76fd2b363d1b9c935975ce6c8c001a45c044e14b7b36280e210ea551d03a7638375da066ab1
 MISC metadata.xml 623 BLAKE2B 10e2a56c1ad2da7890bb641cdb368f0f512185cefd18356ef96c8e7b34a873c439e9f7d5d98e0e2f339a0a9f090cb372a1ef8d1cd7251efc115fc021ab05825c SHA512 edd9f7ccc6147cb92f32415ba3ed6ad9351a49fbff8655866c99e80f1782801df90a63f3ca40153bfb01d689ab642823cea5d6e144b0aede0ce6d7da8b48f5f1
diff --git a/app-crypt/swtpm/swtpm-0.7.2.ebuild b/app-crypt/swtpm/swtpm-0.7.3.ebuild
index 5563aa1b7f60..d0ec3be7f7be 100644
--- a/app-crypt/swtpm/swtpm-0.7.2.ebuild
+++ b/app-crypt/swtpm/swtpm-0.7.3.ebuild
@@ -5,7 +5,7 @@ EAPI=8
 
 PYTHON_COMPAT=( python3_{8,9,10} )
 
-inherit autotools python-single-r1
+inherit autotools python-any-r1
 
 DESCRIPTION="Libtpms-based TPM emulator"
 HOMEPAGE="https://github.com/stefanberger/swtpm"
@@ -17,8 +17,6 @@ KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
 IUSE="fuse +gnutls seccomp test"
 RESTRICT="!test? ( test )"
 
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
 RDEPEND="fuse? (
 		dev-libs/glib:2
 		sys-fs/fuse:0
@@ -32,8 +30,7 @@ RDEPEND="fuse? (
 	acct-user/tss
 	dev-libs/openssl:0=
 	dev-libs/json-glib
-	dev-libs/libtpms
-	${PYTHON_DEPS}"
+	dev-libs/libtpms"
 
 DEPEND="${RDEPEND}
 	test? (
@@ -41,6 +38,8 @@ DEPEND="${RDEPEND}
 		dev-tcltk/expect
 	)"
 
+BDEPEND="${PYTHON_DEPS}"
+
 PATCHES=(
 	"${FILESDIR}/${PN}-0.6.0-fix-localca-path.patch"
 	"${FILESDIR}/${PN}-0.5.0-build-sys-Remove-WError.patch"
diff --git a/app-crypt/tpm2-abrmd/Manifest b/app-crypt/tpm2-abrmd/Manifest
index 11a47951c2e3..8a75aaec85fb 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.1.tar.gz 577259 BLAKE2B 7d97e1069a171f3693fb11b8e2ce0243993f4352aae9fd691bfbf1b8fcef8615b79957f8f662ac00fe59bf7e3830d8abb79c67790f7be1cd3140fd1c7b1ed560 SHA512 0335285678cfceca4f185981ded90d213ff796cadddc9b5d6dbf2db533f81023a0f1089bbd8a8017bccb95190889be23b24d38a176d3368d221479aff4ff7d6c
-EBUILD tpm2-abrmd-2.4.1.ebuild 1508 BLAKE2B 7ba3a1b950db9423ef8364e71faf8dda1ae78766649c4795747cdf15973d2cf77221fbaa971d0e1da4a89b0eaf12dc5ee4021757a24285033b88a01f8a3f5d36 SHA512 1aa968109be771c246ee190ad2553e5dd306dbe23fe50541e9a72c231a6a5b505981a1d3a73d70137970001ba38b229fbdd4957fdb76e5910c353179e5c49d4b
+EBUILD tpm2-abrmd-2.4.1-r1.ebuild 1512 BLAKE2B 81a2f02180b2610c6cec79899dabade60b6dda7b5b3c287a020c62f684a5d0ce34ec791a987a9f78a22b3343ee1db810e12da8b245091dd52a0ebcde32cd1450 SHA512 dfdd57991d2f501b043c941b273f0074e78b7c24f01d2fbb27e4b2083ac37e4d5b4de7050d26d4da34e3380480bec163612e8639dce86a27ce1e6ffac9740080
 MISC metadata.xml 493 BLAKE2B fd3fd8c23a18d535957ac767d6f1a8cc49a91ad362d02b3df87e14040d856c7f01341561fed23090b6776937d9cb11e7015d869fc5399620e9047f1644591e9d SHA512 2f72ada33f64c867a9b0a453919d0dbd444ba072abe3212fd6a3c2fb5bd337fb38b6ff0b8474345e6843160822d6c065261881799a9598de3a57045f09208667
diff --git a/app-crypt/tpm2-abrmd/tpm2-abrmd-2.4.1.ebuild b/app-crypt/tpm2-abrmd/tpm2-abrmd-2.4.1-r1.ebuild
index 0b9eedf9ce6d..2339ed83d9b5 100644
--- a/app-crypt/tpm2-abrmd/tpm2-abrmd-2.4.1.ebuild
+++ b/app-crypt/tpm2-abrmd/tpm2-abrmd-2.4.1-r1.ebuild
@@ -20,11 +20,11 @@ RDEPEND="acct-group/tss
 	acct-user/tss
 	sys-apps/dbus
 	dev-libs/glib:=
-	app-crypt/tpm2-tss"
+	app-crypt/tpm2-tss:="
 DEPEND="${RDEPEND}
 	test? (
 		app-crypt/swtpm
-		>=app-crypt/tpm2-tss-3.0.0
+		>=app-crypt/tpm2-tss-3.0.0:=
 		dev-util/cmocka
 	)"
 BDEPEND="virtual/pkgconfig
diff --git a/app-crypt/tpm2-pkcs11/Manifest b/app-crypt/tpm2-pkcs11/Manifest
index a7b7c18c0a89..38f96d5ea483 100644
--- a/app-crypt/tpm2-pkcs11/Manifest
+++ b/app-crypt/tpm2-pkcs11/Manifest
@@ -1,3 +1,3 @@
-DIST tpm2-pkcs11-1.7.0.tar.gz 1386693 BLAKE2B bf53a76be712bda374a8d107910440bab087fdb6c34fee3c748128d471a7a84b08f887ff97c8cdfef632679dd4343cf020e9459b96553cd5feecf76e65d6e290 SHA512 eb2736a7ef00fefa91bb70cc96d94d1c7b6ce3701ab12301658b7b076d8fca93bc590c7cdba5a84934b6bd09dad252b13670804c686e76a65b03c7ef6d96427d
-EBUILD tpm2-pkcs11-1.7.0.ebuild 1436 BLAKE2B 9bbf63d22a2f29bcc0fe5860563a7f445e19ec5ac293eae4c547a90e7fd1c99eebf9d5820469095d6d2a6dc5dc272e7a4b10b039950521153c7fe7009d5bf835 SHA512 ab607f6dc726f8afc9e0a6c71c0d8a7007bbe09d5f4b3d3bdcd8d8d9b994356c07d2a1f03d695ec543daeb4a2de975fa53d06b9825e40af3a49167335df759e2
+DIST tpm2-pkcs11-1.8.0.tar.gz 1393977 BLAKE2B c959e9e593dde903eac4b26ac85a39d1c73bfb9b6be558d7338dae1a710eb836385b08ddca27689f0573242d40ee072fa5d6685186a50e10ea42b8679389cf92 SHA512 599feb4d888c25a3359927b1d408f9ce85ba69d8a0e7af7ae9f3736e8940ec8d5f58b3094bef3b6515c0b1810249ea98cd73dbce592cb63de3b45ff976adda80
+EBUILD tpm2-pkcs11-1.8.0.ebuild 1397 BLAKE2B f27c924aa1036e2a8a164031ea45fb881e10faac6d90f55b59c6c51006d54f8bbe27f6276f13183bc69893718d3e4d3e652bb34746a9339327a3909e6d342bb4 SHA512 1371fefd248c4bc9b8282c992efbea51586b034256b5bdeb63386b0df6814336a04d1454774a45289207118062a718dfcb9b59ecd9077bc9ed3c414651b99b17
 MISC metadata.xml 473 BLAKE2B 66d9a37ccc8a1dc4e94798394a6e33090a42922d40ca87b55b687207da072ed50a12b985e9261863a4208bced5a76c856e1d05eeed78b27a766dc56234a40ff1 SHA512 e15ae6f4fa11fe7719ba7692b04f7b81563f6c1ea7caa1984c0e0957c18a53abb87ea70c27f0972fec6f6b8608f94142e7791cbd9c2025d7ad0d17889968a549
diff --git a/app-crypt/tpm2-pkcs11/tpm2-pkcs11-1.7.0.ebuild b/app-crypt/tpm2-pkcs11/tpm2-pkcs11-1.8.0.ebuild
index 407c9604607b..5a58280d4e3b 100644
--- a/app-crypt/tpm2-pkcs11/tpm2-pkcs11-1.7.0.ebuild
+++ b/app-crypt/tpm2-pkcs11/tpm2-pkcs11-1.8.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
@@ -6,7 +6,7 @@ EAPI=8
 PYTHON_COMPAT=( python3_{8..10} )
 PYTHON_REQ_USE="sqlite"
 
-inherit distutils-r1
+inherit python-single-r1
 
 DESCRIPTION="A PKCS#11 interface for TPM2 hardware"
 HOMEPAGE="https://tpm2-software.github.io/"
@@ -17,27 +17,34 @@ SLOT="0"
 KEYWORDS="~amd64"
 
 IUSE="fapi test"
+REQUIRED_USE="( ${PYTHON_REQUIRED_USE} )"
 
 # Units tests only for now
 RESTRICT="!test? ( test )"
 
-RDEPEND="app-crypt/p11-kit
+RDEPEND="${PYTHON_DEPS}
+	app-crypt/p11-kit
 	app-crypt/tpm2-abrmd
 	app-crypt/tpm2-tools[fapi?]
-	!fapi? ( app-crypt/tpm2-tss )
-	fapi? ( >=app-crypt/tpm2-tss-3.0.1[fapi] )
+	!fapi? ( app-crypt/tpm2-tss:= )
+	fapi? ( >=app-crypt/tpm2-tss-3.0.1:=[fapi] )
 	dev-db/sqlite:3
 	dev-libs/libyaml
 	dev-libs/openssl:=
+	$(python_gen_cond_dep '
 	dev-python/bcrypt[${PYTHON_USEDEP}]
 	dev-python/cryptography[${PYTHON_USEDEP}]
 	dev-python/pyasn1[${PYTHON_USEDEP}]
 	dev-python/pyasn1-modules[${PYTHON_USEDEP}]
-	dev-python/pyyaml[${PYTHON_USEDEP}]"
+	dev-python/pyyaml[${PYTHON_USEDEP}]
+	dev-python/tpm2-pytss[${PYTHON_USEDEP}]
+	')
+"
 
 DEPEND="test? ( dev-util/cmocka )
 	${RDEPEND}"
-BDEPEND="sys-devel/autoconf-archive
+BDEPEND="${PYTHON_DEPS}
+	sys-devel/autoconf-archive
 	virtual/pkgconfig"
 
 src_configure() {
@@ -46,20 +53,9 @@ src_configure() {
 		$(use_enable test unit)
 }
 
-src_compile() {
-	default
-	cd "${S}/tools" || die
-	BUILD_DIR="${S}/tools" python_foreach_impl distutils-r1_python_compile
-}
-
 src_install() {
 	default
-	cd "${S}/tools" || die
-	BUILD_DIR="${S}/tools" python_foreach_impl distutils-r1_python_install
-	dobin "${S}/tools/tpm2_ptool"
+	python_domodule tools/tpm2_pkcs11
+	python_newscript tools/tpm2_ptool.py tpm2_ptool
 	find "${ED}" -name '*.la' -delete || die
 }
-
-src_test() {
-	default
-}
diff --git a/app-crypt/tpm2-tools/Manifest b/app-crypt/tpm2-tools/Manifest
index 90ad93a01ccb..2a09b858b779 100644
--- a/app-crypt/tpm2-tools/Manifest
+++ b/app-crypt/tpm2-tools/Manifest
@@ -1,8 +1,5 @@
-AUX tpm2-tools-4.3.0-Remove-WError.patch 360 BLAKE2B 440f48fca6e8aaf9b2c0fd094011738c467a22dc31bd94b53f6788b8fa52c00c5d7ebe074434be60b6370dcf1e94ee4d57bcfc93857fcf03dbdff30c8e157445 SHA512 0d246d1446b5b2ebca0e12467c746a731897311448840a7aac35b57d22edcdec0c9f424d1c95c9614d969a57dba458bbbad8826516cc05329b47d2dad05318fe
 AUX tpm2-tools-5.1.1-no-efivar-automagic.patch 1083 BLAKE2B 10a8299a28ee54339ac73692dc54475da3044d3afcfe570d6c72f5d8ace2bbf3faf5242002be02c4a765ba9b9c37ba9777d9b4b8bac416e6721d9b8660d19bf2 SHA512 4622e235ef5202cc3448fbc67f362ce36396ca04892c340f275f67c93d5bb2857a14094329ec499c4f7215ac10002b70d18cfc2bdef1474d93f556c5759383ae
 AUX tpm2-tools-5.2-testparms-fix-condition-for-negative-test.patch 1380 BLAKE2B ffbbe59cbfd4a411544ef7f03ed04c73afc774edebaa2da8deb11e7fe4f321b88b686d3138fd5524b2279407518dda32de0e1cb96a5517ba87f8cc8c9ddb2be5 SHA512 557ad07048e288a9611222b920e8c82fab9852dde04da2b57981cb04ce3bb9d4ea40c57ba24fb2b3dc09cacc16ef731d11428d0603d757f7f7adc2023c5ca779
-DIST tpm2-tools-4.3.2.tar.gz 887708 BLAKE2B ee6fe3d0566138d6289d1a91252ccb106d36ff80d55f2d6f9ee30c8e16338d706e80085ac5f4f56a79bcb339e5dcb240efcf71d4003bcffdad366f3cd7a1165b SHA512 1aa47c62c3d2a83195ec649e50c0be2c8be39f926806d8d7cb96edc499c385d527661813e02024e98f83ae9ebcb22d7dadc507ddfab48be9bbe428d9439d7ee1
 DIST tpm2-tools-5.2.tar.gz 1072078 BLAKE2B 27d035e0f44029db57477a1fd10e1cee9b470ad54411297985cb7f33ba7bbb7a94ac392815e32287d69abf928dce0c361703542b812ae88b208ddca645bb3be2 SHA512 9fb5dc298717a8a57c89d286e3590370a096c81b14d2d8d4eb5fca140d66148a8e24727ee04fb02057bbfcc3ede50e93ba0ef22396888c9df48bf6f42a5d6e6b
-EBUILD tpm2-tools-4.3.2.ebuild 1052 BLAKE2B 7c6f919d4a43a7c990803e12b9f2233c018975c01fe792aa6ea49a944ec4865c57fb947803c8e4b3360fcd5933e24607b0750fe90cdc9272c261f579eecc8997 SHA512 ed36b9a1721c02268e5990b9d63721bbcf0c09eb2360e3dc02f295d83c01b2f98aeb306def7052a79de6b98e10c7edc1ec46aff2009e1babacdbc681a9e33dfd
-EBUILD tpm2-tools-5.2.ebuild 1579 BLAKE2B c0f6797ba6b2d8c325b3824fd9e8b88e4ba75b26f10c46dc905c350b586b0712e0d09cde5777dc5520926e5678c72091a45f16002cdf8f4b59deaa8de067cc88 SHA512 97dae63c0c10aa2df4dd4717c604eaf94be1dede40e09e71939dc792b0683fd3b1e446b3bf4a22720072dfe5100f31f7c70e3a2721f670b6c156a097c4235612
+EBUILD tpm2-tools-5.2-r1.ebuild 1523 BLAKE2B a454c179e2e8e934340e2cc55938636f8f3f509570a44ef0bc4bb86eaefc43d26943418349f9c5c7513aebc1f44dffdd22501298b13e8ee032728a316b063a3b SHA512 25fde96052b52615a7f806e32b6fff0cc2e5b0eb43e6a67ed0512f1f310806864550255fd0f55acb6619fe763ea4775bd57f4d6460f5b0646fb22d35ede52905
 MISC metadata.xml 560 BLAKE2B fe8daaba2a7586247537f8ed7b92769676b20f2c1377f7bb582dff49e06cf3f9beba4f79e28f10ea76d67d089eb152b060b091414dd9b47c5694ca153211421f SHA512 a744fcc50c7e44b1939190150404aee9054eab8e921e6f63cafa58dc80be5f20692632509de85399b6a9633701da72fd951e8bcfbe9e5177f315fa1dcbcc9ee5
diff --git a/app-crypt/tpm2-tools/files/tpm2-tools-4.3.0-Remove-WError.patch b/app-crypt/tpm2-tools/files/tpm2-tools-4.3.0-Remove-WError.patch
deleted file mode 100644
index caa3fac23bf4..000000000000
--- a/app-crypt/tpm2-tools/files/tpm2-tools-4.3.0-Remove-WError.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --git a/configure.ac b/configure.ac
-index 7b5c2196..d07d5433 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -210,7 +210,6 @@ AS_IF([test x"$enable_hardening" != x"no"], [
- 
-   add_hardened_c_flag([-Wall])
-   add_hardened_c_flag([-Wextra])
--  add_hardened_c_flag([-Werror])
- 
-   add_hardened_c_flag([-Wformat])
-   add_hardened_c_flag([-Wformat-security])
diff --git a/app-crypt/tpm2-tools/tpm2-tools-4.3.2.ebuild b/app-crypt/tpm2-tools/tpm2-tools-4.3.2.ebuild
deleted file mode 100644
index fc76619d1790..000000000000
--- a/app-crypt/tpm2-tools/tpm2-tools-4.3.2.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools
-
-DESCRIPTION="Tools for the TPM 2.0 TSS"
-HOMEPAGE="https://github.com/tpm2-software/tpm2-tools"
-SRC_URI="https://github.com/tpm2-software/${PN}/releases/download/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="+fapi"
-
-# Integration test are now run as part of the testing suite, which will fail
-# because none of the supported TPM emulators are in Portage. In a future
-# version of tpm2-tools, swtpm will be supported and the tests can be run.
-RESTRICT="test"
-
-RDEPEND="net-misc/curl:=
-	>=app-crypt/tpm2-tss-2.4.0:=[fapi?]
-	dev-libs/openssl:0="
-DEPEND="${RDEPEND}"
-BDEPEND="virtual/pkgconfig
-	sys-devel/autoconf-archive"
-PATCHES=(
-	"${FILESDIR}/${PN}-4.3.0-Remove-WError.patch"
-)
-
-src_prepare() {
-	sed -i \
-	"s/m4_esyscmd_s(\[git describe --tags --always --dirty\])/${PV}/" \
-	"${S}/configure.ac" || die
-	default
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		$(use_enable fapi) \
-		--enable-hardening
-}
diff --git a/app-crypt/tpm2-tools/tpm2-tools-5.2.ebuild b/app-crypt/tpm2-tools/tpm2-tools-5.2-r1.ebuild
index 9b7629c2cc9a..8438c854a1ce 100644
--- a/app-crypt/tpm2-tools/tpm2-tools-5.2.ebuild
+++ b/app-crypt/tpm2-tools/tpm2-tools-5.2-r1.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2021 Gentoo Authors
+# 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 bash-completion-r1 python-single-r1
+inherit autotools bash-completion-r1 python-any-r1
 
 DESCRIPTION="Tools for the TPM 2.0 TSS"
 HOMEPAGE="https://github.com/tpm2-software/tpm2-tools"
@@ -16,13 +16,11 @@ KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
 IUSE="+fapi test"
 
 RESTRICT="!test? ( test )"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
-RDEPEND=">=app-crypt/tpm2-tss-3.0.1[fapi?]
+RDEPEND=">=app-crypt/tpm2-tss-3.0.1:=[fapi?]
 	dev-libs/openssl:=
 	net-misc/curl
-	sys-libs/efivar:=
-	${PYTHON_DEPS}"
+	sys-libs/efivar:="
 DEPEND="${RDEPEND}
 	test? (
 		app-crypt/swtpm
@@ -34,7 +32,7 @@ BDEPEND="virtual/pkgconfig
 	test? (
 		app-editors/vim-core
 		dev-tcltk/expect
-		$(python_gen_cond_dep 'dev-python/pyyaml[${PYTHON_USEDEP}]')
+		$(python_gen_any_dep 'dev-python/pyyaml[${PYTHON_USEDEP}]')
 	)
 	${PYTHON_DEPS}"
 
diff --git a/app-crypt/tpm2-totp/Manifest b/app-crypt/tpm2-totp/Manifest
index 2ee9f951273d..4803c8d01713 100644
--- a/app-crypt/tpm2-totp/Manifest
+++ b/app-crypt/tpm2-totp/Manifest
@@ -1,4 +1,4 @@
 AUX tpm2-totp-0.3.0-Remove-bogus-value-from-Makefile.am 730 BLAKE2B 8bf144a03ec3c29c2e43f564ba65e8c10a70c61dc3e14d8c1085012f3aa1d8bbbb2cac3ab634ea02122ed1f2d21103b2fbf307528af178f3265788baeee1221f SHA512 3f51ed8205d6a0480abe85bc49c4fa86eb8141f3667a04dcac327e6c4382c9b430c97d170506a4e12bbda80c981128e9b5f5308036d4ccaee4e28bb93b866204
 DIST tpm2-totp-0.3.0.tar.gz 428874 BLAKE2B 413f4418cd1ce9a996f36c83e27c3fe256b2d3f5ff36e7df1dc1b651e38afa222be9742d5cfa76287263a4e1402dabea3400b41a1e1bde9f31fe03f82894f4f1 SHA512 d47cc8155a60a464afe602c3114ff8e6b2ff825457e6069693947421716b97c34b00f70adbcb4cda1b5b9639b8a3dfc7800295bbff99822da7a8077ebf78d6b2
-EBUILD tpm2-totp-0.3.0.ebuild 1064 BLAKE2B 5611bdffbba3553a038bd61377e22c1bdafd5bb04018222b4e325b8296f101530a783df628d1968b4cdb510b23d10f35d033405d54f85bdb41a747d63e3bdbbe SHA512 8d16ac7a67fbc072b7478eacc0b60645fa6fc3c4a02c589ba407f0ddf40581d529e337652e558a775a7d328fee5eaf776eb6d1d02caa444584a08f3589bc21e7
+EBUILD tpm2-totp-0.3.0-r1.ebuild 1068 BLAKE2B fc6e7e04314921c14c901d8c27817af10153618230e33a6b40c201bd57b721af1e682a1d710604d13ac1d5b5458c5eda8e12bc6c249d479473e5682ed3adff76 SHA512 fa9a63bf0f6671cc69b2e127c4923c86dee889701955d07a1aa54b74488dd519e4032b243053e0e35a123b3eb0ca7605fe75b87f694e0a7f1b47435c8bca3e36
 MISC metadata.xml 579 BLAKE2B b2c68bdf4e7ff2755e1e1e8a2fe9e331718cefa12823fcfbf91de85ee82c0febed8ed85eeb6921aa1c8bb11624323353a041ec5ccd726ecb138a8589271aa0cf SHA512 8273c96f820091246f749582bd326560a49240d54446d9d7b5607485d8cdd40989cc6f19c7523c1c18b1aab5ff0c7eeeab6fdb3b91be568a1d50dc2435e79c0e
diff --git a/app-crypt/tpm2-totp/tpm2-totp-0.3.0.ebuild b/app-crypt/tpm2-totp/tpm2-totp-0.3.0-r1.ebuild
index 67e6798a5655..0908aaaa181d 100644
--- a/app-crypt/tpm2-totp/tpm2-totp-0.3.0.ebuild
+++ b/app-crypt/tpm2-totp/tpm2-totp-0.3.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
@@ -16,14 +16,14 @@ IUSE="plymouth test"
 
 REQUIRED_USE="test? ( plymouth )"
 
-RDEPEND="app-crypt/tpm2-tss
+RDEPEND="app-crypt/tpm2-tss:=
 	media-gfx/qrencode
 	plymouth? ( sys-boot/plymouth )"
 DEPEND="${RDEPEND}
 	test? (
 		app-crypt/swtpm
 		app-crypt/tpm2-tools
-		>=app-crypt/tpm2-tss-3.0.0
+		>=app-crypt/tpm2-tss-3.0.0:=
 		sys-apps/fakeroot
 		sys-auth/oath-toolkit
 	)"
diff --git a/app-crypt/tpm2-tss-engine/Manifest b/app-crypt/tpm2-tss-engine/Manifest
index 05a582bfec7c..7f144660be37 100644
--- a/app-crypt/tpm2-tss-engine/Manifest
+++ b/app-crypt/tpm2-tss-engine/Manifest
@@ -1,3 +1,3 @@
 DIST tpm2-tss-engine-1.1.0.tar.gz 394448 BLAKE2B 0502907dc9ce872f31be3b980f975a02af2e3e4b369d188afa5327bd4475d93dbf43769dc7ddc11e8cbda8d1fde09f28a9aef9145e859a90225cd397f62c7a2c SHA512 5d2e08178be54350e8672245023d601a0d9d520f8c49e977af49d7c59b91d033c14b4a347b71e042fe7c5ff12af9fcc43b69fd1dc83a9f0db12d47d43e1107f4
-EBUILD tpm2-tss-engine-1.1.0.ebuild 829 BLAKE2B 0339df20bb889c14d972dccbccb73f15d670b2f30825df868f649f830c4e1e8326da6fd5bf1b03167577a1a2d5122dacbd028992385329826d630d63c9311522 SHA512 5bca61532e4a5d00cebe78b6ac87d4aaa4ac3e95656a672b35d04efbc763cc99b0a0aef5eceb114382374a3bdf106a4ba5f17db92d816f20d695af65c9072cea
+EBUILD tpm2-tss-engine-1.1.0-r1.ebuild 873 BLAKE2B a08a6ac9fb15bb90576eba365aa80e3c23b67df12a6186a84df4f949e2dfb7995d928ffeddfc66367f93fa62b9da9e0898f617f263aaab16e6caed237f912086 SHA512 828b2b3317317f049a00bd073c257db6b39d3aae9d902a6fc6e8206615b18a6f78e3ad26a1f93bd564ac209d2a9defea80dce849c648e6da550af9557516a823
 MISC metadata.xml 498 BLAKE2B 00c3e4cdaaf71d33864bfdca3585e9874a6d984aa6d825e8ed2dcc00afa022c5908b37da3e391238f4c7519408d4dcaafff40ceee644312e568627c44bfdecec SHA512 459f2c5d0a6051a81cf5f3c17f65248fe8e1681db2032ccebc2a1c0de6ea427c45bb317ffd374bb141f5f06bc16305e61bc591df9d943821fe1ac0f31e4f5323
diff --git a/app-crypt/tpm2-tss-engine/tpm2-tss-engine-1.1.0.ebuild b/app-crypt/tpm2-tss-engine/tpm2-tss-engine-1.1.0-r1.ebuild
index 00b662bda57d..a737e7269f55 100644
--- a/app-crypt/tpm2-tss-engine/tpm2-tss-engine-1.1.0.ebuild
+++ b/app-crypt/tpm2-tss-engine/tpm2-tss-engine-1.1.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
@@ -15,7 +15,7 @@ KEYWORDS="~amd64"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
-RDEPEND="app-crypt/tpm2-tss
+RDEPEND="app-crypt/tpm2-tss:=
 	dev-libs/openssl:0="
 DEPEND="${RDEPEND}
 	test? ( dev-util/cmocka )"
@@ -37,5 +37,6 @@ src_configure() {
 
 src_install () {
 	default
+	find "${ED}" -name '*.la' -delete || die
 	dobashcomp bash-completion/*
 }
diff --git a/app-crypt/tpm2-tss/Manifest b/app-crypt/tpm2-tss/Manifest
index 53e0c825241f..ad05338f021c 100644
--- a/app-crypt/tpm2-tss/Manifest
+++ b/app-crypt/tpm2-tss/Manifest
@@ -1,10 +1,9 @@
-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.6.tar.gz 1472883 BLAKE2B e007de07c759e77e377f8569c0c5d94ab57597ea3cb452fb598a47c9b404714a7816c86221d4eacad962436fc7625066d4066f433cd957c37b92d51b0455e2a0 SHA512 f7f7f067605ea30661ac891e22095238689856e22e45f11a6b603cb36ed1ae0724ae52d36f0ee5dd72208da8520457667676ae08107647faa5441a0c9b642f7a
 DIST tpm2-tss-3.1.0.tar.gz 1584690 BLAKE2B cee2807a030b8bab653045cb11dfc7a6a3f7b1e60c1ce4650ba5f0549f29f36ff307e7d53fb5ef9c950b4dae720bdaf35f7cd1e59ebc07b3f16740035e1d5738 SHA512 8967f172c92f1e3e5ba324dbe8afe07bf1bc7179dd755cef9812105f32634f312ee7cc7dfe8e13af69dc219432463f5dc9b93477743de47aba6af1d70b252405
+DIST tpm2-tss-3.1.1.tar.gz 1592495 BLAKE2B 0f021516700ca14a1c987d7078f1402eb2a6e2f7fc325df3ace3bd9104fe5a2211aa335af0b7f05f5e0d8c2038e0033ba498551021fa2fb5947c213813ef8796 SHA512 3010a32be2d41c2f2e06c2b745a18b3f36aaa0aec7568361902deed26779e8f76c84076ceb2a9447df8194cfc9d3b50116b7311d51d83d63037dbdca60c1384e
 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 1730 BLAKE2B e240c1e2dbe8ec07ea76f3106b4193ed07c59c69b769259529579838500d2b8431119116fa03ee8b712778c59c8aaca680c4a20462a76deef81e7a19387b2f35 SHA512 1856795cde9db35aa62dbe81872c7b01c62f5383927b0f7f5dcad7f19cd4d92885eacebcec3a56e9e1389a57f5548a2dba7f52d11afc4080840ada1e3b924e01
+EBUILD tpm2-tss-3.1.1.ebuild 2463 BLAKE2B 8a7f65df052be128b54178a82eabd3d1374364e2cb779497fb306162a82cfda23656bafb5cbd86a4e12df0356b18701bcbe0290b6d73ff22fbd765f138d69429 SHA512 f1ac1ecb7cccdae3076e536a6bc08693221cf4ac1f1ecc2b43450a7a6502d31c2b91ef2d380ce485e4fdd19029e89bed29ea13e37af9d2c3b188061572597c56
 EBUILD tpm2-tss-3.2.0-r2.ebuild 2493 BLAKE2B 9f027015cc2bd37f220f0628a419985cde67cebbc910a7515c7a5498fc42588fbfc56c389effeed688e02d870e0fe033b06cbeafaaa4968c580ed75045e94b3d SHA512 51e754e89e83e6d9877b3715d7331fa39b4bc71d305f16ba7afb33d17bf4545d8b79789bdf5777ef5e74bac968364320c5cb7b991eb5c1117ac9d9c1a338b3e8
-MISC metadata.xml 827 BLAKE2B d771c64e37ccd09adbf4c40c412b744b1fdecc5497116e1fb5518f26921195a9141710f4e4d8daaabe6fb9076719bf87c088665fcd6d037d4875bfa761f9bcb6 SHA512 9b1fb93de976edafed96599a093aa4f8058d2542b6dd9be0fb2de5849f77394f2e17b6f4397c14b1dc13b679fb91c38c7852cfaed37908d4c0a2f216a56c659c
+EBUILD tpm2-tss-3.2.0-r3.ebuild 2508 BLAKE2B 351f163b26b452cdffeca84245826c29eace7e48b1eab6e08d2625e94f2e83227a6cabe15de4d7a2d43f684766d0537a174f090ed50f68d1490e39223e1dcbde SHA512 23fa5d59d93ef7d593a788a2bab0db22582746f4004c9b7106b0af715eb6dd4d3ab63f5187cf974c7fefb1021dfde21066cc39d86dafaa498269bcf831d8f5e1
+MISC metadata.xml 747 BLAKE2B 0462c5942012c444e13bf094be03e0cc142b3b5e3e613570506f84be45bb3019876f3f44454b078668c7e3cbd4a60819cd2ea57c588cab34bfe82f76f222bcf8 SHA512 dab6f379190e40b0321597f0c5fa03ee5731eb77e91dc5d82d2f57c896cf40a074598ba1dedd1575e4e23e1fc5ed306f83cb50992fca6cc2bc1a1db822765a7a
diff --git a/app-crypt/tpm2-tss/files/tpm2-tss-2.4.1-configure.ac-wrap-PKG_CHECK_MODULES-in-braces.patch b/app-crypt/tpm2-tss/files/tpm2-tss-2.4.1-configure.ac-wrap-PKG_CHECK_MODULES-in-braces.patch
deleted file mode 100644
index 111c3d75c690..000000000000
--- a/app-crypt/tpm2-tss/files/tpm2-tss-2.4.1-configure.ac-wrap-PKG_CHECK_MODULES-in-braces.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-From 94cc338b0c5b97702e994ec628d684ee2c114547 Mon Sep 17 00:00:00 2001
-From: Tadeusz Struk <tadeusz.struk@intel.com>
-Date: Tue, 24 Mar 2020 16:42:14 -0700
-Subject: [PATCH] configure.ac: wrap PKG_CHECK_MODULES in braces
-
-PKG_CHECK_MODULES needs to be wrapped inside squere
-brackets when inside AS_IF, or it spit out errors:
-
-./configure: line 13054: JSONC_CFLAGS: command not found
-./configure: line 13055: C: command not found
-./configure: line 13056: JSONC_LIBS: command not found
-./configure: line 13155: CURL_CFLAGS: command not found
-./configure: line 13156: CURL_LIBS: command not found
-
-Signed-off-by: Tadeusz Struk <tadeusz.struk@intel.com>
----
- Makefile.am  | 2 +-
- configure.ac | 4 ++--
- 2 files changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/Makefile.am b/Makefile.am
-index 85683f9b..9144a5ad 100644
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -467,7 +467,7 @@ src_tss2_fapi_libtss2_fapi_la_LIBADD  = $(libtss2_sys) $(libtss2_mu) $(libtss2_e
- 
- src_tss2_fapi_libtss2_fapi_la_SOURCES = $(TSS2_FAPI_SRC)
- src_tss2_fapi_libtss2_fapi_la_CFLAGS  = $(AM_CFLAGS) -I$(srcdir)/src/tss2-fapi
--src_tss2_fapi_libtss2_fapi_la_LDFLAGS = $(AM_LDFLAGS) $(LIBCRYPTO_LIBS) $(JSON_C_LIBS) $(CURL_LIBS)
-+src_tss2_fapi_libtss2_fapi_la_LDFLAGS = $(AM_LDFLAGS) $(LIBCRYPTO_LIBS) $(JSONC_LIBS) $(CURL_LIBS)
- if HAVE_LD_VERSION_SCRIPT
- src_tss2_fapi_libtss2_fapi_la_LDFLAGS += -Wl,--version-script=$(srcdir)/lib/tss2-fapi.map
- endif # HAVE_LD_VERSION_SCRIPT
-diff --git a/configure.ac b/configure.ac
-index a202d4a6..2edf609e 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -165,10 +165,10 @@ AS_IF([test "x$enable_fapi" != xno -a "x$with_crypto" != "xossl"],
-     AC_MSG_ERROR([FAPI has to be compiled with OpenSSL]))
- 
- AS_IF([test "x$enable_fapi" = xyes ],
--    PKG_CHECK_MODULES([JSON_C], [json-c]))
-+      [PKG_CHECK_MODULES([JSONC], [json-c])])
- 
- AS_IF([test "x$enable_fapi" = xyes ],
--    PKG_CHECK_MODULES([CURL], [libcurl]))
-+      [PKG_CHECK_MODULES([CURL], [libcurl])])
- 
- AC_ARG_WITH([tctidefaultmodule],
-             [AS_HELP_STRING([--with-tctidefaultmodule],
--- 
-2.26.2
-
diff --git a/app-crypt/tpm2-tss/files/tpm2-tss-2.4.2-Dont-run-systemd-sysusers-in-Makefile.patch b/app-crypt/tpm2-tss/files/tpm2-tss-2.4.2-Dont-run-systemd-sysusers-in-Makefile.patch
deleted file mode 100644
index c37a73531c02..000000000000
--- a/app-crypt/tpm2-tss/files/tpm2-tss-2.4.2-Dont-run-systemd-sysusers-in-Makefile.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff --git a/Makefile.am b/Makefile.am
-index 322415b8..39e09063 100644
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -602,10 +602,6 @@ endif #FAPI
- EXTRA_DIST += dist/tpm-udev.rules
- 
- install-dirs:
--if HOSTOS_LINUX
--	(systemd-sysusers && systemd-tmpfiles --create) || \
--	($(call make_tss_user_and_group) && $(call make_fapi_dirs) && ($call set_fapi_permissions)) || true
--endif
- 
- install-data-hook: install-dirs
- 	-if [ ! -z "$(udevrulesprefix)" ]; then \
diff --git a/app-crypt/tpm2-tss/metadata.xml b/app-crypt/tpm2-tss/metadata.xml
index 42f4f7e8b1bd..0a726fa2d171 100644
--- a/app-crypt/tpm2-tss/metadata.xml
+++ b/app-crypt/tpm2-tss/metadata.xml
@@ -11,7 +11,6 @@
 	</maintainer>
 	<use>
 		<flag name="fapi">Enable feature API (requires openssl as crypto backend)</flag>
-		<flag name="gcrypt">Use <pkg>dev-libs/libgcrypt</pkg> as crypto engine</flag>
 		<flag name="mbedtls">Use <pkg>net-libs/mbedtls</pkg> as crypto engine</flag>
 		<flag name="openssl">Use <pkg>dev-libs/openssl</pkg> as crypto engine</flag>
 	</use>
diff --git a/app-crypt/tpm2-tss/tpm2-tss-2.4.6.ebuild b/app-crypt/tpm2-tss/tpm2-tss-2.4.6.ebuild
deleted file mode 100644
index 2db31aefd06e..000000000000
--- a/app-crypt/tpm2-tss/tpm2-tss-2.4.6.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.1.ebuild b/app-crypt/tpm2-tss/tpm2-tss-3.1.1.ebuild
new file mode 100644
index 000000000000..7d2a404b0018
--- /dev/null
+++ b/app-crypt/tpm2-tss/tpm2-tss-3.1.1.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/3"
+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[${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 ) )"
+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-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
+	udev_reload
+}
diff --git a/app-crypt/tpm2-tss/tpm2-tss-3.2.0-r3.ebuild b/app-crypt/tpm2-tss/tpm2-tss-3.2.0-r3.ebuild
new file mode 100644
index 000000000000..76e430b121d9
--- /dev/null
+++ b/app-crypt/tpm2-tss/tpm2-tss-3.2.0-r3.ebuild
@@ -0,0 +1,95 @@
+# 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/3"
+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
+	udev_reload
+}
diff --git a/app-crypt/trousers/Manifest b/app-crypt/trousers/Manifest
index 6c6bbd37f01b..0db63504c83a 100644
--- a/app-crypt/trousers/Manifest
+++ b/app-crypt/trousers/Manifest
@@ -1,13 +1,8 @@
 AUX 61-trousers.rules 96 BLAKE2B ba66e3652f5a82f4b86fb45f556322046b06b2aacbd4b0b8e118f86dd612eea9ad0c67dbd037fd738ef48f74dea3d8699acefd224d33350e54db94238b4fd479 SHA512 83fa5b8666bcb0111f69456e6b9ea73eca2e1933e44bf7b705ff4d3c7b63a63ae4d0a1c30b0a00ebe6a8b4206ed7df80abca8503ace1c795119213f3546e9307
-AUX tcsd.confd 372 BLAKE2B 535a5bb44cd18e4d0b7520a8ea840159d35e4ae0c557b63ec7892b7827bfb8d4924e4d226baa25d5d6b1c7c68d552da916d7e507339c2af4138441f66d165683 SHA512 1e33f521156d55ff450907e01a7c60750e2880520700de1e8fb42ed03d5a16a20332f6f437f2cc7ed155f65b9306bf2d670f46c4b7055d4c9248beaeb06f8a75
-AUX tcsd.initd 843 BLAKE2B 1c2190a10823130ed69c79761063656e55cdadafeca99053d12a86f110091936f44475f5ea6adaf90e7eb70f3871fcf6452c96c86b5bc88ae28a1a5144e2a95b SHA512 d43dac0f8a7b878fb7572df8e3314ef2e6c1b90ff794df2f41192e7e4f3c8849602dde49db359e6566f1e426b63fc214c6b9dea731fcb7f3c09623e3c27b2001
+AUX tcsd.initd 363 BLAKE2B c8142c8939fe92ce902cd225910af4098cae15d7a47f858c9384e03f51964355d62144f0f736957530cfe0dd6b698b54c857035f6529d5013ce5c66b4a7b5d20 SHA512 156395199cc58c0f1a9febf60e5d5bc21a1e09f2e02862134530eb65431e7a3a1db466862f307ff797841f4c806f5893aadfb9eda3bb7c7a95b6327155378674
 AUX tcsd.service 131 BLAKE2B db7995ca078c6008daba2bee50b892d5ae0fceb184c966f67578185dbdd81b8a3a55000029215d28d99e8e3ccd73f64b85b66cc4f4a337f28ee9d9ade4222067 SHA512 e516bde8ce45fe4ad687aaaabae475da9c20a9fbd8ebee736d09ceb6efa597efb6f3bb99840a4c0d2c9eb77c2824df6ee45985b46dc8cf924b4eed67eeec1468
 AUX trousers-0.3.13-nouseradd.patch 606 BLAKE2B 7e4a479fe1bdc75f743263c1321f2d99cfe99d04d8196b57a158bd2ce75335526b2001c2af8aa0f8b17ddfefa304685e237385be0bc4113d5ca366dd464fa85d SHA512 a6c9074e535429f09ce5e850d943378348b54bed479b7fef0fff7bb18ab2547421407900aa35533749a764275a241ddbd083c4e2f3d6a9ad6f9b1d40d090f783
 AUX trousers-0.3.14-Makefile.am-Mark-tddl.a-nodist.patch 746 BLAKE2B 91dec77a329a4931487cdff54ab8c77ae302af6bc741da3db61bc34b416d29615808799c8a4c5b39a293021dc1cc16642461037fcb367507ceadcc4456565715 SHA512 704a87fd4b5e50356ac6a0ad68aec04eebb2030d9818c9e23a40f2e621d6e2d5e5660b81997b459e67a8059a0d88a254a41baa833806ce99268ee24b1190ae0b
-AUX trousers-0.3.14-fno-common.patch 385 BLAKE2B 7ed20c894c4687275804adf8d820227e5b246f02880d38b29dc6a17d12a4932059f237913f8d1841d56ee32c652cf732c01e77cd1235255b8e2fc28bc9a78027 SHA512 cf771b065d972b9974c93ec67a471a8ed3da737178a14b2d14537ee7948544bcbf071201d42d6e2b1333a3c30e8104cd1dbb344327a424597e5046e50137a692
-AUX trousers-0.3.14-tcsd-fixes.patch 2203 BLAKE2B 8085cfd36817e35d54d39a012037945440fcae6e5040f7a7fd35a3c814df93264382a87eb06758b6042b64bef851ab3d5f5e424c2b946c0d1eaa92ebb97a733f SHA512 cc2827ed501cc29dcadd00537161804a62918c9dc703b2a773227aaf74a695d026b44c70848819a78b01cc785831117ae9dfa1d4c30133241b97dd32e8e838ba
-DIST trousers-0.3.14.tar.gz 1378438 BLAKE2B 3dc2824fa2ca1b1f1181f98d59e85276e7d38af4bfc07ee8246431d9ccb300a8e0820b318643d4cf5d757d2a49492c8686e2fe9de03484263d2189d4bbaa32d0 SHA512 bf87f00329cf1d76a12cf6b6181fa22f90e76af3c5786e6e2db98438d2d3f0c0e05364374664173f45e3a2f6c0e2364948d0b958a7845cb23fcb340150cd9b21
 DIST trousers-0.3.15.tar.gz 4699936 BLAKE2B 53c60498ed6a9d3d87295b00676e5d0d82452918c35af6b98c7979ffa2dc04dd817e7cd3f4a33ca17c30b90eab53d80b2bb25306fe9db7bda2125019edfed280 SHA512 769c7d891c6306c1b3252448f86e3043ee837e566c9431f5b4353512113e2907f6ce29c91e8044c420025b79c5f3ff2396ddce93f73b1eb2a15ea1de89ac0fdb
-EBUILD trousers-0.3.14-r3.ebuild 1580 BLAKE2B 7dcebd1140aee67cc63e4665afd2bb030bc44339ada7dcc6f9f5dbc2bd1f010c3eef573ae3ca35e8fbcf1450ce6e2a3539bc13479c3f5dbffcd81f96f774e107 SHA512 c62b0f19be4be398c94220be992c933595ed4c6182bf135458d8090695ed831be1f219ec778edf524dae7383e0b83f731bd829b57c7007f0535e0cba273fd827
-EBUILD trousers-0.3.15.ebuild 1506 BLAKE2B 12fdc774facfc1060ca3e9b3a4eb969e099c20bb5d78557d0e4198e3655f3bcc34d1c759aebe9f59a1c9a5f1938dc4990b566b099e662874b734702853f19901 SHA512 7bea49dd5974fa79fc5b8f0bebed1e7f5add0a1ea223dc24f94b6f94c4a24cd8017d47e529c9b1602402a4354d381105950cbdf07294985c28f77f6c79ea48e0
+EBUILD trousers-0.3.15.ebuild 1479 BLAKE2B 0279e032e55f9c24e914411dd990ef129beafccf1dd50200e0ec5121cca6eb49e6f527104b1a4811e7bf8b87f03e8c97b8dcc7afccb0e6ae36588f2b91f02bc4 SHA512 f5e96759b0cb25949678abd69df160c02ef81fbbc45d33bf605143a38b6cd2a7769a2fa5c82f429e213f31f0dec4ce22fb084ad9ba5dd239776aadfe0ab97739
 MISC metadata.xml 542 BLAKE2B 07459ff82ec6f21116e860820a212a751bd07fcad1b175417d8d3b12709c870c523776e228c19aa7f824ac13d304afb533c697c22551ef977b3b9c687d2f6b00 SHA512 c980dfc26aaf0c6718fb9088d91296760db245807f0293a6c7abe412774e9bc297c401153df71ebeeddbc28e92441e3e1e78a5e16c5fca8d3445fe0558faadb1
diff --git a/app-crypt/trousers/files/tcsd.confd b/app-crypt/trousers/files/tcsd.confd
deleted file mode 100644
index 78bedb9fda30..000000000000
--- a/app-crypt/trousers/files/tcsd.confd
+++ /dev/null
@@ -1,9 +0,0 @@
-# /etc/conf.d/tscd
-
-# Configuration file for the TrouSerS' TCS daemon (tcsd) init script
-# Have a look on /etc/tcsd.conf too, there is more to configure there.
-
-# TPM_MODULES: name of the module(s) that should be loaded. You only need to
-# set this if your driver is not compiled in kernel and is not already loaded
-# on boot.    (default: unset)
-#TPM_MODULES="tpm_atmel"
diff --git a/app-crypt/trousers/files/tcsd.initd b/app-crypt/trousers/files/tcsd.initd
index c9c050cb06d9..9b18c48e1ee3 100644
--- a/app-crypt/trousers/files/tcsd.initd
+++ b/app-crypt/trousers/files/tcsd.initd
@@ -1,38 +1,19 @@
 #!/sbin/openrc-run
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
+command=/usr/sbin/tcsd
+description="TrouSerS' TCS daemon (tcsd)"
+command_user="tss:tss"
+
 depend() {
 	use logger
 	need net
 }
 
-checkconfig() {
-	local mod
-	if [ -n "${TPM_MODULES}" ] ; then
-		for mod in ${TPM_MODULES} ; do
-			lsmod | grep -q "^${mod}\b" \
-				|| modprobe ${mod} &>/dev/null \
-				|| ewarn "Failed to load module ${mod}"
-		done
-		# Should we sleep or something to wait for device creation?
-	fi
+start_pre() {
 	if [ ! -c /dev/tpm ] && [ ! -c /dev/tpm0 ] ; then
 		eerror "No TPM device found!"
 		return 1
 	fi
-	return 0
-}
-
-start() {
-	ebegin "Starting TrouSerS' TCS daemon (tcsd)"
-	checkconfig || eend $?
-	start-stop-daemon --start --user tss --exec /usr/sbin/tcsd
-	eend $?
-}
-
-stop() {
-	ebegin "Stopping TrouSerS' TCS daemon (tcsd)"
-	start-stop-daemon --stop --quiet --exec /usr/sbin/tcsd --user tss
-	eend $?
 }
diff --git a/app-crypt/trousers/files/trousers-0.3.14-fno-common.patch b/app-crypt/trousers/files/trousers-0.3.14-fno-common.patch
deleted file mode 100644
index 5046bc70883b..000000000000
--- a/app-crypt/trousers/files/trousers-0.3.14-fno-common.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff --git a/src/include/tcsd.h b/src/include/tcsd.h
-index 5b9462b..05bae97 100644
---- a/src/include/tcsd.h
-+++ b/src/include/tcsd.h
-@@ -166,8 +166,8 @@ void	   thread_signal_init();
- 
- /* signal handling */
- #ifndef __APPLE__
--struct sigaction tcsd_sa_int;
--struct sigaction tcsd_sa_chld;
-+extern struct sigaction tcsd_sa_int;
-+extern struct sigaction tcsd_sa_chld;
- #endif
- 
- #endif
diff --git a/app-crypt/trousers/files/trousers-0.3.14-tcsd-fixes.patch b/app-crypt/trousers/files/trousers-0.3.14-tcsd-fixes.patch
deleted file mode 100644
index 10031e088293..000000000000
--- a/app-crypt/trousers/files/trousers-0.3.14-tcsd-fixes.patch
+++ /dev/null
@@ -1,58 +0,0 @@
-Index: trousers-0.3.14/src/tcs/ps/tcsps.c
-===================================================================
---- trousers-0.3.14.orig/src/tcs/ps/tcsps.c
-+++ trousers-0.3.14/src/tcs/ps/tcsps.c
-@@ -72,7 +72,7 @@ get_file()
- 	}
- 
- 	/* open and lock the file */
--	system_ps_fd = open(tcsd_options.system_ps_file, O_CREAT|O_RDWR, 0600);
-+	system_ps_fd = open(tcsd_options.system_ps_file, O_CREAT|O_RDWR|O_NOFOLLOW, 0600);
- 	if (system_ps_fd < 0) {
- 		LogError("system PS: open() of %s failed: %s",
- 				tcsd_options.system_ps_file, strerror(errno));
-Index: trousers-0.3.14/src/tcsd/svrside.c
-===================================================================
---- trousers-0.3.14.orig/src/tcsd/svrside.c
-+++ trousers-0.3.14/src/tcsd/svrside.c
-@@ -473,6 +473,7 @@ main(int argc, char **argv)
- 		}
- 		return TCSERR(TSS_E_INTERNAL_ERROR);
- 	}
-+	setgid(pwd->pw_gid);
- 	setuid(pwd->pw_uid);
- #endif
- #endif
-Index: trousers-0.3.14/src/tcsd/tcsd_conf.c
-===================================================================
---- trousers-0.3.14.orig/src/tcsd/tcsd_conf.c
-+++ trousers-0.3.14/src/tcsd/tcsd_conf.c
-@@ -743,7 +743,7 @@ conf_file_init(struct tcsd_config *conf)
- #ifndef SOLARIS
- 	struct group *grp;
- 	struct passwd *pw;
--	mode_t mode = (S_IRUSR|S_IWUSR);
-+	mode_t mode = (S_IRUSR|S_IWUSR|S_IRGRP);
- #endif /* SOLARIS */
- 	TSS_RESULT result;
- 
-@@ -798,15 +798,15 @@ conf_file_init(struct tcsd_config *conf)
- 	}
- 
- 	/* make sure user/group TSS owns the conf file */
--	if (pw->pw_uid != stat_buf.st_uid || grp->gr_gid != stat_buf.st_gid) {
-+	if (stat_buf.st_uid != 0 || grp->gr_gid != stat_buf.st_gid) {
- 		LogError("TCSD config file (%s) must be user/group %s/%s", tcsd_config_file,
--				TSS_USER_NAME, TSS_GROUP_NAME);
-+				"root", TSS_GROUP_NAME);
- 		return TCSERR(TSS_E_INTERNAL_ERROR);
- 	}
- 
--	/* make sure only the tss user can manipulate the config file */
-+	/* make sure only the tss user can read (but not manipulate) the config file */
- 	if (((stat_buf.st_mode & 0777) ^ mode) != 0) {
--		LogError("TCSD config file (%s) must be mode 0600", tcsd_config_file);
-+		LogError("TCSD config file (%s) must be mode 0640", tcsd_config_file);
- 		return TCSERR(TSS_E_INTERNAL_ERROR);
- 	}
- #endif /* SOLARIS */
diff --git a/app-crypt/trousers/trousers-0.3.14-r3.ebuild b/app-crypt/trousers/trousers-0.3.14-r3.ebuild
deleted file mode 100644
index 72418a365fc0..000000000000
--- a/app-crypt/trousers/trousers-0.3.14-r3.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools linux-info readme.gentoo-r1 systemd udev
-
-DESCRIPTION="An open-source TCG Software Stack (TSS) v1.1 implementation"
-HOMEPAGE="http://trousers.sf.net"
-SRC_URI="mirror://sourceforge/trousers/${PN}/${P}.tar.gz"
-
-LICENSE="CPL-1.0 GPL-2"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ~m68k ~ppc ppc64 ~s390 x86"
-IUSE="doc selinux" # gtk
-
-# gtk support presently does NOT compile.
-#	gtk? ( >=x11-libs/gtk+-2 )
-
-DEPEND="acct-group/tss
-	acct-user/tss
-	>=dev-libs/glib-2
-	>=dev-libs/openssl-0.9.7:0=
-	"
-RDEPEND="${DEPEND}
-	selinux? ( sec-policy/selinux-tcsd )"
-BDEPEND="virtual/pkgconfig"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-0.3.13-nouseradd.patch"
-	"${FILESDIR}/${P}-fno-common.patch"
-	"${FILESDIR}/${P}-Makefile.am-Mark-tddl.a-nodist.patch"
-	"${FILESDIR}/${P}-tcsd-fixes.patch"
-)
-
-DOCS="AUTHORS ChangeLog NICETOHAVES README TODO"
-
-DOC_CONTENTS="
-	If you have problems starting tcsd, please check permissions and
-	ownership on /dev/tpm* and ~tss/system.data
-"
-S="${WORKDIR}"
-
-CONFIG_CHECK="~TCG_TPM"
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	# econf --with-gui=$(usex gtk gtk openssl)
-	econf --with-gui=openssl
-}
-
-src_install() {
-	default
-	find "${D}" -name '*.la' -delete || die
-
-	keepdir /var/lib/tpm
-	use doc && dodoc doc/*
-	newinitd "${FILESDIR}"/tcsd.initd tcsd
-	newconfd "${FILESDIR}"/tcsd.confd tcsd
-	systemd_dounit "${FILESDIR}"/tcsd.service
-	udev_dorules "${FILESDIR}"/61-trousers.rules
-	fowners tss:tss /var/lib/tpm
-	readme.gentoo_create_doc
-}
diff --git a/app-crypt/trousers/trousers-0.3.15.ebuild b/app-crypt/trousers/trousers-0.3.15.ebuild
index b3b23fa8f5c2..b25a3dfb4c72 100644
--- a/app-crypt/trousers/trousers-0.3.15.ebuild
+++ b/app-crypt/trousers/trousers-0.3.15.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
@@ -57,9 +57,9 @@ src_install() {
 	keepdir /var/lib/tpm
 	use doc && dodoc doc/*
 	newinitd "${FILESDIR}"/tcsd.initd tcsd
-	newconfd "${FILESDIR}"/tcsd.confd tcsd
 	systemd_dounit "${FILESDIR}"/tcsd.service
 	udev_dorules "${FILESDIR}"/61-trousers.rules
 	fowners tss:tss /var/lib/tpm
 	readme.gentoo_create_doc
+	udev_reload
 }
diff --git a/app-crypt/xca/Manifest b/app-crypt/xca/Manifest
index 13ac355976ef..0dd8d0ad8b72 100644
--- a/app-crypt/xca/Manifest
+++ b/app-crypt/xca/Manifest
@@ -1,9 +1,5 @@
 AUX xca-1.0.0-desktop.patch 391 BLAKE2B 1cbec5681df8da9230b783c8ea048a199bd31a38fce6781dcd86b926e03b245de05b148d8df9034f5c7470dcf5823bd4a080cbb011a1a32fc0b96d8a8a5d950d SHA512 5dd62d8d2f4485b6155e466bb9a012f44104ff36c97bae61e8155880b937fc1271e94fb5b83627bd828e3cde0ab421a150458d050cb512d633d1c5c97f80f163
-AUX xca-2.3.0-bug-733000.patch 949 BLAKE2B 32444301ee1a3e4cd9e31e0911df6fbb99866b3d81ebb880ae46816c9939f8ccf6f3e13bb2052c6619e567f2beb34e903ba438ba6815bbcca03f0cd5a38e4bca SHA512 515e1d1333e722bc22750ef084e0c01056687b28e4b3e78695da2273be3e1e5cb7dc56c5dbf4fb5a6f46bc1835b44a7697d5548223fe9e93c3ad183f1c333d70
 AUX xca-2.4.0-bug-733000.patch 873 BLAKE2B f63029bf31f69058728db74cb798f641be7210e54a93ee0caaa039cd8bf468106f2d79cab8c8af4891cba6a674b415f75cdb7e4acf74196809138b0fd3a91e4a SHA512 d50ca729596370d3e696f6eebdfad11df6ff1da452b4125b0ccfaa10a0e11b79bc82a2adb576524f6c3bdbb418aaf86ccabe3e7735ddece54f0ca1e88eb30678
-DIST xca-2.3.0.tar.gz 1354154 BLAKE2B 31a4ac96819e8d2f7e5f623cc343f0cbff18c931ed0699dbe093dcb963c3431a3943c4dcd8f3d727896104c05a565d062b9678169bf2a8d3f7cf7748c311b53b SHA512 35522aa308e1022a739f3255f13fcf63f481000f9b7411027a009a185e33ddceeb5cf9b55406a4899d2393c7e5ace10354ff24b3b2b0c3045d110f679756b0b8
 DIST xca-2.4.0.tar.gz 1778572 BLAKE2B 2e90ef264dc53019cc37700b37d5eb0c48904ca371ae1ce0cfe2ad61be8765951ea918d356c1f2764e73d846693a66c903cba1381df5d1a588aae8bb45f8c195 SHA512 e93e2cf9dc48ed43ee9b51e977f825d81ff08835eb4d77fcbe8f9dc8ce31c77c1da879b48c25ab535717542d1fe84faa6e46c410c116edbee02072040c59667c
-EBUILD xca-2.3.0-r1.ebuild 1480 BLAKE2B a87a7c58d35d2d027e86da61fe682956fb0e20d6905e4fa97f3c2d7a8148c625c8fab62a96d0421b8719921dd1cf878a88c1249d28ef40243beb0ba010b43743 SHA512 c2c21337ae03998a759fcd7601b1f788547766bab9e0d467df71bd467b2294702799638bccf86f018f6558d9b57ef00821dc31e89294c710dfc19e7f0c09c76c
-EBUILD xca-2.4.0-r1.ebuild 1505 BLAKE2B e1d433ee81b5231295e375040d45d4b535d2e41c47bf0e743ce6b07251aba0f1954885539572e03d00987f8107838998856ff8742804d7f0853dad8547f047c3 SHA512 3e53f46ef9154995b5dca4bffc1aabc7d3495362eaaf819b4080b794837103028a4993da05c1c2fd5116b998faa2a651346ba4afffbb44bd0397676f27d7f4e9
 EBUILD xca-2.4.0-r2.ebuild 1483 BLAKE2B b3e3c4a9c213701679a2d3c7350bceb0e090fb5b94d1d4f70b3f79f7f783be23511e4e37309988dd0db19b58d9344fbede423d40c13468bc97fdace4f38cfd3a SHA512 09ec52410045e16a47f0d04f96242d7d2540909a18802fab4d72b60ec82339155fa10c1b3654a95cdd6dcfd593d012c76bc2699a5ca822565372217c52d03363
 MISC metadata.xml 304 BLAKE2B f99e5a2ed991066c1c605ca7bba6669b362e90a96e5a26258caf8d6491f8c5351cc897826bd06dda28ac67cc3813b0fa640b8fe304aeea7ea10b75fa3074d340 SHA512 b8d54115ab45ecc869066e083938a28d075f4436fef33607685e633976843023b3fe4fb65456ba04532f38c4f35b7dc109f68c59c11ad4e73f2332786fee6cf5
diff --git a/app-crypt/xca/files/xca-2.3.0-bug-733000.patch b/app-crypt/xca/files/xca-2.3.0-bug-733000.patch
deleted file mode 100644
index 044575475c89..000000000000
--- a/app-crypt/xca/files/xca-2.3.0-bug-733000.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-diff --git a/doc/Makefile b/doc/Makefile
-index d481c5a..dc5b49a 100644
---- a/doc/Makefile
-+++ b/doc/Makefile
-@@ -5,13 +5,9 @@ endif
- 
- DELFILES=xca*.html xca.1.gz changelog.html database_schema.html
- 
--doc: xca.1.gz xca.html changelog.html database_schema.html
-+doc: xca.1 xca.html changelog.html database_schema.html
- include $(TOPDIR)/Rules.mak
- 
--%.1.gz: %.1
--	@$(PRINT) "  MAN    [$(BASENAME)] $@"
--	gzip -9 <$^ >$@
--
- xca.html: xca.sgml
- 	rm -f xca*.html
- 	echo 'The documentation for XCA can be viewed online at: <a href="http://hohnstaedt.de/documentation">http://hohnstaedt.de/documentation</a>.' > $@
-@@ -23,7 +19,7 @@ install: $(doc)
- 	$(ENABLE_DOC)install -m 755 -d $(DESTDIR)$(htmldir)
- 	$(ENABLE_DOC)install -m 644 xca*.html $(DESTDIR)$(htmldir)
- 	install -m 755 -d $(DESTDIR)$(mandir)/man1
--	install -m 644 *.1.gz $(DESTDIR)/$(mandir)/man1
-+	install -m 644 *.1 $(DESTDIR)/$(mandir)/man1
- 
- app: xca.html
- 	mkdir -p $(APPDIR)/Resources
diff --git a/app-crypt/xca/xca-2.3.0-r1.ebuild b/app-crypt/xca/xca-2.3.0-r1.ebuild
deleted file mode 100644
index e0b579e762e2..000000000000
--- a/app-crypt/xca/xca-2.3.0-r1.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-inherit xdg-utils
-
-DESCRIPTION="A GUI to OpenSSL, RSA public keys, certificates, signing requests etc"
-HOMEPAGE="https://hohnstaedt.de/xca/"
-SRC_URI="https://github.com/chris2511/${PN}/releases/download/RELEASE.${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux ~ppc-macos"
-IUSE="bindist doc"
-
-RDEPEND="
-	dev-libs/libltdl:0=
-	dev-qt/qtgui:5
-	dev-qt/qtsql:5[sqlite]
-	dev-qt/qtwidgets:5
-	dev-libs/openssl:0=[bindist(-)=]
-	doc? ( app-text/linuxdoc-tools )"
-DEPEND="${RDEPEND}
-	dev-qt/linguist-tools:5"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-1.0.0-desktop.patch"
-	"${FILESDIR}/${P}-bug-733000.patch"
-)
-
-src_configure() {
-	econf \
-		--with-qt-version=5 \
-		$(use_enable doc) \
-		STRIP=true
-}
-
-src_prepare() {
-	sed '/^CFLAGS/s@-O2 -ggdb@@' -i Local.mak.in || die
-	default
-}
-
-src_compile() {
-	# enforce all to avoid the automatic silent rules
-	emake all
-}
-
-src_install() {
-	default
-
-	insinto /etc/xca
-	doins misc/*.txt
-
-	ewarn "Make a backup copy of your database!"
-	ewarn "Version 2 completely changes the database format to SQL(ite)"
-	ewarn "Don't try to open it with older versions of XCA (< 1.4.0). They will corrupt the database."
-}
-
-pkg_postinst() {
-	xdg_icon_cache_update
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-}
-
-pkg_postrm() {
-	xdg_icon_cache_update
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-}
diff --git a/app-crypt/xca/xca-2.4.0-r1.ebuild b/app-crypt/xca/xca-2.4.0-r1.ebuild
deleted file mode 100644
index 5fc4696731fa..000000000000
--- a/app-crypt/xca/xca-2.4.0-r1.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="8"
-
-inherit xdg-utils
-
-DESCRIPTION="A GUI to OpenSSL, RSA public keys, certificates, signing requests etc"
-HOMEPAGE="https://hohnstaedt.de/xca/"
-SRC_URI="https://github.com/chris2511/${PN}/releases/download/RELEASE.${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux ~ppc-macos"
-IUSE="bindist doc"
-
-RDEPEND="
-	dev-libs/libltdl:0=
-	dev-qt/qthelp:5
-	dev-qt/qtgui:5
-	dev-qt/qtsql:5[sqlite]
-	dev-qt/qtwidgets:5
-	>=dev-libs/openssl-1.1.0:0=[bindist(-)=]
-	doc? ( app-text/linuxdoc-tools )"
-DEPEND="${RDEPEND}
-	dev-qt/linguist-tools:5"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-1.0.0-desktop.patch"
-	"${FILESDIR}/${P}-bug-733000.patch"
-)
-
-src_configure() {
-	econf \
-		--with-qt-version=5 \
-		$(use_enable doc) \
-		STRIP=true
-}
-
-src_prepare() {
-	sed '/^CFLAGS/s@-O2 -ggdb@@' -i Local.mak.in || die
-	default
-}
-
-src_compile() {
-	# enforce all to avoid the automatic silent rules
-	emake all
-}
-
-src_install() {
-	default
-
-	insinto /etc/xca
-	doins misc/*.txt
-
-	ewarn "Make a backup copy of your database!"
-	ewarn "Version 2 completely changes the database format to SQL(ite)"
-	ewarn "Don't try to open it with older versions of XCA (< 1.4.0). They will corrupt the database."
-}
-
-pkg_postinst() {
-	xdg_icon_cache_update
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-}
-
-pkg_postrm() {
-	xdg_icon_cache_update
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-}
author	V3n3RiX <venerix@koprulu.sector>	2022-05-12 16:42:50 +0300
committer	V3n3RiX <venerix@koprulu.sector>	2022-05-12 16:42:50 +0300
commit	752d6256e5204b958b0ef7905675a940b5e9172f (patch)
tree	330d16e6362a49cbed8875a777fe641a43376cd3 /app-crypt
parent	0c100b7dd2b30e75b799d806df4ef899fd98e1ea (diff)