gentoo resync : 20.10.2021

35 files changed, 463 insertions, 181 deletions

diff --git a/app-crypt/Manifest.gz b/app-crypt/Manifest.gz
index 22d4007f4521..517ab684f5f8 100644
--- a/app-crypt/Manifest.gz
+++ b/app-crypt/Manifest.gz
diff --git a/app-crypt/acme/Manifest b/app-crypt/acme/Manifest
index 5ca004ac403e..517180c9372c 100644
--- a/app-crypt/acme/Manifest
+++ b/app-crypt/acme/Manifest
@@ -1,6 +1,8 @@
 DIST certbot-1.18.0.tar.gz 1332615 BLAKE2B eb086710b943893025d6e1091470ca02de074232372f4c9fa21fa83a347fe54df988b9553c8cf6afd6e166b8c464d595171984c984008a872e16c0179bb774b2 SHA512 94b16ba0586e0f5d3036280c68f9976c25889ca48fbbe7aded41f0d9feba2300a3f0ff8fe321b39d8642bcdd874c7332cf2acb3187b5869fe415831f58a75a7b
 DIST certbot-1.19.0.tar.gz 1338653 BLAKE2B b6ed909da2aed9853cf3dc6b936c513f33a127548ee30ac45a32a682141c5e4e79401ea328b7caf4e28d1d85aa2a9831e93deaa26c93216708a33be465dc8387 SHA512 2c1beb8c06299b9003fafd970cd3e977db85c4e84f1bf710166b7a99035b5c43a2a222d8d51513ac595255dd8eda02a1fb834c01ce68921927715c880052536e
+DIST certbot-1.20.0.tar.gz 1339066 BLAKE2B 01278a53ea7166037c039d270ddd11a10c0570a9f038571dc6791e51f214fbff1589371b40c0dc73cbc18ed2005cfc231452bd00b039841a09ddb3c65d4ab122 SHA512 d35b2574811ac896ad119355be3a901438400e81a67388bd93290c4e7e9f6fa60dad99b51bc9bac7a7ac60714ed8bb6f60f522ce1a1a169886d0a15f0d0e371b
 EBUILD acme-1.18.0-r1.ebuild 1123 BLAKE2B 37c29dec8eb47e63cc708fd431af8689155798c9a4fe2c07dd2de26980adf8335d523f1a5e06a17c707561571ac6b0b7ba97a477419b1f974c8881fd03b99ca4 SHA512 964a1b0e24ad95302f47a09d1c1f1560d5551547c36f3bd2eaaab6c03a320444ef296f4141017420a61d9d36378490a149a3c325e43e471796a960c913650a5d
-EBUILD acme-1.19.0.ebuild 1132 BLAKE2B c040463a55642cb2f08cd57c8dd7f8b2d338a785522b3aefb6f71f234d0800442c367ed545bb40b12eb82f0f43e8e26ba366d00f6e3bef8887e902b442cc8570 SHA512 3e75f147716119305b12826babb4431c467fd0bc285627e98ab3aa71008b7d70436cd6ca1cb595b5a8c743a07bea6d064024eba2ad0458486c94f8d2b18b0429
-EBUILD acme-9999.ebuild 1132 BLAKE2B c040463a55642cb2f08cd57c8dd7f8b2d338a785522b3aefb6f71f234d0800442c367ed545bb40b12eb82f0f43e8e26ba366d00f6e3bef8887e902b442cc8570 SHA512 3e75f147716119305b12826babb4431c467fd0bc285627e98ab3aa71008b7d70436cd6ca1cb595b5a8c743a07bea6d064024eba2ad0458486c94f8d2b18b0429
+EBUILD acme-1.19.0.ebuild 1130 BLAKE2B 2e8ae9c68f9af1eccbd9d16c7455f5c5d2f04b8501af4473bdff7318a688f7a61c16e2986323d2ece36a7dd63524526518fb9d4e115a4da1dddb17ce3201b62a SHA512 1b6934821006bc1608a47272d1beb4c8ab064cfdb2e5e9fc535a2544ab0a75df7b765c2e4bdb7349a899db41088e67909dac08226052b3a6e0da07557e760034
+EBUILD acme-1.20.0.ebuild 1132 BLAKE2B f8e07ded95e3da1a98b0e6ffc21c8bae395ad405e06fa455e57aeb76375c03a6f031951fc6a68c31eaf69073c6447c3b71009f388f78e361f2f62c3dfccd0d60 SHA512 1fd8de93d8b937a55600a92597a18c271cfc7cb407084ae88315616929c2e793ac0ccf6a219d0433270c0a68b8f8e2ae5996423c17403bf1dfdb7f19a40b31f0
+EBUILD acme-9999.ebuild 1132 BLAKE2B f8e07ded95e3da1a98b0e6ffc21c8bae395ad405e06fa455e57aeb76375c03a6f031951fc6a68c31eaf69073c6447c3b71009f388f78e361f2f62c3dfccd0d60 SHA512 1fd8de93d8b937a55600a92597a18c271cfc7cb407084ae88315616929c2e793ac0ccf6a219d0433270c0a68b8f8e2ae5996423c17403bf1dfdb7f19a40b31f0
 MISC metadata.xml 401 BLAKE2B 30a2ac1f03749a8e3bb98723c57f47ab6bcf7bfa58c2b6e21c309fae279feca0d3612df6c2a1dafaf27b4f0781c583a140322feac1a1cf2c13e50861cad129ea SHA512 d8e725b71ca81ce4ca6565ed58271b283c25394448f0f48f726f232122577c33d5b2d726e117419b2fae99f9dae29a8080bb9564eccbca13368c83988cf3da01
diff --git a/app-crypt/acme/acme-1.19.0.ebuild b/app-crypt/acme/acme-1.19.0.ebuild
index c3e47e636d10..433e9adde4d9 100644
--- a/app-crypt/acme/acme-1.19.0.ebuild
+++ b/app-crypt/acme/acme-1.19.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.20.0.ebuild b/app-crypt/acme/acme-1.20.0.ebuild
new file mode 100644
index 000000000000..0893747ea29d
--- /dev/null
+++ b/app-crypt/acme/acme-1.20.0.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+DISTUTILS_USE_SETUPTOOLS=rdepend
+
+inherit distutils-r1
+
+if [[ ${PV} == 9999* ]]; then
+	EGIT_REPO_URI="https://github.com/certbot/certbot.git"
+	inherit git-r3
+	S=${WORKDIR}/${P}/${PN}
+else
+	SRC_URI="https://github.com/certbot/certbot/archive/v${PV}.tar.gz -> certbot-${PV}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+	S=${WORKDIR}/certbot-${PV}/acme
+fi
+
+DESCRIPTION="An implementation of the ACME protocol"
+HOMEPAGE="https://github.com/certbot/certbot https://letsencrypt.org/"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+
+RDEPEND="
+	dev-python/chardet[${PYTHON_USEDEP}]
+	>=dev-python/cryptography-2.1.4[${PYTHON_USEDEP}]
+	>=dev-python/josepy-1.9.0[${PYTHON_USEDEP}]
+	>=dev-python/pyopenssl-17.3.0[${PYTHON_USEDEP}]
+	dev-python/pyrfc3339[${PYTHON_USEDEP}]
+	dev-python/pytz[${PYTHON_USEDEP}]
+	>=dev-python/requests-2.14.2[${PYTHON_USEDEP}]
+	>=dev-python/requests-toolbelt-0.3.0[${PYTHON_USEDEP}]
+"
+
+distutils_enable_sphinx docs dev-python/sphinx_rtd_theme
+distutils_enable_tests pytest
diff --git a/app-crypt/acme/acme-9999.ebuild b/app-crypt/acme/acme-9999.ebuild
index c3e47e636d10..0893747ea29d 100644
--- a/app-crypt/acme/acme-9999.ebuild
+++ b/app-crypt/acme/acme-9999.ebuild
@@ -27,7 +27,7 @@ SLOT="0"
 RDEPEND="
 	dev-python/chardet[${PYTHON_USEDEP}]
 	>=dev-python/cryptography-2.1.4[${PYTHON_USEDEP}]
-	>=dev-python/josepy-1.1.0[${PYTHON_USEDEP}]
+	>=dev-python/josepy-1.9.0[${PYTHON_USEDEP}]
 	>=dev-python/pyopenssl-17.3.0[${PYTHON_USEDEP}]
 	dev-python/pyrfc3339[${PYTHON_USEDEP}]
 	dev-python/pytz[${PYTHON_USEDEP}]
diff --git a/app-crypt/ccid/Manifest b/app-crypt/ccid/Manifest
index 616609dc2efe..0d78e6828785 100644
--- a/app-crypt/ccid/Manifest
+++ b/app-crypt/ccid/Manifest
@@ -1,8 +1,6 @@
 AUX 92_pcscd_ccid-2.rules 2275 BLAKE2B a72b8d2bb8cf56f621a0762dac95500f93afa224228f403395c9590758c8fa986b3e8d0d1b12353ec7fed5a40f6af900fcd57eaaa7b339018fe42c2b509c0c5d SHA512 f327eee35ca6009069389f935ca89feea4e693e8f0c73f8f218d2639faee4ce35df85832a71e3fe98ce24aae31861aa8bd290833e59ada75c1e1a2df9ff0a477
-DIST ccid-1.4.33.tar.bz2 659673 BLAKE2B f8dd37ed4fd2bd15e6313417dc01feecd0303502d24eeae101ad13233510b5e26b08439c4de453abc734695618faa1c8031e545d045527aa841ab9056a3d729e SHA512 ccfcecbaca4c8f1ee4a4925bd313ced6d6f15ad422cbcc387627aef203a9ae0ff7775c4a2c5d25978ab33ebfd93c34de50e1f783df787b77ea7c774a45ed126b
-DIST ccid-1.4.34.tar.bz2 667477 BLAKE2B 81f8f97fdb4526fa2f0bfe0890cc447c87671989159022a51fa15ed6e85760f7fc3a9b3f673e2cbf72373a9fc67df5304c0a93a945b97f5ad483de213f5b1a45 SHA512 8a71c100e2f0adfd6de89a86dab6690629b10c91d1fddc0a810df2ebeaea978eaaa7c6a21fa964b5cd1ea277b0efe75a2885b490f9bd9ac4776b8ff1848e4122
 DIST ccid-1.4.35.tar.bz2 676789 BLAKE2B d1123c024a798a22906a5c2c2e35f5485b8d2252ddec28571af835bbf169bc5abeb26fea871ef70d67270cc1eb52f992c56f0abb74f6deed555f15e39dbf4756 SHA512 da990b5537ec35baa1b36b9c4be7f1bdccfc149cfa4ce024ddf59504f2a2044273057c1454f227fdad8f6b04fceaf48b88e70d4d0a5475384749b367529deaeb
-EBUILD ccid-1.4.33.ebuild 1540 BLAKE2B 1070f46a0e0c96ec75f364196668d7da00e0987ad41b5c60fe202539141e77a196dbb29f0de19fc4f441931932d30964840adfd84a599bc7d07baf3481be5ad8 SHA512 066b3204120871b14df9770e0c8822d1620a00ba0e3d97474ba8e7e20131f2592cab98b0b78baee9f71cab7ba02250544291c4f61d036cf1a02ca043a98e3048
-EBUILD ccid-1.4.34.ebuild 1545 BLAKE2B 836348f61b179ac74d2531f71099c6116376f46626eb1b91e41b13803a36cc2639cf284f32fe7cfbafa723fbc21c13a9d440f5e3b37fadff45e06765fe467b69 SHA512 3edb62c28a55cc39f32e4da90088d34bb1e8e33112c6fa53e6610eaf093926e681170ba7adac9d0e637ffe8cd09853ac1093001b0709dd365ebcc51e88b60e76
-EBUILD ccid-1.4.35.ebuild 1552 BLAKE2B 35bd8d03921378293fafa523e7e2f1ef04657be1df3db2422f4cf699516eba8cb17b72a8ae117e5197b7b8c94c2769b7cd26e17e3c356aa25e2a8dd2d2e2d9e8 SHA512 81c6a26157a5284b7ac94d723238b2651fcb26d22e62830b465a8f2389e3cb510b6c72f07f8dc34005f8e9fe9e1a8ba21241abaeade6858117deb70b1f1a251b
+DIST ccid-1.4.36.tar.bz2 677047 BLAKE2B b3d48f1c51b64d260b7055251fb04aeea4a22cc5d4f024bb972a9a9874b1bdf4b75b9daf8cd7c9f26000b04e7d4c1779e20a26d4927aa1e403cd274f548b71b5 SHA512 e9ca3f5364c6cec988edad325c1ef1b35886e3ecb15d6e1409c989b9f669fbda3f0688e246e3976b58eacc0ed035cde36e65675abf12562e81c3630d4ce67773
+EBUILD ccid-1.4.35.ebuild 1547 BLAKE2B f9c400087032250e51f1103a4ea19491fbc68b47f4a02ff9474a7182b7dcc7405f4e128d9f02663685e4e33bb565354e2550f27ad86a253181c2c63e31cc50ee SHA512 267e3b6d789a33ebc01d0586524c423cbf03434ff34040d39c1039be235f982546b39acad51b38d4deb779786a542d5c5f843f3464abe8d3d30712d156a35197
+EBUILD ccid-1.4.36.ebuild 1552 BLAKE2B e595eaa1744b6e57b543507a29af3529c42a21899b82e4bcc36d26fc0b6ef04fa51c8a1f5af9cd93494cf8bca133714e0e513bf5832a01f20340831ab533205d SHA512 d02bf4e6d95eaf7d07eac814dc3c6bae87a6bc4d6e3ca394ce6d51d3e3c1ae2a01e73307347fcc78783b8de2d118407cadc1a840428d3ab4f50b3a835f4c5b7f
 MISC metadata.xml 490 BLAKE2B 4a9aeacde8629b331bfef0fd1f73b4709d182f90a53e43325a26191b7e1523ded2ddc001117b93fb24ce90014f16c927c591fbf720d3ba4210661f56ca4bf130 SHA512 f10c0f7a189353eb3160ad777412c9cfd49ba287a5923cffde6d112cde6a6f8f67268d590f611870ff55a61971df7426a7d4b761a404269228fe3ef785ddaf51
diff --git a/app-crypt/ccid/ccid-1.4.34.ebuild b/app-crypt/ccid/ccid-1.4.34.ebuild
deleted file mode 100644
index 54ad487a2623..000000000000
--- a/app-crypt/ccid/ccid-1.4.34.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit toolchain-funcs udev
-
-DESCRIPTION="CCID free software driver"
-HOMEPAGE="https://ccid.apdu.fr https://github.com/LudovicRousseau/CCID"
-SRC_URI="https://ccid.apdu.fr/files/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="twinserial kobil-midentity +usb"
-
-RDEPEND=">=sys-apps/pcsc-lite-1.8.3
-	usb? ( virtual/libusb:1 )"
-DEPEND="${RDEPEND}"
-BDEPEND="kernel_linux? ( virtual/pkgconfig )"
-
-DOCS=( README.md AUTHORS )
-
-src_configure() {
-	econf \
-		LEX=: \
-		$(use_enable twinserial) \
-		$(use_enable usb libusb)
-}
-
-src_compile() {
-	default
-	use kobil-midentity && emake -C contrib/Kobil_mIDentity_switch
-}
-
-src_install() {
-	default
-
-	if use kobil-midentity; then
-		dosbin contrib/Kobil_mIDentity_switch/Kobil_mIDentity_switch
-		doman contrib/Kobil_mIDentity_switch/Kobil_mIDentity_switch.8
-	fi
-
-	if use kernel_linux; then
-		# note: for eudev support, rules probably will always need to be
-		# installed to /usr
-
-		# ccid >=1.4.11 version changed the rules drastically in a minor
-		# release to no longer use the pcscd group. Using the old ones in
-		# the mean time.
-		udev_newrules "${FILESDIR}"/92_pcscd_ccid-2.rules 92-pcsc-ccid.rules
-
-		# disable Kobil_mIDentity_switch udev rule with USE=-kobil-midentity
-		if ! use kobil-midentity; then
-			sed \
-				-e '/Kobil_mIDentity_switch/s/^/#/' \
-				-i "${D}/$(get_udevdir)"/rules.d/92-pcsc-ccid.rules || die
-		fi
-
-	fi
-}
diff --git a/app-crypt/ccid/ccid-1.4.35.ebuild b/app-crypt/ccid/ccid-1.4.35.ebuild
index 13e71fba1d71..680c83b8ed8a 100644
--- a/app-crypt/ccid/ccid-1.4.35.ebuild
+++ b/app-crypt/ccid/ccid-1.4.35.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://ccid.apdu.fr/files/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ppc ppc64 ~riscv ~sparc x86"
 IUSE="twinserial kobil-midentity +usb"
 
 RDEPEND=">=sys-apps/pcsc-lite-1.8.3
diff --git a/app-crypt/ccid/ccid-1.4.33.ebuild b/app-crypt/ccid/ccid-1.4.36.ebuild
index 746a54f09fad..fb17ec0a07ed 100644
--- a/app-crypt/ccid/ccid-1.4.33.ebuild
+++ b/app-crypt/ccid/ccid-1.4.36.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 inherit toolchain-funcs udev
 
@@ -11,7 +11,7 @@ SRC_URI="https://ccid.apdu.fr/files/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ppc ppc64 ~sparc x86"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
 IUSE="twinserial kobil-midentity +usb"
 
 RDEPEND=">=sys-apps/pcsc-lite-1.8.3
diff --git a/app-crypt/certbot-apache/Manifest b/app-crypt/certbot-apache/Manifest
index 50cb37a084c0..d29cd1e59d9c 100644
--- a/app-crypt/certbot-apache/Manifest
+++ b/app-crypt/certbot-apache/Manifest
@@ -1,6 +1,8 @@
 DIST certbot-1.18.0.tar.gz 1332615 BLAKE2B eb086710b943893025d6e1091470ca02de074232372f4c9fa21fa83a347fe54df988b9553c8cf6afd6e166b8c464d595171984c984008a872e16c0179bb774b2 SHA512 94b16ba0586e0f5d3036280c68f9976c25889ca48fbbe7aded41f0d9feba2300a3f0ff8fe321b39d8642bcdd874c7332cf2acb3187b5869fe415831f58a75a7b
 DIST certbot-1.19.0.tar.gz 1338653 BLAKE2B b6ed909da2aed9853cf3dc6b936c513f33a127548ee30ac45a32a682141c5e4e79401ea328b7caf4e28d1d85aa2a9831e93deaa26c93216708a33be465dc8387 SHA512 2c1beb8c06299b9003fafd970cd3e977db85c4e84f1bf710166b7a99035b5c43a2a222d8d51513ac595255dd8eda02a1fb834c01ce68921927715c880052536e
+DIST certbot-1.20.0.tar.gz 1339066 BLAKE2B 01278a53ea7166037c039d270ddd11a10c0570a9f038571dc6791e51f214fbff1589371b40c0dc73cbc18ed2005cfc231452bd00b039841a09ddb3c65d4ab122 SHA512 d35b2574811ac896ad119355be3a901438400e81a67388bd93290c4e7e9f6fa60dad99b51bc9bac7a7ac60714ed8bb6f60f522ce1a1a169886d0a15f0d0e371b
 EBUILD certbot-apache-1.18.0.ebuild 945 BLAKE2B 5ec08b80fcce13df8f20cc1d2710abac4a8ed4e0847682b287c374921d2b7d301b75f34bce9090057548f5b1630f605a62fc3ffcfee3f13dff3f860350e04728 SHA512 8af41c92c60da9608015574316a2b776a8893b97e731d0bd779b200a2051708d3e6b2b98a0f140ed1c725bf697d56001cf608d51b68916c6e5fe6f19c40fb09d
-EBUILD certbot-apache-1.19.0.ebuild 947 BLAKE2B 5da53f56cef939f37cefd63251b522b54c18e30db386a229413bcc3a02605984194d1ea4c5647fa895a9502d254fcb9b73f5575fb7096f31df51f1e0b17659a5 SHA512 79358b1fe949ee2302a2db4c72b55bce960b0ba9aafff3cc50ee86e886c80a1337f086166646cb7f9e1baa8ead34dd43188feb53516321acd297e55a7475535b
+EBUILD certbot-apache-1.19.0.ebuild 945 BLAKE2B 5ec08b80fcce13df8f20cc1d2710abac4a8ed4e0847682b287c374921d2b7d301b75f34bce9090057548f5b1630f605a62fc3ffcfee3f13dff3f860350e04728 SHA512 8af41c92c60da9608015574316a2b776a8893b97e731d0bd779b200a2051708d3e6b2b98a0f140ed1c725bf697d56001cf608d51b68916c6e5fe6f19c40fb09d
+EBUILD certbot-apache-1.20.0.ebuild 947 BLAKE2B 5da53f56cef939f37cefd63251b522b54c18e30db386a229413bcc3a02605984194d1ea4c5647fa895a9502d254fcb9b73f5575fb7096f31df51f1e0b17659a5 SHA512 79358b1fe949ee2302a2db4c72b55bce960b0ba9aafff3cc50ee86e886c80a1337f086166646cb7f9e1baa8ead34dd43188feb53516321acd297e55a7475535b
 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.19.0.ebuild b/app-crypt/certbot-apache/certbot-apache-1.19.0.ebuild
index b46b10fa3536..4ced4681cfbc 100644
--- a/app-crypt/certbot-apache/certbot-apache-1.19.0.ebuild
+++ b/app-crypt/certbot-apache/certbot-apache-1.19.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.20.0.ebuild b/app-crypt/certbot-apache/certbot-apache-1.20.0.ebuild
new file mode 100644
index 000000000000..b46b10fa3536
--- /dev/null
+++ b/app-crypt/certbot-apache/certbot-apache-1.20.0.ebuild
@@ -0,0 +1,33 @@
+# 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=rdepend
+
+if [[ ${PV} == 9999* ]]; then
+	EGIT_REPO_URI="https://github.com/certbot/certbot.git"
+	inherit git-r3
+	S=${WORKDIR}/${P}/${PN}
+else
+	SRC_URI="https://github.com/${PN%-apache}/${PN%-apache}/archive/v${PV}.tar.gz -> ${PN%-apache}-${PV}.tar.gz"
+	KEYWORDS="~amd64 ~arm64 ~x86"
+	S=${WORKDIR}/${PN%-apache}-${PV}/${PN}
+fi
+
+inherit distutils-r1
+
+DESCRIPTION="Apache plugin for certbot (Let's Encrypt Client)"
+HOMEPAGE="https://github.com/certbot/certbot https://letsencrypt.org/"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+
+RDEPEND=">=app-crypt/acme-${PV}[${PYTHON_USEDEP}]
+	>=app-crypt/certbot-${PV}[${PYTHON_USEDEP}]
+	dev-python/python-augeas[${PYTHON_USEDEP}]
+	dev-python/zope-component[${PYTHON_USEDEP}]
+	dev-python/zope-interface[${PYTHON_USEDEP}]"
+
+distutils_enable_tests pytest
diff --git a/app-crypt/certbot-nginx/Manifest b/app-crypt/certbot-nginx/Manifest
index 8e9d164edf38..7938eb9285db 100644
--- a/app-crypt/certbot-nginx/Manifest
+++ b/app-crypt/certbot-nginx/Manifest
@@ -1,6 +1,8 @@
 DIST certbot-1.18.0.tar.gz 1332615 BLAKE2B eb086710b943893025d6e1091470ca02de074232372f4c9fa21fa83a347fe54df988b9553c8cf6afd6e166b8c464d595171984c984008a872e16c0179bb774b2 SHA512 94b16ba0586e0f5d3036280c68f9976c25889ca48fbbe7aded41f0d9feba2300a3f0ff8fe321b39d8642bcdd874c7332cf2acb3187b5869fe415831f58a75a7b
 DIST certbot-1.19.0.tar.gz 1338653 BLAKE2B b6ed909da2aed9853cf3dc6b936c513f33a127548ee30ac45a32a682141c5e4e79401ea328b7caf4e28d1d85aa2a9831e93deaa26c93216708a33be465dc8387 SHA512 2c1beb8c06299b9003fafd970cd3e977db85c4e84f1bf710166b7a99035b5c43a2a222d8d51513ac595255dd8eda02a1fb834c01ce68921927715c880052536e
+DIST certbot-1.20.0.tar.gz 1339066 BLAKE2B 01278a53ea7166037c039d270ddd11a10c0570a9f038571dc6791e51f214fbff1589371b40c0dc73cbc18ed2005cfc231452bd00b039841a09ddb3c65d4ab122 SHA512 d35b2574811ac896ad119355be3a901438400e81a67388bd93290c4e7e9f6fa60dad99b51bc9bac7a7ac60714ed8bb6f60f522ce1a1a169886d0a15f0d0e371b
 EBUILD certbot-nginx-1.18.0.ebuild 962 BLAKE2B d395edd7714ead5647918d5e413b61e4c9a4a9fa363504c204250b511e92d35ac032816892f97322ac1c1f99b9c446c2b5abccb9d341193a0e6bacea84d887ed SHA512 cfc5b873c74156fe3d8843a6dcbd3084af86778b4d66c26bae0d1ba6f5c22ca147b79098cc4ffb40986bc6f38cca0475682b15669940c88f01be8f535a26d8dc
-EBUILD certbot-nginx-1.19.0.ebuild 964 BLAKE2B 7c84e63e0f822a1c3f6db07b53f7f7c00a66e2d0f37d5cd2eaf3042710c3184074709a24d7fbf0af88a5802957212304c4dce35bf4466b7a6959a20c4ef6e89f SHA512 a4606d2e422a002e04b15c22d7d111b04e12e6ebdcc17afbc24322d6786e82a9a999370c68e26f50a0dba1056e5f9e61f84f3c03a524cd1e55f35c0d2e43375a
+EBUILD certbot-nginx-1.19.0.ebuild 962 BLAKE2B d395edd7714ead5647918d5e413b61e4c9a4a9fa363504c204250b511e92d35ac032816892f97322ac1c1f99b9c446c2b5abccb9d341193a0e6bacea84d887ed SHA512 cfc5b873c74156fe3d8843a6dcbd3084af86778b4d66c26bae0d1ba6f5c22ca147b79098cc4ffb40986bc6f38cca0475682b15669940c88f01be8f535a26d8dc
+EBUILD certbot-nginx-1.20.0.ebuild 964 BLAKE2B 7c84e63e0f822a1c3f6db07b53f7f7c00a66e2d0f37d5cd2eaf3042710c3184074709a24d7fbf0af88a5802957212304c4dce35bf4466b7a6959a20c4ef6e89f SHA512 a4606d2e422a002e04b15c22d7d111b04e12e6ebdcc17afbc24322d6786e82a9a999370c68e26f50a0dba1056e5f9e61f84f3c03a524cd1e55f35c0d2e43375a
 EBUILD certbot-nginx-9999.ebuild 964 BLAKE2B 7c84e63e0f822a1c3f6db07b53f7f7c00a66e2d0f37d5cd2eaf3042710c3184074709a24d7fbf0af88a5802957212304c4dce35bf4466b7a6959a20c4ef6e89f SHA512 a4606d2e422a002e04b15c22d7d111b04e12e6ebdcc17afbc24322d6786e82a9a999370c68e26f50a0dba1056e5f9e61f84f3c03a524cd1e55f35c0d2e43375a
 MISC metadata.xml 335 BLAKE2B 048854ec6bc919f9bf9b0bc74e7c291841cbfea0e571f43437937c5dd78cc65f9df53463adcf313441e01323491709b462bd9bc364876eb1508a83b3426b6b78 SHA512 25ac45574a568e362c419dfbeade4a977afa2885e7b32fb4c3d4c765450b09aa98cf419df1a39ab194518ad6f2b582e162d4dd4eec14f278635d63bf66352523
diff --git a/app-crypt/certbot-nginx/certbot-nginx-1.19.0.ebuild b/app-crypt/certbot-nginx/certbot-nginx-1.19.0.ebuild
index 45a8976cfe34..f916e2e4708c 100644
--- a/app-crypt/certbot-nginx/certbot-nginx-1.19.0.ebuild
+++ b/app-crypt/certbot-nginx/certbot-nginx-1.19.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.20.0.ebuild b/app-crypt/certbot-nginx/certbot-nginx-1.20.0.ebuild
new file mode 100644
index 000000000000..45a8976cfe34
--- /dev/null
+++ b/app-crypt/certbot-nginx/certbot-nginx-1.20.0.ebuild
@@ -0,0 +1,35 @@
+# 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=rdepend
+
+if [[ ${PV} == 9999* ]]; then
+	EGIT_REPO_URI="https://github.com/certbot/certbot.git"
+	inherit git-r3
+	S=${WORKDIR}/${P}/${PN}
+else
+	SRC_URI="https://github.com/${PN%-nginx}/${PN%-nginx}/archive/v${PV}.tar.gz -> ${PN%-nginx}-${PV}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+	S=${WORKDIR}/${PN%-nginx}-${PV}/${PN}
+fi
+
+inherit distutils-r1
+
+DESCRIPTION="Nginx plugin for certbot (Let's Encrypt Client)"
+HOMEPAGE="https://github.com/certbot/certbot https://letsencrypt.org/"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	>=app-crypt/acme-${PV}[${PYTHON_USEDEP}]
+	>=app-crypt/certbot-${PV}[${PYTHON_USEDEP}]
+	>=dev-python/pyopenssl-17.3.0[${PYTHON_USEDEP}]
+	>=dev-python/pyparsing-2.2.0[${PYTHON_USEDEP}]
+	dev-python/zope-interface[${PYTHON_USEDEP}]"
+
+distutils_enable_tests pytest
diff --git a/app-crypt/certbot/Manifest b/app-crypt/certbot/Manifest
index ce9a13876033..27cf80eaa64d 100644
--- a/app-crypt/certbot/Manifest
+++ b/app-crypt/certbot/Manifest
@@ -1,6 +1,8 @@
 DIST certbot-1.18.0.tar.gz 1332615 BLAKE2B eb086710b943893025d6e1091470ca02de074232372f4c9fa21fa83a347fe54df988b9553c8cf6afd6e166b8c464d595171984c984008a872e16c0179bb774b2 SHA512 94b16ba0586e0f5d3036280c68f9976c25889ca48fbbe7aded41f0d9feba2300a3f0ff8fe321b39d8642bcdd874c7332cf2acb3187b5869fe415831f58a75a7b
 DIST certbot-1.19.0.tar.gz 1338653 BLAKE2B b6ed909da2aed9853cf3dc6b936c513f33a127548ee30ac45a32a682141c5e4e79401ea328b7caf4e28d1d85aa2a9831e93deaa26c93216708a33be465dc8387 SHA512 2c1beb8c06299b9003fafd970cd3e977db85c4e84f1bf710166b7a99035b5c43a2a222d8d51513ac595255dd8eda02a1fb834c01ce68921927715c880052536e
+DIST certbot-1.20.0.tar.gz 1339066 BLAKE2B 01278a53ea7166037c039d270ddd11a10c0570a9f038571dc6791e51f214fbff1589371b40c0dc73cbc18ed2005cfc231452bd00b039841a09ddb3c65d4ab122 SHA512 d35b2574811ac896ad119355be3a901438400e81a67388bd93290c4e7e9f6fa60dad99b51bc9bac7a7ac60714ed8bb6f60f522ce1a1a169886d0a15f0d0e371b
 EBUILD certbot-1.18.0.ebuild 1180 BLAKE2B 55c9e5b606cd2d9e569483cc6d5e9ed558654685c30186dff79b38c0de8f449d16cf8b50151b0edee8343a8840e390019b75523be78f5db085914bc22bab57b4 SHA512 8299e5833351978765b9fc49dfb9f0434882a14d82ece0b21104ecdcd5d2e501d9c2407d0792ed1a9a3e26b56da0488c6d28603f9d85616296c50e0105b0d2e6
-EBUILD certbot-1.19.0.ebuild 1189 BLAKE2B 2bf07d3f5ce29a1d6fa94feac130e9b6826a5168762919953ff7496158103289a75f271c104774c6c9927750bcf126d40c3def6ade3bf15b108d4615b8e38e44 SHA512 2c6b143f928639c81cbd3d3d1b260a9231f75755ad10b470cd7e28b0f982094026f31ad75402f7e3aa20891448233751fb97b3185f79707d96f582c1b93d52ac
-EBUILD certbot-9999.ebuild 1189 BLAKE2B 2bf07d3f5ce29a1d6fa94feac130e9b6826a5168762919953ff7496158103289a75f271c104774c6c9927750bcf126d40c3def6ade3bf15b108d4615b8e38e44 SHA512 2c6b143f928639c81cbd3d3d1b260a9231f75755ad10b470cd7e28b0f982094026f31ad75402f7e3aa20891448233751fb97b3185f79707d96f582c1b93d52ac
+EBUILD certbot-1.19.0.ebuild 1187 BLAKE2B 94b32edb5153d49fd642b4f2eef6d14ff8691fd48586ccdb441ba51c5bc26b635281a0690850f1f98a93702021d129c0bceb144dc724622a641a7d9390537559 SHA512 5338016400e8103c6296efeba175452bbdfc962db04fec75a1dc8217fc20a1d727005e3d639eac127c1e32db146ac0e36aceb045f9b76cb2ab95618597da0400
+EBUILD certbot-1.20.0.ebuild 1189 BLAKE2B 361260e42aa3fd2f5ded08115be7a560baddc87b244c5149318bb7d86be6b1221a842d20a6b5e8ace174575d8ed2a9a8ac360fbc01756625d428bf13c314f64b SHA512 b9a40cca88a725402f3fb982868d885165d9136333ee80a04567376e21ee84ba50356b9b394c139332bafed2b3ac7d76b1fb6f5bf5ff7de6cf22feec7fa713ed
+EBUILD certbot-9999.ebuild 1189 BLAKE2B 361260e42aa3fd2f5ded08115be7a560baddc87b244c5149318bb7d86be6b1221a842d20a6b5e8ace174575d8ed2a9a8ac360fbc01756625d428bf13c314f64b SHA512 b9a40cca88a725402f3fb982868d885165d9136333ee80a04567376e21ee84ba50356b9b394c139332bafed2b3ac7d76b1fb6f5bf5ff7de6cf22feec7fa713ed
 MISC metadata.xml 359 BLAKE2B 7f8ac46ecea304579baca80978cc35905720d1950caa183b5b5b297afab8bf6ea328324bacc438e9ecd91176230e42e55deda1c15e1ba73c63b2021ac2842c0f SHA512 a50b1db5a30eac290ac6645fcb30b0d5c4d8e51d83cff284e76358ee4fe7cef9366e40b06f532ba64a2131672972ea10b73541a9bd42cc323c17f6d26f6b0197
diff --git a/app-crypt/certbot/certbot-1.19.0.ebuild b/app-crypt/certbot/certbot-1.19.0.ebuild
index 4c776f1113cc..d84a4206f10c 100644
--- a/app-crypt/certbot/certbot-1.19.0.ebuild
+++ b/app-crypt/certbot/certbot-1.19.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.20.0.ebuild b/app-crypt/certbot/certbot-1.20.0.ebuild
new file mode 100644
index 000000000000..18900751b704
--- /dev/null
+++ b/app-crypt/certbot/certbot-1.20.0.ebuild
@@ -0,0 +1,39 @@
+# 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=rdepend
+
+if [[ ${PV} == 9999* ]]; then
+	EGIT_REPO_URI="https://github.com/certbot/certbot.git"
+	inherit git-r3
+else
+	SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+fi
+S=${WORKDIR}/${P}/${PN}
+
+inherit distutils-r1
+
+DESCRIPTION="Let's encrypt client to automate deployment of X.509 certificates"
+HOMEPAGE="https://github.com/certbot/certbot https://letsencrypt.org/"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+
+RDEPEND="
+	>=app-crypt/acme-${PV}[${PYTHON_USEDEP}]
+	>=dev-python/configargparse-0.9.3[${PYTHON_USEDEP}]
+	>=dev-python/configobj-5.0.6[${PYTHON_USEDEP}]
+	>=dev-python/cryptography-2.8[${PYTHON_USEDEP}]
+	>=dev-python/distro-1.0.1[${PYTHON_USEDEP}]
+	>=dev-python/josepy-1.9.0[${PYTHON_USEDEP}]
+	>=dev-python/parsedatetime-2.4[${PYTHON_USEDEP}]
+	dev-python/pyrfc3339[${PYTHON_USEDEP}]
+	dev-python/pytz[${PYTHON_USEDEP}]
+	dev-python/zope-component[${PYTHON_USEDEP}]
+	dev-python/zope-interface[${PYTHON_USEDEP}]"
+
+distutils_enable_tests pytest
diff --git a/app-crypt/certbot/certbot-9999.ebuild b/app-crypt/certbot/certbot-9999.ebuild
index 4c776f1113cc..18900751b704 100644
--- a/app-crypt/certbot/certbot-9999.ebuild
+++ b/app-crypt/certbot/certbot-9999.ebuild
@@ -29,7 +29,7 @@ RDEPEND="
 	>=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/josepy-1.9.0[${PYTHON_USEDEP}]
 	>=dev-python/parsedatetime-2.4[${PYTHON_USEDEP}]
 	dev-python/pyrfc3339[${PYTHON_USEDEP}]
 	dev-python/pytz[${PYTHON_USEDEP}]
diff --git a/app-crypt/gnupg/Manifest b/app-crypt/gnupg/Manifest
index 0f6951619d5f..8254bc7af91a 100644
--- a/app-crypt/gnupg/Manifest
+++ b/app-crypt/gnupg/Manifest
@@ -5,9 +5,11 @@ DIST gnupg-2.2.29.tar.bz2 7215986 BLAKE2B 04b777730b8fcbe8d93dfc8985aadd6bc7385a
 DIST gnupg-2.2.31.tar.bz2 7212188 BLAKE2B 57a2b6c6ea491137a708e18a0119502621b7bdf0591818d19beb8b08a521a7dbf60472243e1723f53acbfb9a5de612b8e5040c45dc847bdda26012244edb11be SHA512 2f6fa200e08d6b8993b482e5825bea6083afc8686c4e1ae80386b36ae49e1c2d73066c508edaa359a7794cb26ba7a00f81555a906fa422d1117e41415cfa2fea
 DIST gnupg-2.2.32.tar.bz2 7212625 BLAKE2B 8e1feba83a0d8fa1c154c814e26b41aa252cef4af53937e4e8954860249c180c1d6910356b0c46dfefde094846b02bd5375f17c8b6fdcc9138281d0daa292d42 SHA512 76b75d3688561ce65a8014812656aa87c9722c898d7e186fdb1331dee6af32f886a6b0a4806975c348a22ad6dda60f956ece56076d00153b9706aad4c934c6a1
 DIST gnupg-2.3.2.tar.bz2 7589445 BLAKE2B f7e35ed553ea89cdb073abb1432f67fa00bb625f6e686e534f96bca11d88f09ea272b3cb0d6706e4bce2c023f8c5b8d628742aa2f60752a2e605132cd32f62ed SHA512 2747cbe38546f500d165f024ebb2dc5be70fa68d20702af3f61e97db685eba94caf65307293137c76ea6cfcc189ed24aaee025c80cd33f26609e5fe512bdda73
+DIST gnupg-2.3.3.tar.bz2 7590874 BLAKE2B a80a84b4f6691815550de6125f4f24aa9c901b8ca8eeb6bc91c90ccd3d285a5ddb15688c7ab870aa6a6c418eb98b969e7b958120c3976b5aaea55188f39b67b0 SHA512 12d500e6b45910d5f7bfd4916bcee37ac988a58a35563fcf425a65b88c0cf92c2af2e94d3e31e9e5e19094c8beb5ec3779cf90bfe43d1555c4196f69eee2f102
 EBUILD gnupg-2.2.27.ebuild 5168 BLAKE2B cc9ad82a855cb56a630aa043537fe44fadbfece92cc09205996ba4cc3f3ca000534f7b11c29da543ec923b118d24bc23b490ce6ea29b09a799d17b36e387f855 SHA512 3f1377ad593d19580e953ef426dd23f23ae2fab65d8e6bcfee58c09605086fc0a2f2d2432b5d33ed70685ebb87561801a6b3dbf781d585aa59b6e8c9fc0dd81e
 EBUILD gnupg-2.2.29.ebuild 4709 BLAKE2B 709b2d1da7770181ce1c108c5f5afb668f46f3ac1673032c94eb41f24af6e78ab260180fad116aafd944336326d45d84388b48159518b776d3425cf40e07c605 SHA512 5617ad34369e42e934cb4704ce2c1191edb38eea902f2cdbe2494a27da86dbe92365c2dd836e24bae9aad2fb7d262df029a8fd5d1a5c0ab716f6d9918e8b04cc
 EBUILD gnupg-2.2.31.ebuild 4717 BLAKE2B cd39c581bf930c519e4f38fc0741d7c157ee44ebe6599253931e9a90f493cf28e06fac31a025a08b5958be04a0a92fa87bbc481153d746d4b8a194eb51d9377c SHA512 e3fe9d932a558b2e646b13fc98b429a6162d18f853481fe88218bde6b756a16eb8e24038860a2b8dd8922bb689e1c7b9df4855476315fd6fdf2249a169364a59
-EBUILD gnupg-2.2.32.ebuild 4712 BLAKE2B bb2e2463fb79fc39f06ff8c085caa4b80b2c70afecb24a446c78770732f7162daee4acdb57a8a45c94562b3225cd6d4a738dbc3754704e0e0c0fe3cb78e8371b SHA512 98d4559a461e4ccd9e52ce1bb847af09621407739b9e9e61cfbd8b78e59970426bfb97f2b224a09ff1cb992422a739daffca77a0eec6c2bdae9982cabbd4d3fd
+EBUILD gnupg-2.2.32.ebuild 4711 BLAKE2B 6c0897f89045f6d8fd4586b7299394f5d1d47297f1d444697fef6e86e25214ec94828e8bd3bc7f9bbab179a96c7d36605c17fd9c6f89811ac2ab995e017b1e74 SHA512 9dc84c38c52938f88a5f2e189f204f088cada182ca21b80c2463c40c3b2869d2689ad5681cca5d002b8140051341a7e260f5b23fabb779aa728611d8cae1487c
 EBUILD gnupg-2.3.2.ebuild 4752 BLAKE2B 4014d0cbab030ecfeeaef7b80424bc47f3b7d6b1b8605b1fcbf3b73a691bb451190c99639ab06be148cddc7de41a38fe4f73f20e96f5d38cb3386e5dc6e06b38 SHA512 d393dac1af9a5a76e087a747ef809f24f47b6735bbc5c42e584e8a532ed2c53a1868dc467702f1ac7042ea1fba73389a2d7db9719f3270726943294ca34cb526
+EBUILD gnupg-2.3.3.ebuild 4817 BLAKE2B 9cdf47a977c2dc90bbcd565df0aecded46f53ebc4d0b84005dfb1547d16b47788337c93de6e28378bebb66deff1391e3a5d1c5ab8227d4017ed73304291d9475 SHA512 9c53b205bd7c0cd14e93a8290677326d3765a9b906598912afe7067b827e2207af5108a6e3f951326d00a259dea27aef193907b24ae04c688a114e47f049c605
 MISC metadata.xml 1498 BLAKE2B aba846d09c0230ea7e10a5585068509c9f56575da979a85f84caf6244555609782381bb8beae68222a0ab71a0d820a4d4655ed3d9b1399cc259e400f29d8ab6b SHA512 1314093db4291b4230cdda07bdae9c30dbce8bb698a2afb236f6c657c636791c8e2a9d5a3fc488bffddbff25d307d0ba9d50c54551652dfd099e73e70811e859
diff --git a/app-crypt/gnupg/gnupg-2.2.32.ebuild b/app-crypt/gnupg/gnupg-2.2.32.ebuild
index 69c41d5c42c8..9539d8593240 100644
--- a/app-crypt/gnupg/gnupg-2.2.32.ebuild
+++ b/app-crypt/gnupg/gnupg-2.2.32.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://gnupg/gnupg/${MY_P}.tar.bz2"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="bzip2 doc ldap nls readline selinux +smartcard ssl tofu tools usb user-socket wks-server"
 
 # Existence of executables is checked during configuration.
diff --git a/app-crypt/gnupg/gnupg-2.3.3.ebuild b/app-crypt/gnupg/gnupg-2.3.3.ebuild
new file mode 100644
index 000000000000..b32b781d0fd9
--- /dev/null
+++ b/app-crypt/gnupg/gnupg-2.3.3.ebuild
@@ -0,0 +1,155 @@
+# 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"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="bzip2 doc ldap nls readline selinux +smartcard ssl test +tofu tools usb user-socket wks-server"
+RESTRICT="!test? ( test )"
+REQUIRED_USE="test? ( tofu )"
+
+# Existence of executables is checked during configuration.
+DEPEND=">=dev-libs/libassuan-2.5.0
+	>=dev-libs/libgcrypt-1.9.1:=
+	>=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 ) )
+	tofu? ( >=dev-db/sqlite-3.27 )
+	ssl? ( >=net-libs/gnutls-3.0:0= )
+	sys-libs/zlib
+"
+
+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 )"
+
+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_enable tofu keyboxd)
+		$(use_enable tofu sqlite)
+		$(use smartcard && use_enable usb ccid-driver || echo '--disable-ccid-driver')
+		$(use_enable wks-server wks-tools)
+		$(use_with ldap)
+		$(use_with readline)
+		--with-mailprog=/usr/libexec/sendmail
+		--disable-ntbtls
+		--enable-all-tests
+		--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/{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/minisign/Manifest b/app-crypt/minisign/Manifest
index 4776d532d05a..4444cf5cc84c 100644
--- a/app-crypt/minisign/Manifest
+++ b/app-crypt/minisign/Manifest
@@ -1,4 +1,6 @@
+DIST minisign-0.10.tar.gz 18242 BLAKE2B 8b71f01ced4be00c38937e7db5ace2c7e348410a9381f6cc27374827fa0a9da70cca96153af199880ccd5f2265e18a7f21d074f877e0e21ca797bbba2bf5cbf5 SHA512 6a38500ed896c17b100bca47443f9806debe6e44d3ce09189f5f8913a41d4913434397175d1caa770fb0cc0918078dfc71c01b82b9bf919fdfba00434f4ce100
 DIST minisign-0.9.tar.gz 15664 BLAKE2B f9f358a27b069e752894326932a8c5c51f308ade49ed7088a5f693b4e8327639fc5578607f348994a7ab7484091ed93190894c1965cadbbbf2a27e939ccc117b SHA512 7970f3e72ff759f3f02416de5d6035e1c8dd4e92ea718083cc5091c7e2355b59c4e178c60ca934985ba1e1afcd970967d4fb39a434ba54b140f3fc9be661253d
+EBUILD minisign-0.10.ebuild 733 BLAKE2B 5964c8b791b2aef2ab987f43e90228ecaf13fe43006e06b5e2b855f5aea2db6b1418f3f907cc2e7304757d0811eacded3fc8a51882deebfca6f3878d97b04e68 SHA512 f54b9f43eca688a7ded56ff9223d9d9751dccc5e228e2b9fccdff6d9319f87b610893ec9e93c84ce0e5649bac0cce0cb511b5b2263fba75593057a1993650ed6
 EBUILD minisign-0.9.ebuild 725 BLAKE2B 798e077e132d183b8d40828c4c8d0b3f938fca4bba0e15eda0d91d6a6079feaba8776773fa4ef0f97949bf441156967484bed025abc0db8ce571f196472b915c SHA512 b165c58b237545ffa24aa670bb604b1bec3590543872611671c2a087af0b7045b264ac476eaea9a9ae47b82009b56eae5512e6f5fa0b7c410f9573fe22e1d6be
-EBUILD minisign-9999.ebuild 665 BLAKE2B 20395e22436151cbacb842badbf83ee829cdc278ac129b08db475cc87d35f7294097f87e4780a63a208d63b3f31edd244fb2da471d1de1dc95f744094c11f784 SHA512 b336ec7821b270de6f7b6a82d029cafde41ee685cd6a376d077e82451a6d223f0b0b5b6fbec6e994e009b8157b42d31c4ed7f0240b57a2877ffdb369742ff4a1
+EBUILD minisign-9999.ebuild 733 BLAKE2B 5964c8b791b2aef2ab987f43e90228ecaf13fe43006e06b5e2b855f5aea2db6b1418f3f907cc2e7304757d0811eacded3fc8a51882deebfca6f3878d97b04e68 SHA512 f54b9f43eca688a7ded56ff9223d9d9751dccc5e228e2b9fccdff6d9319f87b610893ec9e93c84ce0e5649bac0cce0cb511b5b2263fba75593057a1993650ed6
 MISC metadata.xml 682 BLAKE2B a3a405073dbad7ea7c570ae8eccef230b2f3baf389d0210e6ba1afb57e0b3504172225b1cb3a957812ed08bf2b8080b1b4dcb13ab982eccc8bdc15377a90cffa SHA512 8e88cae8452b76db2c57e86f6c50a5859964cb3e7e3f6a574990fbebd74d512a57015ed53c966ca714c7545d43160412c8aca9e954180333c6ecce81df8c4b51
diff --git a/app-crypt/minisign/minisign-0.10.ebuild b/app-crypt/minisign/minisign-0.10.ebuild
new file mode 100644
index 000000000000..154ff1cfe795
--- /dev/null
+++ b/app-crypt/minisign/minisign-0.10.ebuild
@@ -0,0 +1,31 @@
+# Copyright 2019-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake
+
+DESCRIPTION="Dead simple tool to sign files and verify signatures"
+HOMEPAGE="https://github.com/jedisct1/minisign"
+
+if [[ ${PV} == "9999" ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/jedisct1/${PN}.git"
+else
+	SRC_URI="https://github.com/jedisct1/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+fi
+
+LICENSE="ISC"
+SLOT="0"
+
+IUSE=""
+
+BDEPEND="virtual/pkgconfig"
+DEPEND="dev-libs/libsodium:=[-minimal]"
+RDEPEND="${DEPEND}"
+
+src_configure() {
+	local mycmakeargs=( -DCMAKE_STRIP=OFF )
+	cmake_src_configure
+}
diff --git a/app-crypt/minisign/minisign-9999.ebuild b/app-crypt/minisign/minisign-9999.ebuild
index 6b1c1c8ca147..154ff1cfe795 100644
--- a/app-crypt/minisign/minisign-9999.ebuild
+++ b/app-crypt/minisign/minisign-9999.ebuild
@@ -1,7 +1,7 @@
-# Copyright 2019-2020 Gentoo Authors
+# Copyright 2019-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 inherit cmake
 
@@ -13,7 +13,7 @@ if [[ ${PV} == "9999" ]]; then
 	EGIT_REPO_URI="https://github.com/jedisct1/${PN}.git"
 else
 	SRC_URI="https://github.com/jedisct1/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~ppc64"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 fi
 
 LICENSE="ISC"
@@ -21,10 +21,11 @@ SLOT="0"
 
 IUSE=""
 
-DEPEND=">=dev-libs/libsodium-1.0.16:=[-minimal]"
+BDEPEND="virtual/pkgconfig"
+DEPEND="dev-libs/libsodium:=[-minimal]"
 RDEPEND="${DEPEND}"
 
 src_configure() {
-	local mycmakeargs=( -DCMAKE_STRIP="${EPREFIX}/bin/true" )
+	local mycmakeargs=( -DCMAKE_STRIP=OFF )
 	cmake_src_configure
 }
diff --git a/app-crypt/pinentry/Manifest b/app-crypt/pinentry/Manifest
index 2854c550ce2c..32286959abbf 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 2320 BLAKE2B 8651c5ba8d9eb73b75b9390d69c9dddc531a3ddeaebf6c5c8ea6f3950759a02b54b51df5f0cd9661b06759aee072ff56f06e52e06e98fd369a885e422aca9311 SHA512 8b64420f9f1f0d28d7254293d6e4274216a8d1cf7164eb853256419af5052e7889e460acf9dfe0866c4128761d0f0d32b4b13cb5465ca2ccf767e8182d374bad
+EBUILD pinentry-1.2.0.ebuild 2315 BLAKE2B 7eae8d3b2b8ed379deb21fded2bd06bb0f52e2d27b01c34646fd8253ff043df5b03ff9e9064b9b6faf6df5535200024079e75175a4e30ed4c0f353fe808a9320 SHA512 ddebb43150cf8d97aecb5b492ac1524dedfa653800feee9da877a6e2208a51fb8d7c01f1fb8d38bc974e69df6ea6894a5d965531c203519b6cc188f2688ec9d0
 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 14485afa8415..0ca1d12f8c92 100644
--- a/app-crypt/pinentry/pinentry-1.2.0.ebuild
+++ b/app-crypt/pinentry/pinentry-1.2.0.ebuild
@@ -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 ~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/qca/Manifest b/app-crypt/qca/Manifest
index 487e0c992584..2e285151d599 100644
--- a/app-crypt/qca/Manifest
+++ b/app-crypt/qca/Manifest
@@ -2,5 +2,5 @@ AUX qca-disable-pgp-test.patch 446 BLAKE2B a98d5951d7b89c65787d7d586a5504949c512
 DIST qca-2.3.3.tar.xz 736456 BLAKE2B f0812fd33bd19293c8034e48bcf214d2d70dc1397860779c2c145fe841365384a8eb6bad9859520d32104010acb0cefb97e3a974b9852a37ca8039d52d9dbd03 SHA512 9a262350502daa1dd10802a7a24f0e4712d87d4ddcf752452a51caa8694a30835672f54f8e600aa8dc4afdac9ef073641deed52a24423e304d18ad2b83deeca6
 DIST qca-2.3.4.tar.xz 737072 BLAKE2B 64e698135f02bf115269203d44a53d40449be1620487340551c1e45f66f042132beb2cfa2363d1249f92de3ffd670f1807219cb3ce3d6e7c05afd8c22242b703 SHA512 af27338b5c018d39c8c745b63691dec3914e29ff79347ab338f4391ee1dc9832d158b222bc9ef6c7681cf4b2893a38829a4daadf1d53622d6947de2efeb880a8
 EBUILD qca-2.3.3.ebuild 1854 BLAKE2B 080d8e3610ce39fa9b8cda3108059b55fc2f6eae2e068b286b7281d21406b401b03dab0eed05db163f7dc11fdf4904f9968d2f8de5412f1005ec724f62d04eb8 SHA512 4afc045a2f21942c51e89efa0c459284d33460e06a09972bcd38e86608a57d28ac558a2c88fb8cc90b39d4eac3999ecc3b828b9858691aea090baa474d4b6767
-EBUILD qca-2.3.4.ebuild 1856 BLAKE2B f4b8036718e9f7f1e153a6dda12a9c3bfa6bc165ff42d5a01106c2bb7a5feeb5f114b176bdd80da2e289863bccfcc4fb6b861996255fd2c08be687ece8557cbd SHA512 2c611e3a9ea42bf18b77651e51da93d769acd793b563bb3d4e31ffe858d1f71f29349adb880a560c710ebbac15bc29dab626ea09f87462cf2796b15e5fac1e5d
+EBUILD qca-2.3.4.ebuild 1854 BLAKE2B 10ff70fce7afde416cc3f6279d57c5f332c41b15f09bab173a8848b9dbed8c3fb3ee96d580577bb2432dc06c520190f301c83ae8d3c52e384899d40c4bc314b2 SHA512 db1f32ccfd7e2a9fd1529909a30512a6e1f461fcc6b2dfa6e06ae55ca6962ec8a6c5abee329b979b6cff470aff32d27ded10faee67a704a7b11a89f574b98d68
 MISC metadata.xml 832 BLAKE2B 9044b545fa732c5f86c7dbb026630b4946a538ba77369eae28e894bf636ca60f6a31d7aad258fa19aee4c433d6d5a8e2a34a7c2850eef3a40d44261e592032b0 SHA512 b01bfe83343fdc265abc25922300cdc67f556a9a6f6db16918b0b3ee44c4e83db524695c5cb8952278f3e1f2e5d60a49bcc9312b35ab95f0ecc42e03764fb6bd
diff --git a/app-crypt/qca/qca-2.3.4.ebuild b/app-crypt/qca/qca-2.3.4.ebuild
index e9d27c4d2098..b806e3cb3cf5 100644
--- a/app-crypt/qca/qca-2.3.4.ebuild
+++ b/app-crypt/qca/qca-2.3.4.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://kde/stable/${PN}/${PV}/${P}.tar.xz"
 
 LICENSE="LGPL-2.1"
 SLOT="2"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~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 )"
diff --git a/app-crypt/rhash/Manifest b/app-crypt/rhash/Manifest
index 5e81ed2e0331..a94f58983493 100644
--- a/app-crypt/rhash/Manifest
+++ b/app-crypt/rhash/Manifest
@@ -1,11 +1,10 @@
 AUX darwin-triplet.patch 657 BLAKE2B cb710ca481e9a45d593ab857dc10ff8baf6c3bc5fbd2ac9ef97cee5589d8873cdc81a6a730f9058a7b9a10199667384ebbf56f828d2e6b817bf40443653adbe5 SHA512 5caec1179c860c0bf003605dd96d8c4a47a3ef784d937080a237106364918a36c1bf1138b9a4b1b0f5e5c042d653c5b324ada1a0f9b621dc33aa4a11d4f9c1c1
 AUX freebsd-triplet.patch 800 BLAKE2B 43f1f7e1fa43313e2f323a3e5031a463185c2388a3b59c75f1a3a216d6ce6e04be9cb584ffe3c44773c072408740c02354dec4969d42d6abd824a1fc633fa4dd SHA512 7f66e6ab4bdc21959e00b8ad21aaa13eab6d11552d92e8978ce5c501339a3ddf0b303f47ae5fce4056522ffea90cef3d25c5dc5d6469e7bbffa078526e1c7404
 AUX rhash-1.3.6-no_echon.patch 1224 BLAKE2B 949b6aa839667a6fef3c3a668b6cadc451986ba837807b3d7a56b80f50c8248d734745f886d40d341a99fefaf439f95bdeb0382ee15ea9e4f8561f98703fba2d SHA512 3771077c64c28b1fcf310d7a449d3e1eb951d1669b2ad3ddffe76d98ac5821ea8af40013984c65f28c7fce3434b7173a74a77120847f557cab2dedefac0c8b58
+AUX rhash-1.4.2-clang.patch 2775 BLAKE2B 0160a245931d58eb4809e95b5ab8a515fadf1459714378f254c597d56f3c4336ee59b17152c3fc23ae4ca39a4cc076eb78783e609b847b0c276c8f8c37fdd940 SHA512 3b28f8234d42f7dc46a8b890e5ba6f49e61f3db26019e81bfe8d4318b28d71ca781c49f0ee09c387a1cbef626ad016fc3177037f2d504be7572d56ed836ff954
 AUX unquote-cc.patch 791 BLAKE2B a872b7a8e8d2e04f5cf3dda0b4f4aa5e0177878942f9836f8a431d950392dafb46be646048a0ab4dc4a31ac20b6676fa8627b39bbb30a990861cf8d3cfc742f8 SHA512 7a4c2bf019cbcde021bb79572abdbc9b42f995ada5bb9798fed127d79c44ed9d4b9544c1413952604b1dd45ed307acdacba6675419f6331d75ecf34c15b8f5ca
 DIST rhash-1.3.6-src.tar.gz 328097 BLAKE2B c74993d183f0f2e479f0bd5831a9f653b9bd17bbed4d1ba896f6e33db98b7141175cd3c688dc41dfd8ec4b98acb51255ae5b795435cbc9dfb5ab77573cb25543 SHA512 54f7f238ed1fdc01c29cc1338fa86be90b69beff0df8f20d24ce9cb3c48c7f4668b84a3fe0d4d8b04b54bc8145485d493435edf3219de3a637af0f9c007c85c6
-DIST rhash-1.4.1-src.tar.gz 413274 BLAKE2B 2027bccc677e8a1766f0624e67f475713653ddb4be457f9c8434c45019bc730934ca860e69f8b8e1fec349e724b1a366df0f5fb98501c825b44f9b8105068ff7 SHA512 30bbef7ce7815ee4ac062c537206a0b895845f61de4b1fdc0c0494f66284d9f3c1b06f812ea913fa35a3342d230d25d0986a1db644c7b4464bc1185997beb638
 DIST rhash-1.4.2-src.tar.gz 416853 BLAKE2B 06322825116cb00aa4987b01610d967eb57c94aa29b43348ec2c31f053fd471a900fcee776714263213e9a79eaf389b2e79d7b34a5afd3e98d68198193b5cbe7 SHA512 41df57e8b3f32c93d8e6f2ac668b32aaa23eb2eaf90a83f109e61e511404a5036ea88bcf2854e19c1ade0f61960e0d9edf01f3d82e1c645fed36579e9d7a6a25
 EBUILD rhash-1.3.6-r1.ebuild 1815 BLAKE2B 25d7980d3736edd66242acec9de12ef8bc434993a083dd2e12b3f382ca90aefbb42d4e96b35b6c42c106184e6956c8e33aac424d2272e1ae7eb77ead02f4d5af SHA512 15307b2110d89a05d3afdb6ee43a87f3ec33c921d7796cc73831d2d60c7e25df7531a73badb5a9721aa010b58dba74f1536bea7b7c9ec283e2a7ad1e430af1c4
-EBUILD rhash-1.4.1.ebuild 1885 BLAKE2B 65d6c7be3d3db04a2f43f1c1f4614ff3e812e56895ed7e0e0f8824e28a718224614366d08def5d1cb8f480744061b28ef00f08fe61e1859756af5cafeb0e282a SHA512 01e111abd4f61534bc6fef1ed0b76a085e377b698b0350855218e772927bc8adc557cc4e37928c9860649f775995a7e4da296bdb722b4589a5af13e3a4ef3f6b
-EBUILD rhash-1.4.2.ebuild 1891 BLAKE2B 3d91c3b3d806cef4e010c614060c45c0ddf9fa559321470c209eaa11b7a661428a98efc2d85224c4d4922be10f2df43c651b0bdbc0523e2cbf002a26949afcfa SHA512 924476fcc45ff97f78603c9475646247065647059b85de6bf79b03477250ed24e6c434af1933d1467561606a87892faa9b871db7557f6222c8c052af678bbf1b
+EBUILD rhash-1.4.2.ebuild 1936 BLAKE2B 881dcdcefc9c332aba1158c9170f14d3669676b6416598e058c88c0f69b1700f7b5c85bb874918ac37c43b0df7d887d751e9f94d9119e5d126da9d74f0b721a7 SHA512 b9c636c3347d32a6660c91199965fafc1eecc9d5c241c1a28af40d421335fe154e63585d727ad70699949831a032d531972ac7325a6b575625dfb6bba3c907fe
 MISC metadata.xml 817 BLAKE2B eeb15cde9e06507f73330759d44dca59dea3bbcb972cb25af71d91f065eb64dbd1ddc61e43f8fad50c264c269542f92efdace36d3397647c3c53972e695da22f SHA512 3e2f688b57c74e051fcfb90d34685346c459c5e9f425266fd3d8e099f586037b14c2bfdac76f135a046c77cc850bb49954c0e7d8dc9ded1db47bf0919ab3ea93
diff --git a/app-crypt/rhash/files/rhash-1.4.2-clang.patch b/app-crypt/rhash/files/rhash-1.4.2-clang.patch
new file mode 100644
index 000000000000..460e73a6ace7
--- /dev/null
+++ b/app-crypt/rhash/files/rhash-1.4.2-clang.patch
@@ -0,0 +1,80 @@
+From 4dc506066cf1727b021e6352535a8bb315c3f8dc Mon Sep 17 00:00:00 2001
+From: Aleksey <rhash.admin@gmail.com>
+Date: Sat, 17 Jul 2021 18:39:41 +0300
+Subject: [PATCH] configure: fix clang detection on macOS
+
+---
+ configure | 58 +++++++++++++++++++++++++++----------------------------
+ 1 file changed, 28 insertions(+), 30 deletions(-)
+
+diff --git a/configure b/configure
+index 59d432b..111270a 100755
+--- a/configure
++++ b/configure
+@@ -519,38 +519,36 @@ else
+     elif run_cmd "$CC --version"; then
+       cc_name_tmp=$($CC --version 2>&1 | head -n 1 | cut -d ' ' -f 1)
+     fi
+-    if test -n "${cc_name_tmp}"; then
+-      if echo "$cc_name_tmp" | grep -q "gcc"; then
+-        cc_name=$cc_name_tmp
+-        start_check "$CC version"
+-        cc_vendor=gnu
+-        cc_version=$($CC -dumpversion 2>&1)
+-        if ! echo $cc_version | grep -q '^[0-9][0-9]*\.[0-9]'; then
+-          cc_v2=$($CC -dumpfullversion -dumpversion 2>/dev/null)
+-          if echo $cc_v2 | grep -q '^[0-9][0-9]*\.[0-9]'; then
+-            cc_version=$cc_v2
+-          fi
++    if echo "$cc_name_tmp" | grep -q "gcc"; then
++      cc_name=$cc_name_tmp
++      start_check "$CC version"
++      cc_vendor=gnu
++      cc_version=$($CC -dumpversion 2>&1)
++      if ! echo $cc_version | grep -q '^[0-9][0-9]*\.[0-9]'; then
++        cc_v2=$($CC -dumpfullversion -dumpversion 2>/dev/null)
++        if echo $cc_v2 | grep -q '^[0-9][0-9]*\.[0-9]'; then
++          cc_version=$cc_v2
+         fi
+-        case $cc_version in
+-          2.96*)
+-            cc_fail=yes
+-            ;;
+-          *)
+-            _cc_major=$(echo $cc_version | cut -d '.' -f 1)
+-            _cc_minor=$(echo $cc_version | cut -d '.' -f 2)
+-            _cc_mini=$(echo $cc_version | cut -d '.' -f 3)
+-            ;;
+-        esac
+-        finish_check "$cc_name $cc_version"
+-        break
+-      fi
+-      if echo "$cc_name_tmp" | grep -q "clang"; then
+-        start_check "$CC version"
+-        cc_vendor=clang
+-        cc_version=$($CC -dumpversion 2>&1)
+-        finish_check "clang $cc_version"
+-        break
+       fi
++      case $cc_version in
++        2.96*)
++          cc_fail=yes
++          ;;
++        *)
++          _cc_major=$(echo $cc_version | cut -d '.' -f 1)
++          _cc_minor=$(echo $cc_version | cut -d '.' -f 2)
++          _cc_mini=$(echo $cc_version | cut -d '.' -f 3)
++          ;;
++      esac
++      finish_check "$cc_name $cc_version"
++      break
++    elif $CC --version 2>&1 | grep -q "clang"; then
++      start_check "$CC version"
++      cc_vendor=clang
++      cc_version=$($CC -dumpversion 2>&1)
++      finish_check "clang $cc_version"
++      break
++    else
+       cc_name_tmp=$($CC -V 2>&1 | head -n 1 | cut -d ' ' -f 2,3)
+       if test "$cc_name_tmp" = "Sun C"; then
+         start_check "$CC version"
diff --git a/app-crypt/rhash/rhash-1.4.1.ebuild b/app-crypt/rhash/rhash-1.4.1.ebuild
deleted file mode 100644
index 4aa5c894ec98..000000000000
--- a/app-crypt/rhash/rhash-1.4.1.ebuild
+++ /dev/null
@@ -1,80 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit toolchain-funcs multilib-minimal
-
-DESCRIPTION="Console utility and library for computing and verifying file hash sums"
-HOMEPAGE="http://rhash.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}-src.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~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="
-	ssl? (
-		dev-libs/openssl:0=[${MULTILIB_USEDEP}]
-)"
-
-DEPEND="
-	${RDEPEND}
-"
-
-BDEPEND="
-	nls? ( sys-devel/gettext )
-"
-
-S="${WORKDIR}/RHash-${PV}"
-
-src_prepare() {
-	default
-
-	if [[ ${CHOST} == *-darwin* && ${CHOST##*darwin} -le 9 ]] ; then
-		# we lack posix_memalign
-		sed -i -e '/if _POSIX_VERSION/s/if .*$/if 0/' \
-			librhash/util.h || die
-	fi
-
-	multilib_copy_sources
-}
-
-multilib_src_configure() {
-	set -- \
-		./configure \
-		--target="${CHOST}" \
-		--cc="$(tc-getCC)" \
-		--ar="$(tc-getAR)" \
-		--extra-cflags="${CFLAGS}" \
-		--extra-ldflags="${LDFLAGS}" \
-		--prefix="${EPREFIX}"/usr \
-		--libdir="${EPREFIX}"/usr/$(get_libdir) \
-		--sysconfdir="${EPREFIX}"/etc \
-		--disable-openssl-runtime \
-		--disable-static \
-		--enable-lib-shared \
-		$(use_enable debug) \
-		$(use_enable nls gettext) \
-		$(use_enable ssl openssl) \
-		$(use_enable static-libs lib-static)
-
-	echo "${@}"
-	"${@}" || die "configure failed"
-}
-
-# We would add compile-gmo to the build targets but install-gmo always
-# recompiles unconditionally. :(
-
-multilib_src_install() {
-	# -j1 needed due to race condition.
-	emake DESTDIR="${D}" -j1 \
-		install{,-lib-headers,-pkg-config} \
-		$(use nls && echo install-gmo) \
-		$(use kernel_Winnt || echo install-lib-so-link)
-}
-
-multilib_src_test() {
-	emake test
-}
diff --git a/app-crypt/rhash/rhash-1.4.2.ebuild b/app-crypt/rhash/rhash-1.4.2.ebuild
index fd42272e981c..0aea0acab044 100644
--- a/app-crypt/rhash/rhash-1.4.2.ebuild
+++ b/app-crypt/rhash/rhash-1.4.2.ebuild
@@ -29,6 +29,10 @@ BDEPEND="
 
 S="${WORKDIR}/RHash-${PV}"
 
+PATCHES=(
+	"${FILESDIR}"/${P}-clang.patch
+)
+
 src_prepare() {
 	default
 
diff --git a/app-crypt/zulucrypt/Manifest b/app-crypt/zulucrypt/Manifest
index c35f8fa45819..7a854be1100f 100644
--- a/app-crypt/zulucrypt/Manifest
+++ b/app-crypt/zulucrypt/Manifest
@@ -1,4 +1,4 @@
 AUX zulucrypt-5.5.0_pre20180223-fno-common.patch 524 BLAKE2B 7abdc51e78c112ac8787c16278903e02bc05c7066f03fb2fe821311c6830000b81531bb9bdb19d7ca2d3c91b7d85642c943ed839012f612170a4da7466150361 SHA512 71808d1dce262ac0ccd834c5461e01115d80153f3b4ad6274575bb190e89a64ddb34a3c5c66701c5f2b1a83e1ccfcb495df1772dd1a13c6155b55188acc3cfb2
 DIST zulucrypt-5.5.0_pre20180223.tar.gz 2162535 BLAKE2B 7d098ec20b7f355be6ad863121f7016d6b1ccbcc133438b616cfbd805110b24ae91dc74b0c2daf3137511fcb72e0338663c3c743c6c3d2b761883c57c590c0e5 SHA512 38ea9442a48c02741e11e59759b745ce3d6d6ca5f37d8b685526be76308a8fa1f7db7fd38038e5ce50e2a8afd8740b0a683a3458cb1df6f0b70c41fbf8035c15
 EBUILD zulucrypt-5.5.0_pre20180223.ebuild 1132 BLAKE2B 1245f868fd6fff5c010d03ac6c41b441de23b6d8a5db046d8748a2827ff0f64c84338006d8a95bfe27799c9e44c747de8577f099eff9ad3415586c22df418964 SHA512 ef29713207100695fc5e5b5c4d49707d165f01ef2e823818f9ba1c561b4cd6428c58bc74606bb662230fac48634b368083b300ffd2310bc6de02bf8150ffc0ba
-MISC metadata.xml 698 BLAKE2B 4898767879109c624c42bf1ffb516483b7d33a58c117059d1441a6c6820f9d38c48ed7ae97287d9888f98b28416d9b6030e20533d2dbf1dc5c936a1fc37c44c1 SHA512 8b9e173e6404dfc35b9717abf1ae186091f19cd9f345ccd3731743fa8645177d8e05cd6115a18d278fbd3e8d2d9737802005f93eafbccfc3b568ef2627de9e3f
+MISC metadata.xml 620 BLAKE2B e2bab6922c8f34ef68b76ae4ffde3eacda3ff19c5b24267c972e7f6cbecada181eef2e12077fb49902f1e9786e90e4d1b63d8bf74f87606c0a6b14d0226dc295 SHA512 399ca0d7a6427d5f0cb25c319dcb605f176c5aec47cdd9b54dcd56321fe106b3455b17793ccf3b13c5506d18c61864be46197ad780dae24983e4e6fd8f9f99ef
diff --git a/app-crypt/zulucrypt/metadata.xml b/app-crypt/zulucrypt/metadata.xml
index d1ac1033b5d7..91676ea4813e 100644
--- a/app-crypt/zulucrypt/metadata.xml
+++ b/app-crypt/zulucrypt/metadata.xml
@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>johu@gentoo.org</email>
-		<name>Johannes Huber</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<use>
 		<flag name="gnome">
 			Enable support for the freedesktop.org Secret Service API via <pkg>app-crypt/libsecret</pkg>