gentoo resync : 15.06.2021

author: V3n3RiX <venerix@redcorelinux.org> 2021-06-15 14:57:03 +0100
committer: V3n3RiX <venerix@redcorelinux.org> 2021-06-15 14:57:03 +0100
commit: d18bf1e01b65ee4bf0c804e2843b282d3d4e5d7c (patch)
tree: 4a95cbc6ffdf13bad6ecbc7f8d5af99631984123 /app-crypt
parent: e748ba9741f6540f4675c23e3e37b73e822c13a4 (diff)
55 files changed, 467 insertions, 293 deletions
diff --git a/app-crypt/Manifest.gz b/app-crypt/Manifest.gz
index 6497261dae67..63f43b780f12 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 8c3a7198d78a..a01b97038111 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-2.8.9.tar.gz 233430 BLAKE2B fa2c16007bc07dd597443103ebf3afa4986e3885b2b3e0a545cf79408741709171ee67fe019e2abf7891d08cef9d2560a438695dd32c72eb729ea2bea2900221 SHA512 94f771fcbc5b12a2a9992659884d16b543d70db52bccf20eddad931b4a5c233c0fd7362ce525e0cbebfdbd841824b815f5b419572f97b549fea7f2663c92c0a8
-EBUILD acme-sh-2.8.9.ebuild 1176 BLAKE2B b20e0c245dbf3b7f42487b920882aa266fff5d944e358a272389d5d90b4276c7feb52fba39a08d069444d854b758f1ae55e4e4cac09f0243ae86c8e0fae8bf80 SHA512 46f1a2cf03b03245dbd5bf212ab9714c6fdd80de9191bb74eb4e21a560eea53d8d90aa4a7fdd25b2eedbe9b472be88a72f000ad63bbe5e9cd0450a0b552c6ac3
+DIST acme.sh-2.9.0.tar.gz 232001 BLAKE2B bab24bae37098b41e2b5acc5c4fd7106274b9bcc309d605722d4e412c4be1c72b516d59029c246472dfa7adc9575e29bbf2cf7e084177bedaf86516f311c4847 SHA512 bfe19e322b18830406f372a920873b6a4ced0dd2358bdf2f59a97d6b6e163276dd362b51d3b6eef5eb941fd6245d77768bb7b9ed8cfc5182ed171a4263bfb1a1
+EBUILD acme-sh-2.9.0.ebuild 1176 BLAKE2B b20e0c245dbf3b7f42487b920882aa266fff5d944e358a272389d5d90b4276c7feb52fba39a08d069444d854b758f1ae55e4e4cac09f0243ae86c8e0fae8bf80 SHA512 46f1a2cf03b03245dbd5bf212ab9714c6fdd80de9191bb74eb4e21a560eea53d8d90aa4a7fdd25b2eedbe9b472be88a72f000ad63bbe5e9cd0450a0b552c6ac3
 EBUILD acme-sh-9999.ebuild 1068 BLAKE2B 30c215e09a39861eaf708402590c9a5b26585d60627bf743cfa39d3ca50012df52e53a2b350cc67d9980446af22b61678a845b3dd1d007d63fc4ab8eef4de8b7 SHA512 3184802d442b94dbfd38b23a244879cf9f863d4e2371051b6925e8ab1de4077c697f48b1625ff36447c004a679f45df0419b9560d165519e06c96a6250768aa0
 MISC metadata.xml 676 BLAKE2B ff6e0af7a7e7ff2a4571e5a3bda9a8b300c74e2b5b526a364c920372d7be42ec1986c7dd464c539905d8cba59e73645e0d1079fd0129919d53d1c0c833ec86f9 SHA512 94d61b537880bffcfe15e79a1bd82d96ad7f39e180a19d61a0fc0c1e2489e1f48f378ac8683bc8e790d2edc7fcb761a0e5498885b7ae4deeb9e2165e4534e45a
diff --git a/app-crypt/acme-sh/acme-sh-2.8.9.ebuild b/app-crypt/acme-sh/acme-sh-2.9.0.ebuild
index a6b09a058aa2..a6b09a058aa2 100644
--- a/app-crypt/acme-sh/acme-sh-2.8.9.ebuild
+++ b/app-crypt/acme-sh/acme-sh-2.9.0.ebuild
diff --git a/app-crypt/acme/Manifest b/app-crypt/acme/Manifest
index 3d82125a1303..1648d20ff6e6 100644
--- a/app-crypt/acme/Manifest
+++ b/app-crypt/acme/Manifest
@@ -1,8 +1,6 @@
-DIST certbot-1.13.0.tar.gz 1426058 BLAKE2B 661aeb430e468a46362c537efd253bb581c7e94b32c67131ae951a67b14d8b6d0f806b7c66a7f60375bb5fe95c714e1b58d3c811d5e0ee21e371b1ff611f74a8 SHA512 1c88027a2259ef9cfb852dd5bd0d326de52d8d7bcec984ee50dc7e5dfe60e2ea68b50afa255b95b2cac08f51467d6584d5671f2410b112b50ce5e4312969ad48
-DIST certbot-1.14.0.tar.gz 1415709 BLAKE2B db06b380f70eb6e674d935870582489a722fb8b38fba7535a642200dd6a9d036f55742286129266556f6313e232b2a45003b17f7c34e5f7087b6ab14261a8132 SHA512 39ae44374cdbac11c544d4d3194debf4f98c8d8459138a650ab276f59c84e8c8d738bdc056d444506a326280c1f9fb84356a9a8f4fa6a138d701bdf792b817e5
 DIST certbot-1.15.0.tar.gz 1379695 BLAKE2B 002fe05d7ba0bdcb142b57ef2ce6cae4d3e69603f253af6be6e8381311e4962a4c51ef0212d1dfc151af5b40a27a13c22bfff261dead5f8c5bc0ade7f595ca28 SHA512 373447e150974cb1d72cb4eaffe6a8563ce7a43cdd84286bd11dab69d83f52f2736b6538cf5d38c10f7af838437124da9f2de71b6819fcf9347230df05df8259
-EBUILD acme-1.13.0.ebuild 1679 BLAKE2B ff4806292419911de014008dc51d250464f90368325db9a0cd73b6ba2881c6f60563fd7831d999ffba75772cbfa24af517d9fa52556f260f13c5855400d635bf SHA512 fbdc63af62a50e9ca6f98ed17b1b1be58a0a206b4e0940557b592f715a3d8bb81c6432132623e497e94806d595d4e71f0a660512c8ee23bd15b84088a62821cf
-EBUILD acme-1.14.0.ebuild 1679 BLAKE2B 64e0de8b2918b8646553f73125ee0fb9b50b0214281f650dbbd9c4aa5dd626fa11a3e15733825c492c321ee94a1af2ebb3d9389baf7ec06f66437065472f8913 SHA512 4e76ab6eb91592eb0cc43786df06b78ab3f7ac3e1ca8d4039feb9dc3583c6ecb562302bcbbb8d83a9443180c91c9b987db751cbd6f903f76605f41b82f895f93
-EBUILD acme-1.15.0.ebuild 1681 BLAKE2B b3ede9a67c5e6462e623921bc02190a909c2b22d712c527a9de590af5892fc4770d9d3bd1174a0f0f1fcb054a93fdb88862b315260b74aae3755f666d1d91cfa SHA512 61652a5c834a08bcfe9aa806a985c25c9845022db1d458b7e8d77629a483269e41e583cfff536097bde43ad02a021be3652c5a73eda0f4661aa206aaff800eda
+DIST certbot-1.16.0.tar.gz 1384177 BLAKE2B 4e46e7d7b9db2f6ef19fab60c2d904f84b502d2911ed496967bbe272db5352c1e9bdb65b8f45358f222214bce4721ceecc12c018b875148bc897f83c5eb63933 SHA512 c2a0c4ea52ab241e387d686a9e5ed67aa5e8b4b7d34ad8996e34562e036c25ab8b397bf482a856758ca787b97bbd78c890189250c0c3d948f03fbf91aa25ece0
+EBUILD acme-1.15.0.ebuild 1679 BLAKE2B ff4806292419911de014008dc51d250464f90368325db9a0cd73b6ba2881c6f60563fd7831d999ffba75772cbfa24af517d9fa52556f260f13c5855400d635bf SHA512 fbdc63af62a50e9ca6f98ed17b1b1be58a0a206b4e0940557b592f715a3d8bb81c6432132623e497e94806d595d4e71f0a660512c8ee23bd15b84088a62821cf
+EBUILD acme-1.16.0.ebuild 1681 BLAKE2B b3ede9a67c5e6462e623921bc02190a909c2b22d712c527a9de590af5892fc4770d9d3bd1174a0f0f1fcb054a93fdb88862b315260b74aae3755f666d1d91cfa SHA512 61652a5c834a08bcfe9aa806a985c25c9845022db1d458b7e8d77629a483269e41e583cfff536097bde43ad02a021be3652c5a73eda0f4661aa206aaff800eda
 EBUILD acme-9999.ebuild 1681 BLAKE2B b3ede9a67c5e6462e623921bc02190a909c2b22d712c527a9de590af5892fc4770d9d3bd1174a0f0f1fcb054a93fdb88862b315260b74aae3755f666d1d91cfa SHA512 61652a5c834a08bcfe9aa806a985c25c9845022db1d458b7e8d77629a483269e41e583cfff536097bde43ad02a021be3652c5a73eda0f4661aa206aaff800eda
 MISC metadata.xml 400 BLAKE2B a09af005ab6b00b9eb6e9252814273c932609e4dd6020c2289f5dafc8aa3e6bcb9696dc887767f29271af4a93fae73116f688937613ff9a340d5747a801097e5 SHA512 92c877fdfd16f55997573f2719eed9a9609fe34baff4c8b09bdb500c9eaf3e2bd3536e60127f171a92c4a1b8d9446e00208856754758c21779a8bbd137c3fab7
diff --git a/app-crypt/acme/acme-1.14.0.ebuild b/app-crypt/acme/acme-1.14.0.ebuild
deleted file mode 100644
index ec89e0c80b43..000000000000
--- a/app-crypt/acme/acme-1.14.0.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=(python{3_7,3_8,3_9})
-DISTUTILS_USE_SETUPTOOLS=rdepend
-
-if [[ ${PV} == 9999* ]]; then
-	EGIT_REPO_URI="https://github.com/certbot/certbot.git"
-	inherit git-r3
-	S=${WORKDIR}/${P}/${PN}
-else
-	SRC_URI="https://github.com/certbot/certbot/archive/v${PV}.tar.gz -> certbot-${PV}.tar.gz"
-	KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
-	S=${WORKDIR}/certbot-${PV}/acme
-fi
-
-inherit distutils-r1
-
-DESCRIPTION="An implementation of the ACME protocol"
-HOMEPAGE="https://github.com/certbot/certbot https://letsencrypt.org/"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="doc test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=dev-python/cryptography-2.1.4[${PYTHON_USEDEP}]
-	>=dev-python/josepy-1.1.0[${PYTHON_USEDEP}]
-	>=dev-python/pyopenssl-17.3.0[${PYTHON_USEDEP}]
-	dev-python/pyrfc3339[${PYTHON_USEDEP}]
-	dev-python/pytz[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.10[${PYTHON_USEDEP}]
-	>=dev-python/requests-toolbelt-0.3.0[${PYTHON_USEDEP}]
-	>=dev-python/idna-2.0.0[${PYTHON_USEDEP}]
-"
-DEPEND="
-	doc? (
-		dev-python/sphinx[${PYTHON_USEDEP}]
-		dev-python/sphinx_rtd_theme[${PYTHON_USEDEP}]
-	)
-	test? (
-		${RDEPEND}
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-		dev-python/pytest-xdist[${PYTHON_USEDEP}]
-	)
-"
-
-src_compile() {
-	python_foreach_impl run_in_build_dir default
-	distutils-r1_src_compile
-	if use doc ; then
-		cd docs || die
-		sphinx-build -b html -d _build/doctrees   . _build/html
-	fi
-}
-
-python_test() {
-	nosetests -w ${PN} || die
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( docs/_build/html/. )
-
-	distutils-r1_python_install_all
-}
diff --git a/app-crypt/acme/acme-1.15.0.ebuild b/app-crypt/acme/acme-1.15.0.ebuild
index 6e86a07321fd..37a6145366aa 100644
--- a/app-crypt/acme/acme-1.15.0.ebuild
+++ b/app-crypt/acme/acme-1.15.0.ebuild
@@ -11,7 +11,7 @@ if [[ ${PV} == 9999* ]]; then
 	S=${WORKDIR}/${P}/${PN}
 else
 	SRC_URI="https://github.com/certbot/certbot/archive/v${PV}.tar.gz -> certbot-${PV}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
 	S=${WORKDIR}/certbot-${PV}/acme
 fi
 
diff --git a/app-crypt/acme/acme-1.13.0.ebuild b/app-crypt/acme/acme-1.16.0.ebuild
index 37a6145366aa..6e86a07321fd 100644
--- a/app-crypt/acme/acme-1.13.0.ebuild
+++ b/app-crypt/acme/acme-1.16.0.ebuild
@@ -11,7 +11,7 @@ if [[ ${PV} == 9999* ]]; then
 	S=${WORKDIR}/${P}/${PN}
 else
 	SRC_URI="https://github.com/certbot/certbot/archive/v${PV}.tar.gz -> certbot-${PV}.tar.gz"
-	KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
 	S=${WORKDIR}/certbot-${PV}/acme
 fi
 
diff --git a/app-crypt/certbot-apache/Manifest b/app-crypt/certbot-apache/Manifest
index 19c1b57f539b..f08c374dfa9c 100644
--- a/app-crypt/certbot-apache/Manifest
+++ b/app-crypt/certbot-apache/Manifest
@@ -1,8 +1,6 @@
-DIST certbot-1.13.0.tar.gz 1426058 BLAKE2B 661aeb430e468a46362c537efd253bb581c7e94b32c67131ae951a67b14d8b6d0f806b7c66a7f60375bb5fe95c714e1b58d3c811d5e0ee21e371b1ff611f74a8 SHA512 1c88027a2259ef9cfb852dd5bd0d326de52d8d7bcec984ee50dc7e5dfe60e2ea68b50afa255b95b2cac08f51467d6584d5671f2410b112b50ce5e4312969ad48
-DIST certbot-1.14.0.tar.gz 1415709 BLAKE2B db06b380f70eb6e674d935870582489a722fb8b38fba7535a642200dd6a9d036f55742286129266556f6313e232b2a45003b17f7c34e5f7087b6ab14261a8132 SHA512 39ae44374cdbac11c544d4d3194debf4f98c8d8459138a650ab276f59c84e8c8d738bdc056d444506a326280c1f9fb84356a9a8f4fa6a138d701bdf792b817e5
 DIST certbot-1.15.0.tar.gz 1379695 BLAKE2B 002fe05d7ba0bdcb142b57ef2ce6cae4d3e69603f253af6be6e8381311e4962a4c51ef0212d1dfc151af5b40a27a13c22bfff261dead5f8c5bc0ade7f595ca28 SHA512 373447e150974cb1d72cb4eaffe6a8563ce7a43cdd84286bd11dab69d83f52f2736b6538cf5d38c10f7af838437124da9f2de71b6819fcf9347230df05df8259
-EBUILD certbot-apache-1.13.0.ebuild 916 BLAKE2B 4f18cd312b4ffec9ceaa76506f41a9c444bc633683aad355040042bb15685c8ea2f3ccf65cdd6956187e28bd86615e4a2e246f989af9761acce44d1cad3f6ae7 SHA512 a3d47c298d4561c7d87e261f054880a7bdc59dd9f09566696fe9f77e261238fddfd510069eac5511507dc53d49f6d214770fb9f701abfddd0ab233d0562e2ffb
-EBUILD certbot-apache-1.14.0.ebuild 916 BLAKE2B 4f18cd312b4ffec9ceaa76506f41a9c444bc633683aad355040042bb15685c8ea2f3ccf65cdd6956187e28bd86615e4a2e246f989af9761acce44d1cad3f6ae7 SHA512 a3d47c298d4561c7d87e261f054880a7bdc59dd9f09566696fe9f77e261238fddfd510069eac5511507dc53d49f6d214770fb9f701abfddd0ab233d0562e2ffb
-EBUILD certbot-apache-1.15.0.ebuild 918 BLAKE2B 27d7ede9a9f1e9617833c483492277ccb0fab3715072b826134de1d460701fe5e99f69450d2ad54be818040f7f9315585b454188fb99eea55737e7128e496a9d SHA512 ecc7e71a5e4655d5e6ef3d79099130a30f8be29dc041e3e273c8e22599e8f70b36f32572f3d36b35894e095f55cb11cabf9a654bd315c0622e4edb5c29249294
-EBUILD certbot-apache-9999.ebuild 918 BLAKE2B 27d7ede9a9f1e9617833c483492277ccb0fab3715072b826134de1d460701fe5e99f69450d2ad54be818040f7f9315585b454188fb99eea55737e7128e496a9d SHA512 ecc7e71a5e4655d5e6ef3d79099130a30f8be29dc041e3e273c8e22599e8f70b36f32572f3d36b35894e095f55cb11cabf9a654bd315c0622e4edb5c29249294
+DIST certbot-1.16.0.tar.gz 1384177 BLAKE2B 4e46e7d7b9db2f6ef19fab60c2d904f84b502d2911ed496967bbe272db5352c1e9bdb65b8f45358f222214bce4721ceecc12c018b875148bc897f83c5eb63933 SHA512 c2a0c4ea52ab241e387d686a9e5ed67aa5e8b4b7d34ad8996e34562e036c25ab8b397bf482a856758ca787b97bbd78c890189250c0c3d948f03fbf91aa25ece0
+EBUILD certbot-apache-1.15.0.ebuild 916 BLAKE2B 4f18cd312b4ffec9ceaa76506f41a9c444bc633683aad355040042bb15685c8ea2f3ccf65cdd6956187e28bd86615e4a2e246f989af9761acce44d1cad3f6ae7 SHA512 a3d47c298d4561c7d87e261f054880a7bdc59dd9f09566696fe9f77e261238fddfd510069eac5511507dc53d49f6d214770fb9f701abfddd0ab233d0562e2ffb
+EBUILD certbot-apache-1.16.0.ebuild 917 BLAKE2B 6664a0470bc7631d492a7aa9b0b04cf0c86d6a60aa8056acae86f2a3bdcf137aae5290a320b18c323d0d6ab6178b304c2d9d2e1bdc4ae21237e7afa6fb4874ed SHA512 4047b9448fc589864019c87d08885480905c3da411f3b86774be9ac806b70db72ee60c01407eaec43f40d44fceaab23accc53d0bb4dec65a201d374d7457f5e3
+EBUILD certbot-apache-9999.ebuild 917 BLAKE2B 6664a0470bc7631d492a7aa9b0b04cf0c86d6a60aa8056acae86f2a3bdcf137aae5290a320b18c323d0d6ab6178b304c2d9d2e1bdc4ae21237e7afa6fb4874ed SHA512 4047b9448fc589864019c87d08885480905c3da411f3b86774be9ac806b70db72ee60c01407eaec43f40d44fceaab23accc53d0bb4dec65a201d374d7457f5e3
 MISC metadata.xml 358 BLAKE2B c94560461dda9d2d671208dd9a7e25586f86fe262bb06303a2a5e7f6f717d6936abe8c16dc6c7308aed4f8d11d4d5ae69969367b14d5bcfe838f60fc8b583642 SHA512 04670ec371be696e3da0328059ac4a336995a230823b10b6e5073fdb780ad1b873d510f31ec6c324b82562c0cfc86bfd3cbd797ef577fba7dccfe50c496627f7
diff --git a/app-crypt/certbot-apache/certbot-apache-1.13.0.ebuild b/app-crypt/certbot-apache/certbot-apache-1.13.0.ebuild
deleted file mode 100644
index d2e3aeb128a4..000000000000
--- a/app-crypt/certbot-apache/certbot-apache-1.13.0.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=(python{3_7,3_8,3_9})
-DISTUTILS_USE_SETUPTOOLS=rdepend
-
-if [[ ${PV} == 9999* ]]; then
-	EGIT_REPO_URI="https://github.com/certbot/certbot.git"
-	inherit git-r3
-	S=${WORKDIR}/${P}/${PN}
-else
-	SRC_URI="https://github.com/${PN%-apache}/${PN%-apache}/archive/v${PV}.tar.gz -> ${PN%-apache}-${PV}.tar.gz"
-	KEYWORDS="amd64 ~arm64 x86"
-	S=${WORKDIR}/${PN%-apache}-${PV}/${PN}
-fi
-
-inherit distutils-r1
-
-DESCRIPTION="Apache plugin for certbot (Let's Encrypt Client)"
-HOMEPAGE="https://github.com/certbot/certbot https://letsencrypt.org/"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-
-RDEPEND=">=app-crypt/acme-0.29.0[${PYTHON_USEDEP}]
-	>=app-crypt/certbot-1.6.0[${PYTHON_USEDEP}]
-	dev-python/python-augeas[${PYTHON_USEDEP}]
-	dev-python/zope-component[${PYTHON_USEDEP}]
-	dev-python/zope-interface[${PYTHON_USEDEP}]"
diff --git a/app-crypt/certbot-apache/certbot-apache-1.15.0.ebuild b/app-crypt/certbot-apache/certbot-apache-1.15.0.ebuild
index bcdc453cba6d..d2e3aeb128a4 100644
--- a/app-crypt/certbot-apache/certbot-apache-1.15.0.ebuild
+++ b/app-crypt/certbot-apache/certbot-apache-1.15.0.ebuild
@@ -11,7 +11,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.14.0.ebuild b/app-crypt/certbot-apache/certbot-apache-1.16.0.ebuild
index d2e3aeb128a4..7f0e325d33df 100644
--- a/app-crypt/certbot-apache/certbot-apache-1.14.0.ebuild
+++ b/app-crypt/certbot-apache/certbot-apache-1.16.0.ebuild
@@ -11,7 +11,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
 
@@ -23,8 +23,8 @@ HOMEPAGE="https://github.com/certbot/certbot https://letsencrypt.org/"
 LICENSE="Apache-2.0"
 SLOT="0"
 
-RDEPEND=">=app-crypt/acme-0.29.0[${PYTHON_USEDEP}]
-	>=app-crypt/certbot-1.6.0[${PYTHON_USEDEP}]
+RDEPEND=">=app-crypt/acme-${PV}[${PYTHON_USEDEP}]
+	>=app-crypt/certbot-${PV}[${PYTHON_USEDEP}]
 	dev-python/python-augeas[${PYTHON_USEDEP}]
 	dev-python/zope-component[${PYTHON_USEDEP}]
 	dev-python/zope-interface[${PYTHON_USEDEP}]"
diff --git a/app-crypt/certbot-apache/certbot-apache-9999.ebuild b/app-crypt/certbot-apache/certbot-apache-9999.ebuild
index bcdc453cba6d..7f0e325d33df 100644
--- a/app-crypt/certbot-apache/certbot-apache-9999.ebuild
+++ b/app-crypt/certbot-apache/certbot-apache-9999.ebuild
@@ -23,8 +23,8 @@ HOMEPAGE="https://github.com/certbot/certbot https://letsencrypt.org/"
 LICENSE="Apache-2.0"
 SLOT="0"
 
-RDEPEND=">=app-crypt/acme-0.29.0[${PYTHON_USEDEP}]
-	>=app-crypt/certbot-1.6.0[${PYTHON_USEDEP}]
+RDEPEND=">=app-crypt/acme-${PV}[${PYTHON_USEDEP}]
+	>=app-crypt/certbot-${PV}[${PYTHON_USEDEP}]
 	dev-python/python-augeas[${PYTHON_USEDEP}]
 	dev-python/zope-component[${PYTHON_USEDEP}]
 	dev-python/zope-interface[${PYTHON_USEDEP}]"
diff --git a/app-crypt/certbot-nginx/Manifest b/app-crypt/certbot-nginx/Manifest
index a99768bda6dd..143fce08d1f4 100644
--- a/app-crypt/certbot-nginx/Manifest
+++ b/app-crypt/certbot-nginx/Manifest
@@ -1,8 +1,6 @@
-DIST certbot-1.13.0.tar.gz 1426058 BLAKE2B 661aeb430e468a46362c537efd253bb581c7e94b32c67131ae951a67b14d8b6d0f806b7c66a7f60375bb5fe95c714e1b58d3c811d5e0ee21e371b1ff611f74a8 SHA512 1c88027a2259ef9cfb852dd5bd0d326de52d8d7bcec984ee50dc7e5dfe60e2ea68b50afa255b95b2cac08f51467d6584d5671f2410b112b50ce5e4312969ad48
-DIST certbot-1.14.0.tar.gz 1415709 BLAKE2B db06b380f70eb6e674d935870582489a722fb8b38fba7535a642200dd6a9d036f55742286129266556f6313e232b2a45003b17f7c34e5f7087b6ab14261a8132 SHA512 39ae44374cdbac11c544d4d3194debf4f98c8d8459138a650ab276f59c84e8c8d738bdc056d444506a326280c1f9fb84356a9a8f4fa6a138d701bdf792b817e5
 DIST certbot-1.15.0.tar.gz 1379695 BLAKE2B 002fe05d7ba0bdcb142b57ef2ce6cae4d3e69603f253af6be6e8381311e4962a4c51ef0212d1dfc151af5b40a27a13c22bfff261dead5f8c5bc0ade7f595ca28 SHA512 373447e150974cb1d72cb4eaffe6a8563ce7a43cdd84286bd11dab69d83f52f2736b6538cf5d38c10f7af838437124da9f2de71b6819fcf9347230df05df8259
-EBUILD certbot-nginx-1.13.0.ebuild 933 BLAKE2B b64ce9678fdf0d6a7cb66c4f8270764d04726c9942aff1288cb278af75dd53fc0b9dc5790146458d0187c2d24c5d87643bfad7befca642178f3c97d927268c6c SHA512 8b149b8dbb4938d826a06bdda5bd526a7abd3afd3123148496220e620058717e754345dc9326a96ff83c02d5570d0803fd59154cfce9c4892bf11688c60c0d0b
-EBUILD certbot-nginx-1.14.0.ebuild 933 BLAKE2B b64ce9678fdf0d6a7cb66c4f8270764d04726c9942aff1288cb278af75dd53fc0b9dc5790146458d0187c2d24c5d87643bfad7befca642178f3c97d927268c6c SHA512 8b149b8dbb4938d826a06bdda5bd526a7abd3afd3123148496220e620058717e754345dc9326a96ff83c02d5570d0803fd59154cfce9c4892bf11688c60c0d0b
-EBUILD certbot-nginx-1.15.0.ebuild 935 BLAKE2B 1eed182016c7f44b8ed6339e2adcfad6789663f04dcbbfd76239ac0b43a84388c05f3e73af0b7a76d2cd25710ea8f260a93022e1e81efc55d4c039b144fa469c SHA512 9199c62a00c96c4e839774a78e4a7477e95621574a78415110755ad5e856ad5ecabe957cf1c19a2c263e03bf265724f224c31ee7a43cd2cc00561e1a57de7340
-EBUILD certbot-nginx-9999.ebuild 935 BLAKE2B 1eed182016c7f44b8ed6339e2adcfad6789663f04dcbbfd76239ac0b43a84388c05f3e73af0b7a76d2cd25710ea8f260a93022e1e81efc55d4c039b144fa469c SHA512 9199c62a00c96c4e839774a78e4a7477e95621574a78415110755ad5e856ad5ecabe957cf1c19a2c263e03bf265724f224c31ee7a43cd2cc00561e1a57de7340
+DIST certbot-1.16.0.tar.gz 1384177 BLAKE2B 4e46e7d7b9db2f6ef19fab60c2d904f84b502d2911ed496967bbe272db5352c1e9bdb65b8f45358f222214bce4721ceecc12c018b875148bc897f83c5eb63933 SHA512 c2a0c4ea52ab241e387d686a9e5ed67aa5e8b4b7d34ad8996e34562e036c25ab8b397bf482a856758ca787b97bbd78c890189250c0c3d948f03fbf91aa25ece0
+EBUILD certbot-nginx-1.15.0.ebuild 933 BLAKE2B b64ce9678fdf0d6a7cb66c4f8270764d04726c9942aff1288cb278af75dd53fc0b9dc5790146458d0187c2d24c5d87643bfad7befca642178f3c97d927268c6c SHA512 8b149b8dbb4938d826a06bdda5bd526a7abd3afd3123148496220e620058717e754345dc9326a96ff83c02d5570d0803fd59154cfce9c4892bf11688c60c0d0b
+EBUILD certbot-nginx-1.16.0.ebuild 935 BLAKE2B c658bd5e5c2aae786e6e41cf77fc840c61e2fd1b7470706bb4cd573edf2117344ab29173fb24ab370e9ee3a5f28c644d4cb12a4bafc5cedb72ad4282627939ca SHA512 c3c33b250a0e830d4498a5864643b117d0b2c29b4130795aafb135d7b369754836a65704cdc437828a5f8991368c2b03bc5b11963328e5c6cf826c92d42c5f80
+EBUILD certbot-nginx-9999.ebuild 935 BLAKE2B c658bd5e5c2aae786e6e41cf77fc840c61e2fd1b7470706bb4cd573edf2117344ab29173fb24ab370e9ee3a5f28c644d4cb12a4bafc5cedb72ad4282627939ca SHA512 c3c33b250a0e830d4498a5864643b117d0b2c29b4130795aafb135d7b369754836a65704cdc437828a5f8991368c2b03bc5b11963328e5c6cf826c92d42c5f80
 MISC metadata.xml 334 BLAKE2B e7b28e7d3e7c6fdce0c5120b29fbf5aa607408e2add6c0ad42e921fb1add9def38c6cb191129a5a6e1f0e3ea119caa6cdc74955b572e5d2c6f854d0b7c7c521a SHA512 a24ccf633fc9c2670dcd35801d95bd8ca0f4ea4d3d53b6651f2e8e3e280b95ec8a464d99f5423942c14b0777ae4551f46c1ff285caea460bc91cbc417a7a5b70
diff --git a/app-crypt/certbot-nginx/certbot-nginx-1.14.0.ebuild b/app-crypt/certbot-nginx/certbot-nginx-1.14.0.ebuild
deleted file mode 100644
index 2ae43ed4bf96..000000000000
--- a/app-crypt/certbot-nginx/certbot-nginx-1.14.0.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=(python{3_7,3_8,3_9})
-DISTUTILS_USE_SETUPTOOLS=rdepend
-
-if [[ ${PV} == 9999* ]]; then
-	EGIT_REPO_URI="https://github.com/certbot/certbot.git"
-	inherit git-r3
-	S=${WORKDIR}/${P}/${PN}
-else
-	SRC_URI="https://github.com/${PN%-nginx}/${PN%-nginx}/archive/v${PV}.tar.gz -> ${PN%-nginx}-${PV}.tar.gz"
-	KEYWORDS="amd64 ~arm ~arm64 x86"
-	S=${WORKDIR}/${PN%-nginx}-${PV}/${PN}
-fi
-
-inherit distutils-r1
-
-DESCRIPTION="Nginx plugin for certbot (Let's Encrypt Client)"
-HOMEPAGE="https://github.com/certbot/certbot https://letsencrypt.org/"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	>=app-crypt/acme-1.4.0[${PYTHON_USEDEP}]
-	>=app-crypt/certbot-1.6.0[${PYTHON_USEDEP}]
-	>=dev-python/pyopenssl-17.3.0[${PYTHON_USEDEP}]
-	>=dev-python/pyparsing-2.2.0[${PYTHON_USEDEP}]
-	dev-python/zope-interface[${PYTHON_USEDEP}]"
diff --git a/app-crypt/certbot-nginx/certbot-nginx-1.15.0.ebuild b/app-crypt/certbot-nginx/certbot-nginx-1.15.0.ebuild
index 52c50cecd71f..2ae43ed4bf96 100644
--- a/app-crypt/certbot-nginx/certbot-nginx-1.15.0.ebuild
+++ b/app-crypt/certbot-nginx/certbot-nginx-1.15.0.ebuild
@@ -11,7 +11,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.13.0.ebuild b/app-crypt/certbot-nginx/certbot-nginx-1.16.0.ebuild
index 2ae43ed4bf96..b4f61386b477 100644
--- a/app-crypt/certbot-nginx/certbot-nginx-1.13.0.ebuild
+++ b/app-crypt/certbot-nginx/certbot-nginx-1.16.0.ebuild
@@ -11,7 +11,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
 
@@ -25,8 +25,8 @@ SLOT="0"
 IUSE=""
 
 RDEPEND="
-	>=app-crypt/acme-1.4.0[${PYTHON_USEDEP}]
-	>=app-crypt/certbot-1.6.0[${PYTHON_USEDEP}]
+	>=app-crypt/acme-${PV}[${PYTHON_USEDEP}]
+	>=app-crypt/certbot-${PV}[${PYTHON_USEDEP}]
 	>=dev-python/pyopenssl-17.3.0[${PYTHON_USEDEP}]
 	>=dev-python/pyparsing-2.2.0[${PYTHON_USEDEP}]
 	dev-python/zope-interface[${PYTHON_USEDEP}]"
diff --git a/app-crypt/certbot-nginx/certbot-nginx-9999.ebuild b/app-crypt/certbot-nginx/certbot-nginx-9999.ebuild
index 52c50cecd71f..b4f61386b477 100644
--- a/app-crypt/certbot-nginx/certbot-nginx-9999.ebuild
+++ b/app-crypt/certbot-nginx/certbot-nginx-9999.ebuild
@@ -25,8 +25,8 @@ SLOT="0"
 IUSE=""
 
 RDEPEND="
-	>=app-crypt/acme-1.4.0[${PYTHON_USEDEP}]
-	>=app-crypt/certbot-1.6.0[${PYTHON_USEDEP}]
+	>=app-crypt/acme-${PV}[${PYTHON_USEDEP}]
+	>=app-crypt/certbot-${PV}[${PYTHON_USEDEP}]
 	>=dev-python/pyopenssl-17.3.0[${PYTHON_USEDEP}]
 	>=dev-python/pyparsing-2.2.0[${PYTHON_USEDEP}]
 	dev-python/zope-interface[${PYTHON_USEDEP}]"
diff --git a/app-crypt/certbot/Manifest b/app-crypt/certbot/Manifest
index 3c8b7ed6bacc..d708cf4c5d47 100644
--- a/app-crypt/certbot/Manifest
+++ b/app-crypt/certbot/Manifest
@@ -1,8 +1,6 @@
-DIST certbot-1.13.0.tar.gz 1426058 BLAKE2B 661aeb430e468a46362c537efd253bb581c7e94b32c67131ae951a67b14d8b6d0f806b7c66a7f60375bb5fe95c714e1b58d3c811d5e0ee21e371b1ff611f74a8 SHA512 1c88027a2259ef9cfb852dd5bd0d326de52d8d7bcec984ee50dc7e5dfe60e2ea68b50afa255b95b2cac08f51467d6584d5671f2410b112b50ce5e4312969ad48
-DIST certbot-1.14.0.tar.gz 1415709 BLAKE2B db06b380f70eb6e674d935870582489a722fb8b38fba7535a642200dd6a9d036f55742286129266556f6313e232b2a45003b17f7c34e5f7087b6ab14261a8132 SHA512 39ae44374cdbac11c544d4d3194debf4f98c8d8459138a650ab276f59c84e8c8d738bdc056d444506a326280c1f9fb84356a9a8f4fa6a138d701bdf792b817e5
 DIST certbot-1.15.0.tar.gz 1379695 BLAKE2B 002fe05d7ba0bdcb142b57ef2ce6cae4d3e69603f253af6be6e8381311e4962a4c51ef0212d1dfc151af5b40a27a13c22bfff261dead5f8c5bc0ade7f595ca28 SHA512 373447e150974cb1d72cb4eaffe6a8563ce7a43cdd84286bd11dab69d83f52f2736b6538cf5d38c10f7af838437124da9f2de71b6819fcf9347230df05df8259
-EBUILD certbot-1.13.0.ebuild 1150 BLAKE2B 7a15d3853c2820587c808cca3817262417220af4433930273b8acf79ffc71a133fe6f70d26a068e1c0b138ad0f1b4a310f3f7373e636c1a15704c7dca6a7dbc0 SHA512 1062c0d646822f8179a5b054d2ccacbb29b0c2ca3b7d0ae4481a02133baa3752d9c6d2f4a56282e634ec58b1691001fe490e0b3b21e6e0c41d639d3b69097d6e
-EBUILD certbot-1.14.0.ebuild 1150 BLAKE2B 7a15d3853c2820587c808cca3817262417220af4433930273b8acf79ffc71a133fe6f70d26a068e1c0b138ad0f1b4a310f3f7373e636c1a15704c7dca6a7dbc0 SHA512 1062c0d646822f8179a5b054d2ccacbb29b0c2ca3b7d0ae4481a02133baa3752d9c6d2f4a56282e634ec58b1691001fe490e0b3b21e6e0c41d639d3b69097d6e
-EBUILD certbot-1.15.0.ebuild 1152 BLAKE2B 427c31271d42843567d0d985b66079a85854a596e8da91142634bfc160e0b2e3fcf78af602a53bb3e9643d5c80068d37269f79e25e1b1fbdb8752f9dfb7c507b SHA512 3e32d7ad4e129d87d05d84365aab483bf7715eb10a730b1e195495461ac03d1cada5705f0c68477b56621761431dbdd3989e81929f99f453d91734de74075aea
-EBUILD certbot-9999.ebuild 1152 BLAKE2B 427c31271d42843567d0d985b66079a85854a596e8da91142634bfc160e0b2e3fcf78af602a53bb3e9643d5c80068d37269f79e25e1b1fbdb8752f9dfb7c507b SHA512 3e32d7ad4e129d87d05d84365aab483bf7715eb10a730b1e195495461ac03d1cada5705f0c68477b56621761431dbdd3989e81929f99f453d91734de74075aea
+DIST certbot-1.16.0.tar.gz 1384177 BLAKE2B 4e46e7d7b9db2f6ef19fab60c2d904f84b502d2911ed496967bbe272db5352c1e9bdb65b8f45358f222214bce4721ceecc12c018b875148bc897f83c5eb63933 SHA512 c2a0c4ea52ab241e387d686a9e5ed67aa5e8b4b7d34ad8996e34562e036c25ab8b397bf482a856758ca787b97bbd78c890189250c0c3d948f03fbf91aa25ece0
+EBUILD certbot-1.15.0.ebuild 1150 BLAKE2B 7a15d3853c2820587c808cca3817262417220af4433930273b8acf79ffc71a133fe6f70d26a068e1c0b138ad0f1b4a310f3f7373e636c1a15704c7dca6a7dbc0 SHA512 1062c0d646822f8179a5b054d2ccacbb29b0c2ca3b7d0ae4481a02133baa3752d9c6d2f4a56282e634ec58b1691001fe490e0b3b21e6e0c41d639d3b69097d6e
+EBUILD certbot-1.16.0.ebuild 1152 BLAKE2B d30a158dbe17a5706583ce7de83f152e5627d5481318b82a0ef2fd9dc5b99c0109a65c819878dc86fbc715d42d707e9a6556fd7ab9a599264209aeae7f7823f2 SHA512 15f463ff5a385e639ab8abe14f064e1c8da5ad14255200cf21ea90083eeaccb75dde1e054be2b193452e81af25f6ccb9f4933343cb5071a3d920390af9073de1
+EBUILD certbot-9999.ebuild 1152 BLAKE2B d30a158dbe17a5706583ce7de83f152e5627d5481318b82a0ef2fd9dc5b99c0109a65c819878dc86fbc715d42d707e9a6556fd7ab9a599264209aeae7f7823f2 SHA512 15f463ff5a385e639ab8abe14f064e1c8da5ad14255200cf21ea90083eeaccb75dde1e054be2b193452e81af25f6ccb9f4933343cb5071a3d920390af9073de1
 MISC metadata.xml 358 BLAKE2B c94560461dda9d2d671208dd9a7e25586f86fe262bb06303a2a5e7f6f717d6936abe8c16dc6c7308aed4f8d11d4d5ae69969367b14d5bcfe838f60fc8b583642 SHA512 04670ec371be696e3da0328059ac4a336995a230823b10b6e5073fdb780ad1b873d510f31ec6c324b82562c0cfc86bfd3cbd797ef577fba7dccfe50c496627f7
diff --git a/app-crypt/certbot/certbot-1.14.0.ebuild b/app-crypt/certbot/certbot-1.14.0.ebuild
deleted file mode 100644
index e131af1788ec..000000000000
--- a/app-crypt/certbot/certbot-1.14.0.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=(python{3_7,3_8,3_9})
-DISTUTILS_USE_SETUPTOOLS=rdepend
-
-if [[ ${PV} == 9999* ]]; then
-	EGIT_REPO_URI="https://github.com/certbot/certbot.git"
-	inherit git-r3
-else
-	SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
-fi
-S=${WORKDIR}/${P}/${PN}
-
-inherit distutils-r1
-
-DESCRIPTION="Let's encrypt client to automate deployment of X.509 certificates"
-HOMEPAGE="https://github.com/certbot/certbot https://letsencrypt.org/"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-
-RDEPEND="
-	>=app-crypt/acme-1.8.0[${PYTHON_USEDEP}]
-	>=dev-python/configargparse-0.9.3[${PYTHON_USEDEP}]
-	>=dev-python/configobj-5.0.6[${PYTHON_USEDEP}]
-	>=dev-python/cryptography-2.8[${PYTHON_USEDEP}]
-	>=dev-python/distro-1.0.1[${PYTHON_USEDEP}]
-	>=dev-python/josepy-1.1.0[${PYTHON_USEDEP}]
-	>=dev-python/parsedatetime-2.4[${PYTHON_USEDEP}]
-	dev-python/pyrfc3339[${PYTHON_USEDEP}]
-	dev-python/pytz[${PYTHON_USEDEP}]
-	dev-python/zope-component[${PYTHON_USEDEP}]
-	dev-python/zope-interface[${PYTHON_USEDEP}]"
diff --git a/app-crypt/certbot/certbot-1.15.0.ebuild b/app-crypt/certbot/certbot-1.15.0.ebuild
index e2450c428f8d..e131af1788ec 100644
--- a/app-crypt/certbot/certbot-1.15.0.ebuild
+++ b/app-crypt/certbot/certbot-1.15.0.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} == 9999* ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
 fi
 S=${WORKDIR}/${P}/${PN}
 
diff --git a/app-crypt/certbot/certbot-1.13.0.ebuild b/app-crypt/certbot/certbot-1.16.0.ebuild
index e131af1788ec..bf9117a89b96 100644
--- a/app-crypt/certbot/certbot-1.13.0.ebuild
+++ b/app-crypt/certbot/certbot-1.16.0.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} == 9999* ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
 fi
 S=${WORKDIR}/${P}/${PN}
 
@@ -23,7 +23,7 @@ LICENSE="Apache-2.0"
 SLOT="0"
 
 RDEPEND="
-	>=app-crypt/acme-1.8.0[${PYTHON_USEDEP}]
+	>=app-crypt/acme-${PV}[${PYTHON_USEDEP}]
 	>=dev-python/configargparse-0.9.3[${PYTHON_USEDEP}]
 	>=dev-python/configobj-5.0.6[${PYTHON_USEDEP}]
 	>=dev-python/cryptography-2.8[${PYTHON_USEDEP}]
diff --git a/app-crypt/certbot/certbot-9999.ebuild b/app-crypt/certbot/certbot-9999.ebuild
index e2450c428f8d..bf9117a89b96 100644
--- a/app-crypt/certbot/certbot-9999.ebuild
+++ b/app-crypt/certbot/certbot-9999.ebuild
@@ -23,7 +23,7 @@ LICENSE="Apache-2.0"
 SLOT="0"
 
 RDEPEND="
-	>=app-crypt/acme-1.8.0[${PYTHON_USEDEP}]
+	>=app-crypt/acme-${PV}[${PYTHON_USEDEP}]
 	>=dev-python/configargparse-0.9.3[${PYTHON_USEDEP}]
 	>=dev-python/configobj-5.0.6[${PYTHON_USEDEP}]
 	>=dev-python/cryptography-2.8[${PYTHON_USEDEP}]
diff --git a/app-crypt/dieharder/Manifest b/app-crypt/dieharder/Manifest
index 122377ddbd81..0a8de4342f14 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-r3.ebuild 1151 BLAKE2B 61e152607c4b8cacd454d81270c739f3cd7c9364dcf3ccba2ca38c22bc94c70e2c58fa6a5ebd2a062cd518ce8721d09e5f4a8840dc849843fc729105777e06f7 SHA512 14715d9d42544152f98a6a6bec882b0c9b94ddef8c3104935e2d23a19faf69f38da16a63dd13ffcb531089608aa1c2c558479764188990102e5916fec5f18970
+EBUILD dieharder-3.31.1-r4.ebuild 1153 BLAKE2B b75539866c5ec1c75f756011486aaee08263a0a634eb09d7f1b69ff987b1463b4cccfd28a4684925caf72dac33545f61c5b23bde800def9fa67beedadaad5bef SHA512 e0b2e379e0cfd62587f8f1460f8a9e64269a46729e4b8a65b54f82c83a76911d34aaa12f8a0c3a2b0730fa9dbb1b62d6503b38452d55e6f201de7e69d03663a8
 MISC metadata.xml 167 BLAKE2B e4dadf27fd344484f2bccb5b904909c89aac568c32e5b3c44bdf139eacefd4b4fae74419f503d2b7da0dccc1b68ba05d777d11292c0f89270d1ac5c9c703e8ca SHA512 7c8decb24ee3a850e38186cf3c7f8933a28017426806870ad6ef9ceb2533be147a2681fc789b535a81cb528af8c29d90d3006e4f250aee23bd7dea4561294e33
diff --git a/app-crypt/dieharder/dieharder-3.31.1-r3.ebuild b/app-crypt/dieharder/dieharder-3.31.1-r4.ebuild
index d9861f85b729..8bae5f15b9a4 100644
--- a/app-crypt/dieharder/dieharder-3.31.1-r3.ebuild
+++ b/app-crypt/dieharder/dieharder-3.31.1-r4.ebuild
@@ -15,7 +15,7 @@ KEYWORDS="~alpha ~amd64 ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
 IUSE="doc"
 RESTRICT="test" # Way too long
 
-RDEPEND="sci-libs/gsl"
+RDEPEND="sci-libs/gsl:="
 DEPEND="${RDEPEND}"
 BDEPEND=" doc? ( dev-tex/latex2html )"
 
diff --git a/app-crypt/glep63-check/Manifest b/app-crypt/glep63-check/Manifest
index 46fe9056edb2..b2f9d7fc884f 100644
--- a/app-crypt/glep63-check/Manifest
+++ b/app-crypt/glep63-check/Manifest
@@ -1,3 +1,5 @@
+DIST glep63-check-10.tar.gz 73550 BLAKE2B af45dce2a89e4af31a81e979659494c47b9c24f3fb71cccc33e84d6fc2900339ecefcafb1b6186b1e19e9fce7a2f17df754005c91828d27d0d2d9fe67586661e SHA512 d2fbfdb1b60250897b5d9582111573b6ed78f02b30d66cffc0fa94e0a1136dc0f3561e808b66d9b8ce43fca9fbdaf1548790c7c2395929308ff24d42d18ecf03
 DIST glep63-check-9.tar.gz 73445 BLAKE2B cd229065da9a4663491a891787d2a9e719cd9d61ea5974393199ca418413e7e1c6b73a3146577b26029ceb3302f430ed1051c9d050278b098b18407e95c1cac3 SHA512 86c49ffe2b8dde3735b85ff4808862c460b1e832fa9c3fca4fc2ea776d314c29ed2442adef2e1dbca1cec81b6ea29bbb417b123306602dfaa611b5153dddb7ac
+EBUILD glep63-check-10.ebuild 551 BLAKE2B 694217b96184f979f3253bd7768595990be6ecbfde11ada0c79f21bbe0dd4355f32043527506896962052e9a0dc8d7f4c02c80eb3dde8ab2532cc3f4675cc992 SHA512 e154ae12c064980624baf5b2bc22b5c42a89b479bc21962a64a77dc6f5b264dd5a8f5401e2814c64151d7d575b335529084e20e6670b067d6e8d38348969efcb
 EBUILD glep63-check-9.ebuild 686 BLAKE2B f3e108b7e17d3c2e63d56641306c4b5c3a39cdf4da469921d0fef3f7f0b1be0e753b07c4dc049d08710d5952117437ac1ae80424f56a56243016a42c25d0e00e SHA512 493c8cf0ce6feaa44b7212ebe10abb93169accbd6f4542cf99c32512871c0d47143ff64cc0ad705a154140918eb0a160e885ccf008f5da45d8ad9efb490f3012
 MISC metadata.xml 537 BLAKE2B cc05c3872c522fdcc2355da9d451f9ad102d23e2e5de657f447ce5c9441a4379fb5f6560cd22a8be325f322e901b65917b11630fc0229bd0e952c6f8b6b64bf0 SHA512 493bcb28f9144c49050445de98b54e19730e46cc24df02b15859f4114f4fa8775431aac9d8fcb4f50639609680656b108f6c4ca47f67b38680f926cf9610ccd9
diff --git a/app-crypt/glep63-check/glep63-check-10.ebuild b/app-crypt/glep63-check/glep63-check-10.ebuild
new file mode 100644
index 000000000000..61e18a116228
--- /dev/null
+++ b/app-crypt/glep63-check/glep63-check-10.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{8..10} )
+DISTUTILS_USE_SETUPTOOLS=no
+
+inherit distutils-r1
+
+DESCRIPTION="GLEP 63 compliance checker for OpenPGP keys"
+HOMEPAGE="https://github.com/mgorny/glep63-check/"
+SRC_URI="
+	https://github.com/mgorny/glep63-check/archive/v${PV}.tar.gz
+		-> ${P}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="app-crypt/gnupg"
+DEPEND="
+	test? (
+		sys-libs/libfaketime
+	)"
+
+distutils_enable_tests unittest
diff --git a/app-crypt/gnupg/Manifest b/app-crypt/gnupg/Manifest
index 7bf862d7d20b..4703be6c81f8 100644
--- a/app-crypt/gnupg/Manifest
+++ b/app-crypt/gnupg/Manifest
@@ -1,8 +1,11 @@
 AUX gnupg-2.1.20-gpgscm-Use-shorter-socket-path-lengts-to-improve-tes.patch 1048 BLAKE2B 36f37b74da309100191f4d8f9c27d08a1b00d2d30fbaf169dbb74ebbe42293357a4fb62332e286fe5725dcfdc30645a602dc2a51c51924b06215b68fd5235658 SHA512 fd12827150e96cd7979ea9611d64ed4ab9e6c61cfecdd697b8fb4d162f20985b734c2bfc365a921809b9029e86a85a9b36c10ec472b3dd49c25ea18f5aef56ce
+AUX gnupg-2.2.28-dirmngr_ldap.patch 986 BLAKE2B 1fd9b6f00bacce52c7a17f7f8279734c1bfb311de9fa86d83b1a44213863565edec02921e09183b408672f971e4763680c3f09eda4fb3a29825b54642dc1990e SHA512 22a2f8a0b59b8629dccfc198670ce535557168e68a3287996cc7a0940d710465dc0bc39347de50215509d2e0ef1b64721fa0a57bd0f52f23ab2199238a99335a
 AUX gnupg-2.3.0-sqlite_check.patch 1860 BLAKE2B e5d808932e9a72dff63d9776ccc55bdb9f28e5c9e1d0a58a46980a0c62e90f206cef5b94bf5492d96faa2e927b7b0933a90e924095e5f75be5f4cba3abe3cc7c SHA512 6c67368629fd47ce17c1e3564e8b2e4d1c5f844ce641462b833a2346853b9fc086258d525fc82adc3e778a140e450071159a44894ed230f995c480696c390190
 DIST gnupg-2.2.16-scdaemon_shared-access.patch 2586 BLAKE2B 42fd5482c4e86751ce62836125997c2295c44bc5db0671a06460fd306b2ed93f290fb898fc1b1e463a863eddf9ab5f99ea3c90a55499ef45ca1ed6edf2854663 SHA512 38abaa4200114ae6b6f220fabc0a84a056761949c97bd0564557f4411a299b9a1939893555c27e26da2d8e8da4bc97a298fa7e68f1e80fe99c3f88cc329eaa84
 DIST gnupg-2.2.27.tar.bz2 7191555 BLAKE2B d652aad382cf07cc458b29ff82718edd47457d8236dcbeee51f22d88503be141f009e9ea45b6dafe614115d9558fe371509579e58ce17a5f04540a31aa406ea3 SHA512 cf336962116c9c08ac80b1299654b94948033ef51d6d5e7f54c2f07bbf7d92c7b0bddb606ceee2cdd837063f519b8d59af5a82816b840a0fc47d90c07b0e95ab
+DIST gnupg-2.2.28.tar.bz2 7218833 BLAKE2B 61e90a39f4572f41da687c6a6983a897eec1784d60b6ff6579f895c07214d273ad2a25a1a5cb4c26210028afee32c58a8fb0752683a0ab9a5f8a73438492b80b SHA512 d79594fac93773639fc5b95cdfad1003829879e1bc9c415261bccfc64bd56cbeec5d8571d1468e4e3fd982c546e3b9cfc2161412d544717f48eabe3a360caae8
 DIST gnupg-2.3.1.tar.bz2 7570431 BLAKE2B f7c7d3246b0807798917ecd711c74ea7c52dd24530106765a1f4a6e9af098c9a99c5d0f44fc2c253d013b11f862fccf0b1630593d07b2e1950a91b3473c671c1 SHA512 d2cc82c1b47bbd79acd6ef787c01684fb084b1c5507bbca6cf7ca8834ed978ae7a44c01d652cc3afbd70e2906583c8701aebc8d9fd3fc5e0401769ad4cd46af1
 EBUILD gnupg-2.2.27.ebuild 5168 BLAKE2B cc9ad82a855cb56a630aa043537fe44fadbfece92cc09205996ba4cc3f3ca000534f7b11c29da543ec923b118d24bc23b490ce6ea29b09a799d17b36e387f855 SHA512 3f1377ad593d19580e953ef426dd23f23ae2fab65d8e6bcfee58c09605086fc0a2f2d2432b5d33ed70685ebb87561801a6b3dbf781d585aa59b6e8c9fc0dd81e
+EBUILD gnupg-2.2.28.ebuild 4764 BLAKE2B 672ee1a88193744ddc47f128b967a38a8ae94d3f0db2f40d2ff44b915c07a31200e9a57839cd891bf597f87f920a4dea927755f6c53937b86bb1b1cce2fa05f2 SHA512 ba0612752fca0877228ca3483173847b4e3419364c64b440edb48677916e8f6c39166cd63d8eceed0cac76343f6551b45e2b09226b634c414909cdb0d7d05aaf
 EBUILD gnupg-2.3.1.ebuild 4831 BLAKE2B 093098049196bd759fdf6f5b40db207eb7e7e061fda3fff3faf76d204d45f04d3cf25f4268ce5edf58dfdc4ff116dd6bd89d5ef7e37f03c06e74193ba42b4938 SHA512 0d90cc64ae9d2ad09ae4732d1f617a3e7f178453c3c137dff6ad96efe0ac5dabd37e98e1fbd20ad602211088da7d0069faadb9a405655411555b704770a9e5a6
 MISC metadata.xml 1379 BLAKE2B e51735e46f2b9ade13d8aa53c1354b1285904933c260efef8e0d6d66e7b8a36199f33ab48cc98006e75e566a21422883dc3694d91e1dcbf1e7c413ba7dab557f SHA512 cd71918f048d081e7a223b9b09b0089b3e015aef674ef233c2aff43e1325ac61a3bd2bfa828071dd157fea0f5ec76ee719ccd339cf94539e3702d48ba6ecd5d4
diff --git a/app-crypt/gnupg/files/gnupg-2.2.28-dirmngr_ldap.patch b/app-crypt/gnupg/files/gnupg-2.2.28-dirmngr_ldap.patch
new file mode 100644
index 000000000000..86e83de8ec37
--- /dev/null
+++ b/app-crypt/gnupg/files/gnupg-2.2.28-dirmngr_ldap.patch
@@ -0,0 +1,36 @@
+From c8b2162c0e7eb42b74811b7ed225fa0f56be4083 Mon Sep 17 00:00:00 2001
+From: NIIBE Yutaka <gniibe@fsij.org>
+Date: Fri, 11 Jun 2021 10:30:02 +0900
+Subject: [PATCH] dirmngir: Fix build with --disable-ldap.
+
+* dirmngr/dirmngr.c (parse_rereadable_options) [USE_LDAP]:
+Conditionalize.
+
+--
+
+Reported-by: Phil Pennock
+Signed-off-by: NIIBE Yutaka <gniibe@fsij.org>
+---
+ dirmngr/dirmngr.c | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/dirmngr/dirmngr.c b/dirmngr/dirmngr.c
+index 04fe9e238..6a818cabc 100644
+--- a/dirmngr/dirmngr.c
++++ b/dirmngr/dirmngr.c
+@@ -736,6 +736,7 @@ parse_rereadable_options (ARGPARSE_ARGS *pargs, int reread)
+     case oRecursiveResolver: enable_recursive_resolver (1); break;
+ 
+     case oLDAPServer:
++#if USE_LDAP
+       {
+         ldap_server_t server;
+         char *p;
+@@ -757,6 +758,7 @@ parse_rereadable_options (ARGPARSE_ARGS *pargs, int reread)
+             opt.ldapservers = server;
+           }
+       }
++#endif
+       break;
+ 
+     case oKeyServer:
diff --git a/app-crypt/gnupg/gnupg-2.2.28.ebuild b/app-crypt/gnupg/gnupg-2.2.28.ebuild
new file mode 100644
index 000000000000..0f4396fc3999
--- /dev/null
+++ b/app-crypt/gnupg/gnupg-2.2.28.ebuild
@@ -0,0 +1,153 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit flag-o-matic systemd toolchain-funcs
+
+MY_P="${P/_/-}"
+
+DESCRIPTION="The GNU Privacy Guard, a GPL OpenPGP implementation"
+HOMEPAGE="https://gnupg.org/"
+SRC_URI="mirror://gnupg/gnupg/${MY_P}.tar.bz2"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="bzip2 doc ldap nls readline selinux +smartcard ssl tofu tools usb user-socket wks-server"
+
+# Existence of executables is checked during configuration.
+DEPEND=">=dev-libs/libassuan-2.5.0
+	>=dev-libs/libgcrypt-1.8.0
+	>=dev-libs/libgpg-error-1.29
+	>=dev-libs/libksba-1.3.4
+	>=dev-libs/npth-1.2
+	>=net-misc/curl-7.10
+	bzip2? ( app-arch/bzip2 )
+	ldap? ( net-nds/openldap )
+	readline? ( sys-libs/readline:0= )
+	smartcard? ( usb? ( virtual/libusb:1 ) )
+	ssl? ( >=net-libs/gnutls-3.0:0= )
+	sys-libs/zlib
+	tofu? ( >=dev-db/sqlite-3.7 )"
+
+RDEPEND="${DEPEND}
+	app-crypt/pinentry
+	nls? ( virtual/libintl )
+	selinux? ( sec-policy/selinux-gpg )
+	wks-server? ( virtual/mta )"
+
+BDEPEND="virtual/pkgconfig
+	doc? ( sys-apps/texinfo )
+	nls? ( sys-devel/gettext )"
+
+S="${WORKDIR}/${MY_P}"
+
+DOCS=(
+	ChangeLog NEWS README THANKS TODO VERSION
+	doc/FAQ doc/DETAILS doc/HACKING doc/TRANSLATE doc/OpenPGP doc/KEYSERVER
+)
+
+PATCHES=(
+	"${FILESDIR}/${PN}-2.1.20-gpgscm-Use-shorter-socket-path-lengts-to-improve-tes.patch"
+	"${FILESDIR}/${P}-dirmngr_ldap.patch" #795669
+)
+
+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/gpgme/Manifest b/app-crypt/gpgme/Manifest
index c37ce4801ccf..848e7aff00b7 100644
--- a/app-crypt/gpgme/Manifest
+++ b/app-crypt/gpgme/Manifest
@@ -3,5 +3,5 @@ DIST gpgme-1.15.0.tar.bz2 1692019 BLAKE2B 4c66f24034a88e7da8a06cef3d0ac9d1d6b5ec
 DIST gpgme-1.15.1.tar.bz2 1699349 BLAKE2B d3a6ccaa35360ed3fc79364dfcc3f2fdcb70e5e41ac72ef011373a39d5def9be9ce1be45843ab65a87630d3fc570d29db5f40b9a273aa8e281464c9d1d3477de SHA512 1d75a848cce6389f7cb8896b57a28dfe1dc5a447bfb4f128b0994a43e04134343400a3be063e971f03dfd595474cfd558519741d5d56afb3e84853ad4f2a45c2
 EBUILD gpgme-1.14.0.ebuild 2665 BLAKE2B b35b17b2cd54af7b5c775a3717bf80ec505fa006782d3bb5c1284db6a01dcfae3cc016a1e783e17cad296f531cb6734723e4dac637e242663604a1dc945b5657 SHA512 7996c1f90976e793594125a1530c399e503662691dc6b3a7351b12150d934ff52360eafd5663bcce3125c211a89a9f7078d1b80277f782ba93eda2d58be0c3c9
 EBUILD gpgme-1.15.0.ebuild 2679 BLAKE2B f93025454a52561180f78921be82fbfb2ab228f683d3bd69fe91abdf56f0c0bf7b1b336a1e4b3bad86ecaf36192e2cfd8f5b2e175302078d55fd8d346abf4ab7 SHA512 da19361e2ffc28cf5166ab6de263f75f97357a1053a92a3e095602c22fd4b9a70237904b2eac58bdcb1cd296fc74118676c4227996f9534681f221584840618e
-EBUILD gpgme-1.15.1.ebuild 2678 BLAKE2B a8c126d2fb79b1425069b6e174e2bc3f4da6c0fb82d08e11d1b6945e0bdf6e0f0131b3e21e6b5347fc6956864acd751aecbd959fdc9b166fff5800542dcda64f SHA512 25d734d2544950b307748c40370ca072f76a156f685a9b8f594bba4f5ae1efab0d566dbd0f226d487ccd4940b8617092e08707b2c6f7e0768ffc93a1cefb980d
+EBUILD gpgme-1.15.1.ebuild 2670 BLAKE2B 7007356262efc1db39dd9f024934e33f9851c5b120297472043e090ebf779aefe246c92cdb7c62c67fa97f78d44bd2a5a185cfef0e3d65dd8e1ec18368cafced SHA512 f7ebc23ff194ff6e652f5d1768b90299a642ffa30b6f6281d698fa0c26da32aca864fa1d68ccced41ca2db3e4b6de36dfdbb9f6563f68fbd1cda1fd4069bb678
 MISC metadata.xml 326 BLAKE2B 982fe6e2ae0b6ce81980b477a39341c363c867202d646ff4acc9fb361785026919cc0de914e0deee67b79441115cea8a8b36f095d4719442f527f1a0d3ba06b8 SHA512 1223f3cdd325623e524c5bf46bea592b6930bdcc2ba40f9ebf27e568c6a527f59c8315194e4ffd70c29b778d25a2e2b8f57282d5e788814d3fbbcb1de4cf6334
diff --git a/app-crypt/gpgme/gpgme-1.15.1.ebuild b/app-crypt/gpgme/gpgme-1.15.1.ebuild
index 9b99df979f9f..3e89833a85e6 100644
--- a/app-crypt/gpgme/gpgme-1.15.1.ebuild
+++ b/app-crypt/gpgme/gpgme-1.15.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://gnupg/gpgme/${P}.tar.bz2"
 
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="1/11" # subslot = soname major version
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~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 ~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"
 
 RDEPEND=">=app-crypt/gnupg-2
diff --git a/app-crypt/heimdal/Manifest b/app-crypt/heimdal/Manifest
index cca04135b078..7724aae2ef7a 100644
--- a/app-crypt/heimdal/Manifest
+++ b/app-crypt/heimdal/Manifest
@@ -15,6 +15,6 @@ AUX heimdal_tinfo.patch 711 BLAKE2B 730ef4b1ba79d80c7257d1bd04783584cf616b2e51d6
 AUX krb5.conf 424 BLAKE2B 49b8a0aab6e0dacb70b91e030bb5f2b8bdfe4253026f85e2c9d16bdf6f554c585572ed9d3835bed976c8953fc92d0f42270c6a0767e943ec5efa5b79f6f4cf89 SHA512 4dad6837344e30c6988355551b5b82bce748dad7aa7648204ba7852540ad3a546b5344926789d60e78d57ff20dff87b680b790dc8d86c8dec1008feb0d809e38
 DIST heimdal-7.6.0.tar.gz 10186832 BLAKE2B 456b495a3d0a196cf02d6042c6db72c772327545fbc84f7bb758f55f3fca025432bf319fc33e9e0b5fe5ca78b83aea9dc47d77bf1f5b69ae88f1286a22c41263 SHA512 3f7ce090cf8da91f19675a1d9f6bd65c83b3a847337739481506f09d74001cb44283b103ba684dac8a5f11ec48605b5476240c534f6fc36442fb874b73680200
 DIST heimdal-7.7.0.tar.gz 10189293 BLAKE2B db9cdd1861dc9214a7f76b3d8b9656cfc0bad11cb6eadffa4fa29ea7f9aabd4c3d1b628c510644ec9abe1b3bf27a413ccf8cd590d602c4a4ac54ba3deb4cedc4 SHA512 6660939b5a36ce36310721a08a089fb671d1e3d2e8ac74ea4775bfa5f8f772d32de805551456200fe96cc486c092c44beb84f5dd877008bc305490ee971bbf99
-EBUILD heimdal-7.6.0.ebuild 4451 BLAKE2B c767a1140eb4a6dcc7e0d2b106412331d4ebf0102942cb0e4161741683da86fbb892169f2d8f9aa3284e0eb3327c3f70555131a45a867ae0646c8c6a0bea1ba4 SHA512 a9623bb6d7d2d264aca88763c7591abb0ed6392a8d6d6ddacd0dfd27373c90d1d5ef983d9e17d6e392f737c57702b38b4896044aa89067b7eeec05bfd529c3b9
+EBUILD heimdal-7.6.0.ebuild 4456 BLAKE2B 13fd307b16c87b75fc0644961ca5fad184c986427b722f650493879a4b967f8bb1cb0a8d8cb105b5f2a70211d930dc1673237ca5da62efb800e50f525d42aeb4 SHA512 c4105dff213063a7c56555689f60b6fec0c91c3ad7aade2aa9e7ef56a13a8ae865ac5b8b3b3b0aa987830236bbed82762d33d912311c3f04b6fa4effd22c1431
 EBUILD heimdal-7.7.0-r1.ebuild 4496 BLAKE2B fb6748500785fc36a21cd022898af247d951cd25e57a46c433e43c9d9975586ee6fb6ac60a1c0f32218341e6e6fe44df730b85ae993b53035689bc9f7601da13 SHA512 063a4da50de81af190872ef93c4344ab3f36092a916828e33380f916641b2872e1bc57017ef404b3d93cf8570e078c6b3c69cd7a61151a5786b72a5e91c36444
 MISC metadata.xml 570 BLAKE2B 827b4e549ff73259b932cc8587625fd9dcd73553d7bee3726baae0d1de8d8e8f8d67fdd649d605099301f426b88fc654341005976a3373d61482c81dec67db5b SHA512 069fa36a8f551ae0fdfd3a6f3dfd6cbfb3bf56c2ceba6ecd5184c4686d885ce5aa83622090f7fa1df44924a7ac3bf63fed4b9b19e70254d2a6d883d483500ad8
diff --git a/app-crypt/heimdal/heimdal-7.6.0.ebuild b/app-crypt/heimdal/heimdal-7.6.0.ebuild
index b6582b76a925..9a250d65624c 100644
--- a/app-crypt/heimdal/heimdal-7.6.0.ebuild
+++ b/app-crypt/heimdal/heimdal-7.6.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_7 )
+PYTHON_COMPAT=( python3_{7..8} )
 VIRTUALX_REQUIRED="manual"
 
 inherit autotools db-use multilib multilib-minimal python-any-r1 virtualx flag-o-matic
diff --git a/app-crypt/libmd/Manifest b/app-crypt/libmd/Manifest
index ba443730d30c..c04accb5a12a 100644
--- a/app-crypt/libmd/Manifest
+++ b/app-crypt/libmd/Manifest
@@ -1,4 +1,4 @@
 DIST libmd-1.0.3.tar.xz 258584 BLAKE2B 35b732800a4b0a7b8d0a88eeff5e7e80fe55ab5ed05b7a7a1ffe866e156cc6dc6daca95f865a56297857b10b1bdfc9815b5bf0b198e8284f217498265c08fcc9 SHA512 f4b5a86bea7b9fac9f7f173032ee436d1e7141f760c1a114a785d31644edbf6802fe8193cc4cf3b5c66d38963be919c05055780bdf6bf5a47927690490ff5966
-EBUILD libmd-1.0.3.ebuild 566 BLAKE2B e7fba8e0856eb13c5a3c28a7f1b2131541075fe65a814eb36dc5100a1c20f9a15174191d431f65c04963061eff51b1a02e01accd62f6fbe048951b3a43edfe16 SHA512 8408a5a8ada47513dc0f3fd6e32643368753ceb1256dfe506a38552aabea592ede3bb54f7bdac455d798499a6bb212a0698876e2487f2d47e1b169ada038eaf8
+EBUILD libmd-1.0.3.ebuild 563 BLAKE2B 0a43166defe23d160046741dd6811ccb897b4a27453c141dd854ce93b7134dc111bb0db9d4ab85592c0fc78e398fdf74dde2598e11092998a87f5557c033dcac SHA512 0b7b49b623b67ad57ef8f4eba25982f70eef5b378b03612a8cd4d9fdd566e1f618e81eb78ca06d010e7101bfdccbdf543bccaf460fc13149cd72f6aeb3e54ef7
 EBUILD libmd-9999.ebuild 523 BLAKE2B e512f27bd0203585b0e2f3eb11c6b38ea853949bdd5dfca7b2f744650b11a18994089bd847fd6a73c5a909ad7f7a9043c2421abaa811a7cf83ea9e4b5ba3ebad SHA512 0ff23822acfdf09f4ce1fa90184c64b58154fc0ab9d713424d32b120bc2670d63865b3be9c831c34c45a5afa308db9c5f5dc12753e9a4a7ff47b14d28eb0fe14
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-crypt/libmd/libmd-1.0.3.ebuild b/app-crypt/libmd/libmd-1.0.3.ebuild
index c2c6fe168bcb..cc6cfe8082cd 100644
--- a/app-crypt/libmd/libmd-1.0.3.ebuild
+++ b/app-crypt/libmd/libmd-1.0.3.ebuild
@@ -9,7 +9,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 ppc ~ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux"
 
 src_configure() {
 	econf --disable-static
diff --git a/app-crypt/libsecret/Manifest b/app-crypt/libsecret/Manifest
index 8fe86182e807..8a72ed75790a 100644
--- a/app-crypt/libsecret/Manifest
+++ b/app-crypt/libsecret/Manifest
@@ -1,4 +1,4 @@
 AUX libsecret-0.20.4-meson-build-test-vala-unstable-with-DSECRET_WITH_UNS.patch 1316 BLAKE2B 0c0fb8c10d869ff98d0644067336e54f907904ed8c4899e58e5d65aa84406442a550a6d4d6939cc34d5f6a80ec5d1d96dc7dcc91e44e955a8eef9b272f2fef6f SHA512 e2e4474a2af3e6f8a5bde2eff58417991b3d85f3042fe77776815f86567094168ca01c25f101cbc82a5f66573b1bc4592e6dee6b1be082fb8ec612c1394a7ce9
 DIST libsecret-0.20.4.tar.xz 529916 BLAKE2B d5922dcb1eb27e4cc6bc7770926fc3191c9f4634867ff9682fd33f9373d6fa2d334c9c1b995bd208bbf178af008ec7b224bd5388427617fbd7e48d05d2e35823 SHA512 599482796af001703c25d181a710c5a3207f44d4d0036ef2001cc541bde9ef453172b71df9bb214d27d1fbd2f28c1b5a5efdbd5faca3561188c07dccdc7d7c15
-EBUILD libsecret-0.20.4.ebuild 2606 BLAKE2B ef903f044a985c51a9cc536fd035deb8f4c5e960b1353ace28a8dcbca6d8af0bd31bc9dddf220b0facd6d911a0aa9e35e2057dcc1c4fcca3adaaccc66ed741c5 SHA512 05238d442f02dad738fbb310d45a76e9cbc782f700d7ea3d2d7b5b6287a2a3901f6d425a058905c11d34acaac8677933fcaaa497f7e72a6be8223ebcf4fcec19
+EBUILD libsecret-0.20.4.ebuild 2363 BLAKE2B b4682220dfa37898f0473580c554a547ab56b914287aea325f7ba2c7c96dfeff340be2173466706a9f6468d1dedf6d71e056567d8ce00f90b318447df99e6570 SHA512 c54fa657adae23150022ec1d8c117425eac1114656d76dd7201236f6ef4468d53008e8d7b04c06ff5ddcac6cda93ebfbecd1955ecaf7c5750f98ceccef053181
 MISC metadata.xml 253 BLAKE2B a1efbd3751efaa83ee173f557ec1c8a4497a90b60896cf5a7a07da40b4f94a7a299ca0385477e82b2f5e5dbdf9afa482ccbe21f35ef44214e9c451d764b65529 SHA512 8d59f413993268ca783f7407b676900bb2d964754bf705d4175e2bafbe058a52af74f3928e4bd84d292518f8cf13fab7051486ab7cdc61d02fae6e0188d44442
diff --git a/app-crypt/libsecret/libsecret-0.20.4.ebuild b/app-crypt/libsecret/libsecret-0.20.4.ebuild
index fc8e3656fc55..5db7cd230147 100644
--- a/app-crypt/libsecret/libsecret-0.20.4.ebuild
+++ b/app-crypt/libsecret/libsecret-0.20.4.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 PYTHON_COMPAT=( python3_{7..9} )
 VALA_USE_DEPEND=vapigen
 
-inherit gnome2 meson multilib-minimal python-any-r1 vala virtualx
+inherit gnome2 meson-multilib python-any-r1 vala virtualx
 
 DESCRIPTION="GObject library for accessing the freedesktop.org Secret Service API"
 HOMEPAGE="https://wiki.gnome.org/Projects/Libsecret"
@@ -71,32 +71,20 @@ src_prepare() {
 		-i libsecret/secret-enum-types.h.template || die
 }
 
-meson_multilib_native_use() {
-	multilib_native_usex "$1" "-D${2-$1}=true" "-D${2-$1}=false"
-}
-
 multilib_src_configure() {
 	local emesonargs=(
 		$(meson_use crypt gcrypt)
 
 		# Don't build docs multiple times
-		-Dmanpage=$(multilib_is_native_abi && echo true || echo false)
-		$(meson_multilib_native_use gtk-doc gtk_doc)
+		$(meson_native_true manpage)
+		$(meson_native_use_bool gtk-doc gtk_doc)
 
-		$(meson_multilib_native_use introspection)
-		$(meson_multilib_native_use vala vapi)
+		$(meson_native_use_bool introspection)
+		$(meson_native_use_bool vala vapi)
 	)
 	meson_src_configure
 }
 
-multilib_src_compile() {
-	meson_src_compile
-}
-
 multilib_src_test() {
 	virtx meson_src_test
 }
-
-multilib_src_install() {
-	meson_src_install
-}
diff --git a/app-crypt/nitrocli/Manifest b/app-crypt/nitrocli/Manifest
index 6d6394d064d9..1c6b94e845b6 100644
--- a/app-crypt/nitrocli/Manifest
+++ b/app-crypt/nitrocli/Manifest
@@ -112,5 +112,5 @@ DIST winapi-i686-pc-windows-gnu-0.4.0.crate 2918815 BLAKE2B 4d357e4d30f955297217
 DIST winapi-x86_64-pc-windows-gnu-0.4.0.crate 2947998 BLAKE2B 2ad1ea8b5fa07d544e910ccba043ae925269b76b26c9da356305b34b86741dd8b9aff0b9ffe3d562db4fcd7d7c46a11ce9e3168b782b1d89ae6881742b7ede82 SHA512 4a654af6a5d649dc87e00497245096b35a2894ae66f155cb62389902c3b93ddcc5cf7d0d8b9dd97b291d2d80bc686af2298e80abef6ac69883f4a54e79712513
 EBUILD nitrocli-0.3.4.ebuild 1551 BLAKE2B 5d0dbaa6766209bfcb3d2c1332a69c395df40377b679f9b42bbf3f58616ffaf51b532a6ee4df185d6c2ae2744c0b18f214027ba4caf0918ef2a69b0565594ab4 SHA512 d774c7b7fd0f92e52572d1fec2f9413d1e683781999336879a89061a68d5f64fb20717e198f4e286a7db9b5b64990e5c21ab4c4c4be3eb659156c7f24eccd760
 EBUILD nitrocli-0.3.5.ebuild 1968 BLAKE2B 5c58af3560e0ca2bfb52b31fff704117b2d5defabcf55aca20efc19d860c52a9f9675086698bfb88394ec3041453030b2e1fdce3fa3a1c68e8a2316af33428db SHA512 f4924b0e13093548c93c12f14dd2472ce3ac39f67525904cca9522c829db27faf768abbe041b1904931963886df92fc240a85602581acb2a4059c40b5d98b20e
-EBUILD nitrocli-0.4.0.ebuild 2345 BLAKE2B b3e19f48aa69d4b31088edc71e6a9041fa14bc3e70ae6458195cae279fc2adcaccfedc98256a3a85bf1e5ada392950a7468d40294d1be1f5b9dc0d298a4f92a7 SHA512 6990cea0c8116e58b379c968dd1a815f960a33aaec10ec04a035fc079a3da577ebc10ab10a4c946f48ba70322489ec49f90aef406bd95a0513837d13bb35c7e7
+EBUILD nitrocli-0.4.0.ebuild 2343 BLAKE2B 1bf8ad68f2452f1146bbe4bdbaf5a3fd8d18e018d8fd30174a6d04131f7f6a6c68e7abe76143547499bee29875bd6e7641e8d4aa472895b0574f67f4cf706c52 SHA512 ec234f63224e1886b3ceb65642de56badce4641bb0f5501977c8a053f5c9254056dea629fac07e49a9f98aabec606fd60cb4bfdd8e426fc445cefd2b893d014f
 MISC metadata.xml 713 BLAKE2B 77012af77b67c16b6ff4fa02a3c0a26d493ee288f4ed2bb5884923f5be779baf56e12c0bf391d6eae4e9f79f3899c053f583ffdc0ed7595f24ec84ef93c23fe0 SHA512 4a99d7fba9fa024a139fa7b71eae1d341d281b9a9db52376b6ed4e447cd875d2319dc6115c7e17e6b1386b10fb956584203bfac9064af9cf8844788fa7542410
diff --git a/app-crypt/nitrocli/nitrocli-0.4.0.ebuild b/app-crypt/nitrocli/nitrocli-0.4.0.ebuild
index d65a5b0a7d80..6c2c08190137 100644
--- a/app-crypt/nitrocli/nitrocli-0.4.0.ebuild
+++ b/app-crypt/nitrocli/nitrocli-0.4.0.ebuild
@@ -84,7 +84,7 @@ SRC_URI="$(cargo_crate_uris ${CRATES})"
 
 LICENSE="Apache-2.0 BSD-2 CC0-1.0 GPL-3+ LGPL-3 MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~ppc64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/app-crypt/openpgp-keys-botan/Manifest b/app-crypt/openpgp-keys-botan/Manifest
index 03d7805d80b8..254e72a1521a 100644
--- a/app-crypt/openpgp-keys-botan/Manifest
+++ b/app-crypt/openpgp-keys-botan/Manifest
@@ -1,3 +1,3 @@
 DIST openpgp-keys-botan-20210416.asc 11506 BLAKE2B 3f601f0875d420cdc47a33d3c9de84efcd8cbe945d11b5831c1f860289495d5a0b02ac97c91b493e0e0fc50aa5fe22afbd323ba3607ad23e443f035c4860ebe7 SHA512 b4ce10cb9dff16059d766b490aeaacfa48dfc729a2339ec8aace9a19a62d07b645c8fcdd46ddcc9930caa839e2a057858342c21be91197a62b0c3212943aa165
-EBUILD openpgp-keys-botan-20210416.ebuild 593 BLAKE2B 6d80ee67636740e93a19d37b0e95b3abcf43bfbb20951eca12c21f90ea7da0744e33a5b25200c09e0d153aedb05bb03aa2c115d00f1b4d037516a5fbccae06bc SHA512 c78a06bdeaf2277342428386146e4ba769cb6021d4c6ceb47a114b8350f88a6864356ca012983322a75344e8e85a605b45eb089c6621164ef05e55ee2aad08d7
+EBUILD openpgp-keys-botan-20210416.ebuild 589 BLAKE2B 69a2340654ca17d05653d6bc41b9c46fd7e585d1d68754e62bcf0280f19bb610163729d890b5d87b9ee1d3d464078a288e5a1926fb926c1701424afcf72ec708 SHA512 4435da4a1bc1986aeaf35f02977ddad1a2a258beb60bb607556aa2ba7af4b038a14aa1aff98f42ac31d4556f48d8addec70aa00ef39987044fb04175f33f7461
 MISC metadata.xml 263 BLAKE2B 3674e5c7d5dedc501574b523bf09a9f2d8f2e066edffa5649d59afba65ef3d9c36f3fd909f196f676b5b1266e5edce6ba6c44cf11fdca73b02b30cebcb662a3e SHA512 2f82b95119eb592f8edd7468010dbdc6863b235a0827586114fca02d01d45ce32a2be24077edfa497b0692f2f14447ad070c15b8a951b87091806750b8b0b862
diff --git a/app-crypt/openpgp-keys-botan/openpgp-keys-botan-20210416.ebuild b/app-crypt/openpgp-keys-botan/openpgp-keys-botan-20210416.ebuild
index dacd11b4fe46..464b1013e383 100644
--- a/app-crypt/openpgp-keys-botan/openpgp-keys-botan-20210416.ebuild
+++ b/app-crypt/openpgp-keys-botan/openpgp-keys-botan-20210416.ebuild
@@ -10,7 +10,7 @@ S="${WORKDIR}"
 
 LICENSE="public-domain"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
 
 src_install() {
 	local files=( ${A} )
diff --git a/app-crypt/openpgp-keys-mlichvar/Manifest b/app-crypt/openpgp-keys-mlichvar/Manifest
index 2fd403fa7b3f..def98ff2eba1 100644
--- a/app-crypt/openpgp-keys-mlichvar/Manifest
+++ b/app-crypt/openpgp-keys-mlichvar/Manifest
@@ -1,5 +1,5 @@
 DIST openpgp-keys-mlichvar-20210416.asc 1672 BLAKE2B 62af2374a607f5d1840aff3e296b3daf37a91bd4c8148b8c86c709eb59de21ab981984296f578304f19436cdd6e3846b442a6b6313b217951379fac96b686522 SHA512 dbf4ef590318ce4429c196259573bdaa3557a131e7f0914fda7192665c5046f5e90d99cf637977affe030dd305e865230e111ea00a6601186bde43b21a8a724e
 DIST openpgp-keys-mlichvar-20210513.asc 3285 BLAKE2B 3ba5046e98eafe52eae126d0e05cda195f12a20a15c3cfe92cffc25a7d339418931e4e72ba2a36d5ae614b6f7a96a923495592419c09dfe712dbdcac80cb2624 SHA512 8cedd37e6a42b21e71fa5c8779300e65fdc078d41fb750abd07bd8f6f1cd41bc54814c021f6fd3d25e67190e84aa45d37735ea03325dbc5e77582506fa4b8b9b
 EBUILD openpgp-keys-mlichvar-20210416.ebuild 601 BLAKE2B df2b4eb3a34d6d50ea3df0b4c5bcd7bca490cb111e08671e582902e85de98776bf24c0d91360b269d77c4534548cfce677855157b52089637bb43b3e08ca444f SHA512 a08cc80fc7273ed0790c19e4bb248f062b7d26617633cec2b4a69579876d16b9a258987e4bd838f00d4316e81caf170505c6bb6225835f540260cd53d913d864
-EBUILD openpgp-keys-mlichvar-20210513.ebuild 609 BLAKE2B 4cc4cf8ca31c41a4245dd91c671506349987a9cf268ac2c732eae0c20bc205207bb693c008533341c9788cad1f6886f7d522613d6d93507ea5ed2d0816117134 SHA512 b4872c2e1a178103b1ff529ee3dbf53c88195e5214fe2e03fd42686c56f2d5b6c947673be3636c39128ddc9aa8470c8d21743f0e14dfe7ccf9b1f90cab13c621
+EBUILD openpgp-keys-mlichvar-20210513.ebuild 602 BLAKE2B 79c5a574845f78f0b2d28a8ab5e046a620d4521c4b57b4b19f3d9b79de3d37ef463d1008f5d4d437dcee5ab19736afcdf6ef5f4a56a331e8a324ae04427cad08 SHA512 fe1635f8184bb2c4275110ff36926846a568731d86e62e315cac1c6fad6a0e38ac8c888dd93164ed2c623fb4cf0450ff77f6051ca4396d95bcecd76732d3cba4
 MISC metadata.xml 263 BLAKE2B 3674e5c7d5dedc501574b523bf09a9f2d8f2e066edffa5649d59afba65ef3d9c36f3fd909f196f676b5b1266e5edce6ba6c44cf11fdca73b02b30cebcb662a3e SHA512 2f82b95119eb592f8edd7468010dbdc6863b235a0827586114fca02d01d45ce32a2be24077edfa497b0692f2f14447ad070c15b8a951b87091806750b8b0b862
diff --git a/app-crypt/openpgp-keys-mlichvar/openpgp-keys-mlichvar-20210513.ebuild b/app-crypt/openpgp-keys-mlichvar/openpgp-keys-mlichvar-20210513.ebuild
index cbfc52603f9c..0fd3af1e955e 100644
--- a/app-crypt/openpgp-keys-mlichvar/openpgp-keys-mlichvar-20210513.ebuild
+++ b/app-crypt/openpgp-keys-mlichvar/openpgp-keys-mlichvar-20210513.ebuild
@@ -10,7 +10,7 @@ S="${WORKDIR}"
 
 LICENSE="public-domain"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 
 src_install() {
 	local files=( ${A} )
diff --git a/app-crypt/p11-kit/Manifest b/app-crypt/p11-kit/Manifest
index 2ab3df59d8ba..cceba350c88a 100644
--- a/app-crypt/p11-kit/Manifest
+++ b/app-crypt/p11-kit/Manifest
@@ -1,3 +1,5 @@
 DIST p11-kit-0.23.22.tar.xz 830016 BLAKE2B 4e1edfd9e2441d237c07a16c003aee5ffde38f1cf545c26e435645429f2cfa4fe7ca61cdc3c3940390aa040ba991f2ee3995b14cc31bb886d5eeffa8ed5e1721 SHA512 098819e6ca4ad9cc2a0bc2e478aea67354d051a4f03e6c7d75d13d2469b6dc7654f26b15530052f6ed51acb35531c2539e0f971b31e29e6673e857c903afb080
+DIST p11-kit-0.24.0.tar.xz 834392 BLAKE2B f967b51d3b021c6e95a0ddc1934527023aa4acbae2b193d64829620331ea0f094e1467fdea897a3121d05f30b1747607197a50c906a40609913230ab363c09e5 SHA512 48369d6fdae79b8c5a255c821fbdb982f0c649cce07c0d92f0ff0c16322fea8919faa94067cae2efede2da3646c0e69a71a3e399b769dc2327f247bcb113eb3c
 EBUILD p11-kit-0.23.22.ebuild 2008 BLAKE2B e2c6140ad7266ed68c605c3fd157776bca69900f8f123d6a9c469ca8877099a809bc92b99a9e57605e75940955c52e0de5794b68f9e2865fe58dac0a540d875f SHA512 be9bab7ce91c482bdf6d6413573926bebb77b987b5a8a620b610347d07bba36c502e7067d90e8e1bbb9023aa63c706c0929fec30e957a590675f97ecc2046839
+EBUILD p11-kit-0.24.0.ebuild 2016 BLAKE2B 7075bab6be1a1b29a98350ccb547f7398244009e489d933a282b35b22ecedd44691fbbf77ac8f42958afa473440fd938173d20bc1798e2340c26045a2861bce4 SHA512 85196e2e2f382cc69fe18e87faa00dcb34aa500d7a7c5b8a9310a0f716570555b61b0ba25f3ede08fa3b21b101a52710c4d99c7565c2c419fcf7f91b4a9825de
 MISC metadata.xml 461 BLAKE2B f08333756cc155a6cdf4114a5c486915ca0c328be382457981064997951bc89b4968fabcce89fad96fcf1c26e822d292aceb26684f1118520474df52b40dbf8e SHA512 043b9eb064bd25e69b57b0ec50193ce748efae48429e2b8518df0d2376262d213507bb11a809a2a5b4443d3991eca6c60d418538ea92845b3d71139b16e19fa2
diff --git a/app-crypt/p11-kit/p11-kit-0.24.0.ebuild b/app-crypt/p11-kit/p11-kit-0.24.0.ebuild
new file mode 100644
index 000000000000..7366c599dd8b
--- /dev/null
+++ b/app-crypt/p11-kit/p11-kit-0.24.0.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit multilib-minimal
+
+DESCRIPTION="Provides a standard configuration setup for installing PKCS#11"
+HOMEPAGE="https://p11-glue.github.io/p11-glue/p11-kit.html"
+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"
+IUSE="+asn1 debug +libffi systemd +trust"
+REQUIRED_USE="trust? ( asn1 )"
+
+RDEPEND="asn1? ( >=dev-libs/libtasn1-3.4:=[${MULTILIB_USEDEP}] )
+	libffi? ( dev-libs/libffi:=[${MULTILIB_USEDEP}] )
+	systemd? ( sys-apps/systemd:= )
+	trust? ( app-misc/ca-certificates )"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+pkg_setup() {
+	# disable unsafe tests, bug#502088
+	export FAKED_MODE=1
+}
+
+src_prepare() {
+	if [[ ${CHOST} == *-solaris2.* && ${CHOST##*-solaris2.} -lt 11 ]] ; then
+		# Solaris 10 and before doesn't know about XPG7 (XOPEN_SOURCE=700)
+		# drop to XPG6 to make feature_tests.h happy
+		sed -i -e '/define _XOPEN_SOURCE/s/700/600/' common/compat.c || die
+		# paths.h isn't available, oddly enough also not used albeit included
+		sed -i -e '/#include <paths.h>/d' trust/test-trust.c || die
+		# we don't have SUN_LEN here
+		sed -i -e 's/SUN_LEN \(([^)]\+)\)/strlen (\1->sun_path)/' \
+			p11-kit/server.c || die
+	fi
+	default
+}
+
+multilib_src_configure() {
+	ECONF_SOURCE="${S}" econf \
+		$(use_enable trust trust-module) \
+		$(use_with trust trust-paths ${EPREFIX}/etc/ssl/certs/ca-certificates.crt) \
+		$(use_enable debug) \
+		$(use_with libffi) \
+		$(use_with asn1 libtasn1) \
+		$(multilib_native_use_with systemd)
+
+	if multilib_is_native_abi; then
+		# re-use provided documentation
+		ln -s "${S}"/doc/manual/html doc/manual/html || die
+	fi
+}
+
+multilib_src_install_all() {
+	einstalldocs
+	find "${D}" -name '*.la' -delete || die
+}
diff --git a/app-crypt/qca/Manifest b/app-crypt/qca/Manifest
index 56785c94989d..2941745cc4bd 100644
--- a/app-crypt/qca/Manifest
+++ b/app-crypt/qca/Manifest
@@ -2,5 +2,7 @@ AUX qca-2.3.2-cmsut-signverify_message_invalid-fails-randomly.patch 1195 BLAKE2B
 AUX qca-2.3.2-openssl-1.1.1i-empty-msg-verification.patch 1816 BLAKE2B 80dfcff3a0fc5121cbbe956fe847fb6141a778b0c3e479fefc9c0f26b727bdf7957576f32f38324ac5c465d69f4f19d48a5951daa50ae6a613eeaf6aa5d67d97 SHA512 eda5ec8abba1c4d7f8c455ed65c0a865926a74a909897c01c08d08b33f7033b8de7c8aa91adc6497518936a97cc4d7372947eafea2e67617275611a16d89c8d4
 AUX qca-disable-pgp-test.patch 446 BLAKE2B a98d5951d7b89c65787d7d586a5504949c51271ebe09c5e19b90a2e24f24fb6d03d6c1f76d7ad4234354bc2507cf7031c716b3b2bf8243b8c1d85065079dded4 SHA512 30bb6d31b9392166d6bbae39da2eeb1788ac9cccffb801b074468a3606a6e1a56d6a41ee276d3b8b8d39112bf6aea7025f07f4810bb835102bd00521ee9eb104
 DIST qca-2.3.2.tar.xz 735500 BLAKE2B 559b27c48c756f2b4f4f206d2157c90ae4856610f1539b4162a2bffe7fffe19b5c768d3d3f9d0486d2098fb403eb64372515815f49fd428d22dfc0405d99e435 SHA512 da6415a097c99b878f45730c1dd1e0bfc7f96858ad7018918ac7c2ae2eca830cb73e131173b1018ee4caa6c3a504b80c8ad28f8f9448c2fd1593161c2ac8aad4
+DIST qca-2.3.3.tar.xz 736456 BLAKE2B f0812fd33bd19293c8034e48bcf214d2d70dc1397860779c2c145fe841365384a8eb6bad9859520d32104010acb0cefb97e3a974b9852a37ca8039d52d9dbd03 SHA512 9a262350502daa1dd10802a7a24f0e4712d87d4ddcf752452a51caa8694a30835672f54f8e600aa8dc4afdac9ef073641deed52a24423e304d18ad2b83deeca6
 EBUILD qca-2.3.2.ebuild 1995 BLAKE2B f054015be5f10231bd5c491412d2abb0b9ad1c94158e88cfd8bd6db6ef6128428822c03af21c189f1df04cfa8833d331a8174fa9804c1b0b560d3d0b6e77d92d SHA512 ae7417c07673b4755651236964ceea2d5bc4ef69ad1ff78affbeaabb357caaafb0f4400ea41ed428de380111760ab46e0611e852e883406862cd878fb77c3f10
+EBUILD qca-2.3.3.ebuild 1843 BLAKE2B 698e16f4b33fb33e713eb8f4effb4e7018728946404d382edaab67ee47e51f3e42dcd0e7c900d0ad36038233ceb62e7e728776bf39d365f3ac2986e45da3a878 SHA512 09ccb227109a19da4deb6bcea01e4e04919d904b5f99ea835403c1d3caf0971f1f64bd7c67cc98f80e92ee02522f3cd66ad76af5ff2407f448368b254ac1354e
 MISC metadata.xml 745 BLAKE2B ff8e25b082d3c642fce099df1a218a4936bdc862a96fd237303d040c477544cf6368d23cc5de414d95f021e9c6ec475879225ab201f7c6d6711c04153ac53140 SHA512 6b82494b8dfe0d36da9818a6dcf775252dbb7051430232ccc2519c449cc2877da6478ca98f5b7a982a7660a869a0b8ae7a814fb18108ff42fed9712a9253e867
diff --git a/app-crypt/qca/qca-2.3.3.ebuild b/app-crypt/qca/qca-2.3.3.ebuild
new file mode 100644
index 000000000000..5f2030b035fb
--- /dev/null
+++ b/app-crypt/qca/qca-2.3.3.ebuild
@@ -0,0 +1,82 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit kde.org cmake qmake-utils
+
+DESCRIPTION="Qt Cryptographic Architecture (QCA)"
+HOMEPAGE="https://userbase.kde.org/QCA"
+SRC_URI="mirror://kde/stable/${PN}/${PV}/${P}.tar.xz"
+
+LICENSE="LGPL-2.1"
+SLOT="2"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris"
+IUSE="botan debug doc examples gcrypt gpg logger nss pkcs11 sasl softstore +ssl test"
+
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	dev-qt/qtcore:5
+	botan? ( dev-libs/botan:= )
+	gcrypt? ( dev-libs/libgcrypt:= )
+	gpg? ( app-crypt/gnupg )
+	nss? ( dev-libs/nss )
+	pkcs11? (
+		>=dev-libs/openssl-1.1
+		dev-libs/pkcs11-helper
+	)
+	sasl? ( dev-libs/cyrus-sasl:2 )
+	ssl? ( >=dev-libs/openssl-1.1:0= )
+"
+DEPEND="${RDEPEND}
+	test? (
+		dev-qt/qtnetwork:5
+		dev-qt/qttest:5
+	)
+"
+BDEPEND="doc? ( app-doc/doxygen )"
+
+PATCHES=( "${FILESDIR}/${PN}-disable-pgp-test.patch" )
+
+qca_plugin_use() {
+	echo -DWITH_${2:-$1}_PLUGIN=$(usex "$1")
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DQCA_FEATURE_INSTALL_DIR="${EPREFIX}$(qt5_get_mkspecsdir)/features"
+		-DQCA_PLUGINS_INSTALL_DIR="${EPREFIX}$(qt5_get_plugindir)"
+		$(qca_plugin_use botan)
+		$(qca_plugin_use gcrypt)
+		$(qca_plugin_use gpg gnupg)
+		$(qca_plugin_use logger)
+		$(qca_plugin_use nss)
+		$(qca_plugin_use pkcs11)
+		$(qca_plugin_use sasl cyrus-sasl)
+		$(qca_plugin_use softstore)
+		$(qca_plugin_use ssl ossl)
+		-DBUILD_TESTS=$(usex test)
+	)
+	cmake_src_configure
+}
+
+src_test() {
+	local -x QCA_PLUGIN_PATH="${BUILD_DIR}/lib/qca"
+	cmake_src_test
+}
+
+src_install() {
+	cmake_src_install
+
+	if use doc; then
+		pushd "${BUILD_DIR}" >/dev/null || die
+		doxygen Doxyfile || die
+		dodoc -r apidocs/html
+		popd >/dev/null || die
+	fi
+
+	if use examples; then
+		dodoc -r "${S}"/examples
+	fi
+}
diff --git a/app-crypt/tpm2-tools/Manifest b/app-crypt/tpm2-tools/Manifest
index d436c7a6c4c4..1d01f26b7029 100644
--- a/app-crypt/tpm2-tools/Manifest
+++ b/app-crypt/tpm2-tools/Manifest
@@ -1,6 +1,6 @@
 AUX tpm2-tools-4.3.0-Remove-WError.patch 360 BLAKE2B 440f48fca6e8aaf9b2c0fd094011738c467a22dc31bd94b53f6788b8fa52c00c5d7ebe074434be60b6370dcf1e94ee4d57bcfc93857fcf03dbdff30c8e157445 SHA512 0d246d1446b5b2ebca0e12467c746a731897311448840a7aac35b57d22edcdec0c9f424d1c95c9614d969a57dba458bbbad8826516cc05329b47d2dad05318fe
-DIST tpm2-tools-4.3.0.tar.gz 881544 BLAKE2B 0415f30845658e84e97a964abebc3082e45fb880c10bec405cd89c7bfa373ace10b669c4af78e7e47f2d2bb62fc7cc34b2e54e392a95c8f9b8956b8c92af6aee SHA512 4e622bbc8642ba7fd93a7343900560fe3779cba03e363d16f391fc8929724a11913d238e3986de06982cbced27c3c2ca8c7e73d75796407b8646c101ccf393a8
+DIST tpm2-tools-4.3.1.tar.gz 891993 BLAKE2B d145fd542952ebbf59bb82640b9ac41cc777dcd8f526683447e3a3fd22fd4c46ab59899418ae52382d88e05418b772afd7f10093c5e0ef4cba685470cf7a7c8e SHA512 0104b6bca9e56ee30c033f3ddb2ab75b683b07ff917b800ff8fde49ce5cdc6d42e5fff63ed3ee9700f656dbf34bca76cee7408c256f1e30d92148c506b0032f2
 DIST tpm2-tools-5.0.tar.gz 990855 BLAKE2B 5d39bbef0bc6f0d84f37c64c697260343a9f9e134bce015a6b529176195adb907672f35b85382b0a4785e40e368030ac347083086c3799bdfe86dced1ac69848 SHA512 ea57a28a61e28b78cae7067ff58facd8754fafab7a2689fd93f8b3374073b6ac30301a75f8ff5c654800ab469ee6604d0b8a86c310631b9545b816ecaa05968e
-EBUILD tpm2-tools-4.3.0-r1.ebuild 1052 BLAKE2B bf435ee4ce938f58cf82a835e4940c2044ee179a574e575fad1124222216c4d1147d302b9fbe95165303326758e7145112e120f7d1f70c0750fc62b75d4db1c2 SHA512 85155fc93543892a19be80b0826f20fb38be8cfe84ed2e4ae957e2c36bd075126b635fe54f848785aa866c0a22e1e7e19378a22361c30d3fba4f922299cc3048
+EBUILD tpm2-tools-4.3.1.ebuild 1052 BLAKE2B bf435ee4ce938f58cf82a835e4940c2044ee179a574e575fad1124222216c4d1147d302b9fbe95165303326758e7145112e120f7d1f70c0750fc62b75d4db1c2 SHA512 85155fc93543892a19be80b0826f20fb38be8cfe84ed2e4ae957e2c36bd075126b635fe54f848785aa866c0a22e1e7e19378a22361c30d3fba4f922299cc3048
 EBUILD tpm2-tools-5.0-r1.ebuild 1052 BLAKE2B 42570effe76926a3c413d3515393329b3825a5fb7dc554132e08e0a50628b4e102bae85229ae878ea0abf2a9d3c1587b112d1f66c20b70da502ce22bad2ab38d SHA512 f4cf500e38fca6b2617f19a515ccc48c7829f939a997681c2c97576b6ebd5e4737b004224939021f43682a0568c522212d8788388221b2369fbe43e158aabb8c
 MISC metadata.xml 559 BLAKE2B 6c0842aa4bbd95d2047bf3ce11c99fad96491481bbe52cdd81d0d02085d97799129ab5a249925c88c20afc1fba8890fb1809a1809a2c2c23e62bb36673031c98 SHA512 6fe7716a5db796b958fee79d65fa04b32196985f503bfb11ff4790c95f118fb5ca14cc9b4ef59b94caadc60c30453b629c6b93918fde505404646a0165947f5c
diff --git a/app-crypt/tpm2-tools/tpm2-tools-4.3.0-r1.ebuild b/app-crypt/tpm2-tools/tpm2-tools-4.3.1.ebuild
index 01663f80cd57..01663f80cd57 100644
--- a/app-crypt/tpm2-tools/tpm2-tools-4.3.0-r1.ebuild
+++ b/app-crypt/tpm2-tools/tpm2-tools-4.3.1.ebuild
diff --git a/app-crypt/tpm2-tss/Manifest b/app-crypt/tpm2-tss/Manifest
index 4b95ae830b46..1ede82d30eb8 100644
--- a/app-crypt/tpm2-tss/Manifest
+++ b/app-crypt/tpm2-tss/Manifest
@@ -1,11 +1,10 @@
 AUX tpm2-tss-2.4.1-configure.ac-wrap-PKG_CHECK_MODULES-in-braces.patch 2073 BLAKE2B 09e64b791b75a6bb673402fe94bd4b4bac91f07f98e9053941470b0f44034d6892e6070aaa08326b25c1567018eef898b6508ded8bdbdfd0dd342ca22d0cdcc6 SHA512 d354f656481db5ead0d48ae0389954cc6735a037a6b09cda251360b937128b5807d4b3c5819dbceaa1767db2232ff8dea2f00af3998c182ee3533f97365aeda2
 AUX tpm2-tss-2.4.2-Dont-run-systemd-sysusers-in-Makefile.patch 452 BLAKE2B 8b05bcdbe62333226d89a0275de8cfaa6b4f87d508a5f5c7da260d713244f468e07fbcb5e5c071bd9f8679dd369120d4d41c3c2d9a6c6cf81e17498e1a8b397b SHA512 c8255213c3712cc9f0bdce0080c9f14644926bd45103c89e0dfdbd8dfb4d4c1168bd6c0582b4c671d4c65f6b965246eaefb86e9ae2f43d354a67584f97ef9745
-AUX tpm2-tss-3.0.0-Dont-run-systemd-sysusers-in-Makefile.patch 478 BLAKE2B 0739aa873be6b3faa025fc38ab562da07afc0a7016856bc99f5b1fdd9202a24124d8f5789de0381ec136480cf24337754ae795f84252d8b38ead94dee1362317 SHA512 d94fab5dca4823a5839e54a1a284331dda449b7a76b01de390cf21535e88531b002b433ec0b4b8246c0f16417b2116ef4a6c63863c0aaf151f1885f0bab66945
-AUX tpm2-tss-3.0.1-Fix-underquoting-in-configure-ac.patch 990 BLAKE2B 275ce64a386e1d3a5e458b7914c9885e196d40f44d1af57bf2925f0c794946884ea9ebbf60e82ccd747986f9f8feaefa07f43742353a4da99f1fd13d17196975 SHA512 02c3c6f0cbb9f5a70988e7ba7c27d2b19b2ba74c024ca34f71f9803bdac4935b19bd0650bd9069b0c628e2a72449ed69710f59f576261aa68884777bf8f0d7f7
-DIST tpm2-tss-2.4.3.tar.gz 1439120 BLAKE2B 21acce29f96e8039124874c024b43eb8d2c4ffda27db58bb4f34446747c0fa6953c6ca390f8e87d22c1349123bada81051b119eaf7a28c7d1ad8a9195287c312 SHA512 4adaeb2724b720017e9d488f66de879ebdc0dbc2a4f7536493214913a49d2c631e302be26f710f0f45b0d514212cb036ca7ba9715ee13c29dda1d4a61595aa27
+AUX tpm2-tss-3.1.0-Dont-run-systemd-sysusers-in-Makefile.patch 1214 BLAKE2B 40f1005626205d440fabda7f88444b0eef344df8f6ead5716807bcbaf490e7b24afc12580ae25c506fcc45dfb4bac0789d9b897dfcaae943c6ba9795b2f4f1d8 SHA512 adbff50c66a22659b563344c216d60bb80951016c3d7180c07c0498c285c9099a60e5573ed0ce29c7732de28d4c390b8eac16bf695c739d0c614dd344f1bfb46
 DIST tpm2-tss-2.4.5.tar.gz 1439394 BLAKE2B 644d917f545e93dd81856611522329caf4ff038e4ddb04d761f03339cc7308095abc1c9b46a4d601cad67deea6f917ee5e4236c59f3d7042a7fdf2d33630dd3f SHA512 2c92af07ed1cc3665c19479c00ce5608883081f311192a264a4f7d9119c75ac582596c53b910534c4b66dbb60de2ffd3d6218169748332609c2e0fc89f519259
-DIST tpm2-tss-3.0.3.tar.gz 1489136 BLAKE2B 5bf24cf2c36e579388f62eea06ab3811eab1a89c0cd5d12f6f61cee7f6836487f25fefb864432ff8920931ff37327ca867d1d40fad89e0305d5e1edfb8f0e883 SHA512 54a926db55790250d69c81ac6e436556072057dd7c610d2718689030287dee69d533d4e04b3325dd73d9fc7635dad0bf0a7bfb082957bb51cb420efdb68efaf8
-EBUILD tpm2-tss-2.4.3.ebuild 1706 BLAKE2B 8093b404fa89ac49f22375f59b4f9e4f77e6f73fbb63841734f02413ce26d78c5f689630ee085419e3abb70e0b27d9bc341ca10ed329c5f0e676fdd65a760cbb SHA512 96e2af5daf4e0ad4ac2fa98afa35438383b56a61da704db591ffe502d35ae092c952674504d93758ddfdf7d39ee1bf91bd8a1b41f807188858a6314d6fc4a393
+DIST tpm2-tss-2.4.6.tar.gz 1472883 BLAKE2B e007de07c759e77e377f8569c0c5d94ab57597ea3cb452fb598a47c9b404714a7816c86221d4eacad962436fc7625066d4066f433cd957c37b92d51b0455e2a0 SHA512 f7f7f067605ea30661ac891e22095238689856e22e45f11a6b603cb36ed1ae0724ae52d36f0ee5dd72208da8520457667676ae08107647faa5441a0c9b642f7a
+DIST tpm2-tss-3.1.0.tar.gz 1584690 BLAKE2B cee2807a030b8bab653045cb11dfc7a6a3f7b1e60c1ce4650ba5f0549f29f36ff307e7d53fb5ef9c950b4dae720bdaf35f7cd1e59ebc07b3f16740035e1d5738 SHA512 8967f172c92f1e3e5ba324dbe8afe07bf1bc7179dd755cef9812105f32634f312ee7cc7dfe8e13af69dc219432463f5dc9b93477743de47aba6af1d70b252405
 EBUILD tpm2-tss-2.4.5.ebuild 1791 BLAKE2B 407b4c3f446647f0376fad070976c6906580f26aecde8a6075525908186984a4f5e1f79b4ca76de7fdecb7f82a33b3367326fdaa94ce003c0eff01f11a800a2f SHA512 fc261a84aebc8ac8b73a16d744d16b226c0c90dc79fd5cac4ab2d161acfa7daba7e8eccf5ac34a1fff849934b12324ac6ec827be687ba9010bd01bb46c2456b5
-EBUILD tpm2-tss-3.0.3.ebuild 1780 BLAKE2B 89aad07e3a6bf66825d898bb98001a42f0cdcac534723e8ea6a2d5506eeabed823eb2958f4a1d50d35e10f4ff3699eb506ec5dee9da04415a04f92815d4f1807 SHA512 222bb72f83518a459fd777773034a101f352a8cfe67f9d6b06e2b5f8658b6b25cf6be522c07f0a6008a32bb9dad73b0e5f6fcd064f0fe7dada7f56dbd245b37b
+EBUILD tpm2-tss-2.4.6.ebuild 1796 BLAKE2B 2af3133443ba7319a9d6767301ac44be227bb6543bfc52b0a4e518b8aaef09b70c4430b4d58c1834428fe28b6a9959c1786ec52be612a8b3ad650f2ce3791da4 SHA512 450db75e492a38349541836c1cdc7921322315d11a61e0565b472130e78b7f212789c0449e3c20cd921df0148be9b1322d49fc6369fa093d925c808f5f396e65
+EBUILD tpm2-tss-3.1.0.ebuild 1728 BLAKE2B c8a8fa8b777d3531a1b2b21174c294596fa1380c5297350fe8e52ad779e8800983761908558001a22d4e0be8783edd8282c5384b044a879fffde85f457d3f8d9 SHA512 525c93c01032b8b3ec6210df68085eed811eecc7e0d854ce312be272d08e9509660823257ddb8b240bd6c69d79a0fffd01152861d742092911ca1cc647083aee
 MISC metadata.xml 826 BLAKE2B fcae1100a2beb1c195736a96e394f8f0ca99cfff199e0777e307fe6443acb85105c3d982f9dd55d7945422f8b319ee93d9456d2f953d70d7604ab6f4461dbd55 SHA512 584edb582987e9ea4ff0dc19920bde4f0129c638cc580d188f57364f07b73ab0d0e64172c616a9d0fabbbcbf989cedf59f6ee29243df827c370217f9f60fab0e
diff --git a/app-crypt/tpm2-tss/files/tpm2-tss-3.0.0-Dont-run-systemd-sysusers-in-Makefile.patch b/app-crypt/tpm2-tss/files/tpm2-tss-3.0.0-Dont-run-systemd-sysusers-in-Makefile.patch
deleted file mode 100644
index fd1d462151fb..000000000000
--- a/app-crypt/tpm2-tss/files/tpm2-tss-3.0.0-Dont-run-systemd-sysusers-in-Makefile.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-diff --git a/Makefile.am b/Makefile.am
-index f2fa515a..7d2aca29 100644
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -664,11 +664,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
--	$(call check_fapi_dirs)
--endif
- 
- install-data-hook: install-dirs
- 	-if [ ! -z "$(udevrulesprefix)" ]; then \
diff --git a/app-crypt/tpm2-tss/files/tpm2-tss-3.0.1-Fix-underquoting-in-configure-ac.patch b/app-crypt/tpm2-tss/files/tpm2-tss-3.0.1-Fix-underquoting-in-configure-ac.patch
deleted file mode 100644
index a593716c97ea..000000000000
--- a/app-crypt/tpm2-tss/files/tpm2-tss-3.0.1-Fix-underquoting-in-configure-ac.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-diff --git a/configure.ac b/configure.ac
-index ff59dd7c..3049032b 100755
---- a/configure.ac
-+++ b/configure.ac
-@@ -285,7 +285,7 @@ AC_ARG_ENABLE([integration],
-         [build and execute integration tests])],,
-     [enable_integration=no])
- AS_IF([test "x$enable_integration" = "xyes"],
--     AS_IF([test "$HOSTOS" = "Linux"],
-+     [AS_IF([test "$HOSTOS" = "Linux"],
-            [ERROR_IF_NO_PROG([ss])],
-            [ERROR_IF_NO_PROG([sockstat])])
-        ERROR_IF_NO_PROG([echo])
-@@ -335,7 +335,7 @@ AS_IF([test "x$enable_integration" = "xyes"],
-              [AC_MSG_ERROR([No simulator executable found in PATH for testing TCTI.])])
-        AC_SUBST([INTEGRATION_TCTI], [$integration_tcti])
-        AC_SUBST([INTEGRATION_ARGS], [$integration_args])
--       AC_SUBST([ENABLE_INTEGRATION], [$enable_integration]))
-+       AC_SUBST([ENABLE_INTEGRATION], [$enable_integration])])
- AM_CONDITIONAL([ENABLE_INTEGRATION],[test "x$enable_integration" = "xyes"])
- #
- # sanitizer compiler flags
diff --git a/app-crypt/tpm2-tss/files/tpm2-tss-3.1.0-Dont-run-systemd-sysusers-in-Makefile.patch b/app-crypt/tpm2-tss/files/tpm2-tss-3.1.0-Dont-run-systemd-sysusers-in-Makefile.patch
new file mode 100644
index 000000000000..b66b6e79c143
--- /dev/null
+++ b/app-crypt/tpm2-tss/files/tpm2-tss-3.1.0-Dont-run-systemd-sysusers-in-Makefile.patch
@@ -0,0 +1,29 @@
+diff --git a/Makefile.am b/Makefile.am
+index 183289f7..c791896c 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -689,24 +689,6 @@ endif #FAPI
+ EXTRA_DIST += dist/tpm-udev.rules
+ 
+ install-dirs:
+-if HOSTOS_LINUX
+-if SYSD_SYSUSERS
+-	@echo "systemd-sysusers $(DESTDIR)$(sysconfdir)/sysusers.d/tpm2-tss.conf"
+-	@systemd-sysusers $(DESTDIR)$(sysconfdir)/sysusers.d/tpm2-tss.conf || echo "WARNING Failed to create the tss user and group"
+-else
+-	@echo "call make_tss_user_and_group"
+-	@$(call make_tss_user_and_group) || echo "WARNING Failed to create the tss user and group"
+-endif
+-if SYSD_TMPFILES
+-	@echo "systemd-tmpfiles --create $(DESTDIR)$(sysconfdir)/tmpfiles.d/tpm2-tss-fapi.conf"
+-	@systemd-tmpfiles --create $(DESTDIR)$(sysconfdir)/tmpfiles.d/tpm2-tss-fapi.conf|| echo "WARNING Failed to create the FAPI directories with the correct permissions"
+-else
+-	@echo "(call make_fapi_dirs) && (call set_fapi_permissions)"
+-	@-$(call make_fapi_dirs) && $(call set_fapi_permissions) || echo "WARNING Failed to create the FAPI directories with the correct permissions"
+-endif
+-	@echo "call check_fapi_dirs"
+-	@$(call check_fapi_dirs)
+-endif
+ 
+ install-data-hook: install-dirs
+ 	-if [ ! -z "$(udevrulesprefix)" ]; then \
diff --git a/app-crypt/tpm2-tss/tpm2-tss-2.4.3.ebuild b/app-crypt/tpm2-tss/tpm2-tss-2.4.6.ebuild
index 011fcaefd4a0..698ea26d5635 100644
--- a/app-crypt/tpm2-tss/tpm2-tss-2.4.3.ebuild
+++ b/app-crypt/tpm2-tss/tpm2-tss-2.4.6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/tpm2-software/${PN}/releases/download/${PV}/${P}.tar
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
 IUSE="doc +fapi gcrypt +openssl static-libs test"
 
 RESTRICT="!test? ( test )"
@@ -33,6 +33,7 @@ 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"
 )
 
diff --git a/app-crypt/tpm2-tss/tpm2-tss-3.0.3.ebuild b/app-crypt/tpm2-tss/tpm2-tss-3.1.0.ebuild
index a5458854763f..fa80dfb1ebcd 100644
--- a/app-crypt/tpm2-tss/tpm2-tss-3.0.3.ebuild
+++ b/app-crypt/tpm2-tss/tpm2-tss-3.1.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -27,12 +27,12 @@ RDEPEND="acct-group/tss
 	openssl? ( dev-libs/openssl:= )"
 DEPEND="${RDEPEND}
 	test? ( dev-util/cmocka )"
-BDEPEND="virtual/pkgconfig
+BDEPEND="sys-apps/acl
+	virtual/pkgconfig
 	doc? ( app-doc/doxygen )"
 
 PATCHES=(
-	"${FILESDIR}/${PN}-3.0.0-Dont-run-systemd-sysusers-in-Makefile.patch"
-	"${FILESDIR}/${PN}-3.0.1-Fix-underquoting-in-configure-ac.patch"
+	"${FILESDIR}/${PN}-3.1.0-Dont-run-systemd-sysusers-in-Makefile.patch"
 )
 
 pkg_setup() {
author	V3n3RiX <venerix@redcorelinux.org>	2021-06-15 14:57:03 +0100
committer	V3n3RiX <venerix@redcorelinux.org>	2021-06-15 14:57:03 +0100
commit	d18bf1e01b65ee4bf0c804e2843b282d3d4e5d7c (patch)
tree	4a95cbc6ffdf13bad6ecbc7f8d5af99631984123 /app-crypt
parent	e748ba9741f6540f4675c23e3e37b73e822c13a4 (diff)