gentoo resync : 14.12.2020

36 files changed, 477 insertions, 75 deletions

diff --git a/app-crypt/Manifest.gz b/app-crypt/Manifest.gz
index 54a67cac06e8..4e0d0ae308a8 100644
--- a/app-crypt/Manifest.gz
+++ b/app-crypt/Manifest.gz
diff --git a/app-crypt/acme-tiny/Manifest b/app-crypt/acme-tiny/Manifest
index 5148aa627926..cefa7ac31179 100644
--- a/app-crypt/acme-tiny/Manifest
+++ b/app-crypt/acme-tiny/Manifest
@@ -1,6 +1,4 @@
-DIST acme-tiny-4.0.4.tar.gz 12667 BLAKE2B 6177d639a2d65080f84ca93400405c01ef18cb3c8d18ef5e7e57af1eede9d6f1e105ca7f6f89014e79c5cb1d865d3c81f590abdb37e8caa6b9699ea20064f698 SHA512 e66befe8262b3396e5e55ea01fc47c668c527868832d2ccdc2786156ec52e698fd20cb6fa4fe861d97947d64f4b6c751be9c79bf546eaac34978c53b9e6f85e4
 DIST acme-tiny-4.1.0.tar.gz 12776 BLAKE2B 7efd9d1399ec3bbd98180511c9f36fbf6f9a96a0d4e0e72b9d4c85d16246118eaaad25bc26ba42f746fd4b60b498ceca5307e279d788157237ac6ad153848501 SHA512 31d69a5031c019acbc23b3f06041eae8e261766396d4a7420fd70a71cfa16de953bea4c0c2ad0c6a6e793ed61ab5331f40145352ffce69f4f062f35dd0db7519
-EBUILD acme-tiny-4.0.4.ebuild 1123 BLAKE2B b2eeaab3c586da0a554d7707a82d426573e91c876231d9234c8de20b1635360ac0ad57a0a025efc4bbfabc61853e1f4be6965421312ebe96f997ea5a90370864 SHA512 0aca96327d05bcacb6e960d69bb6972a234cb7d1316eb89021f42f06f756ed454033879e58dc9dc726043221a94c990635b54f9a26b08264e5aabf88e7e480a6
-EBUILD acme-tiny-4.1.0.ebuild 1114 BLAKE2B f89edfc1bbbe6d7775a19672d269a0e52aebb6e0d5ad3e9af8db495cd4d6c4f6ab21db97d7baea00ee289d67e5bf9e22191bc154bfba2cd67ed2b2dd80373cf0 SHA512 9701da44e3c150c0a27204ac933e21060e62f86dc16ba66fa10406a6c9e8525521f30bbf2a32acc80fa21ebc7e33c6b229065b10304c4f66740c80106554b301
-EBUILD acme-tiny-9999.ebuild 1114 BLAKE2B 82fb2e53832a806c908e634e1c6af5523050feff73ca126541f088e5f9d6d4782b45767e5b6a34ad27483e24dbf48f71039924f685e965cf2dc74887272e4f0a SHA512 960b6ef1e9ac8e7d076da62ef0b7035a88a90e95f8a7f22f6d79789a341e67ee82db5b8877a9972fdc0df7f1280fe409d1351b8ad8ad695fd9e6fd8493135d35
+EBUILD acme-tiny-4.1.0.ebuild 1112 BLAKE2B 170dc37a59ee76941653e79d810eb2935924ae52ec35238cdc0df64229dbe771e0b883db4f0471d7226d38e530aed46f63729f50ad8bcdb7c7a3b701c0ce3633 SHA512 3e7e26fce017bb333a5810123435116b19e7da38836ecd76be4229b25ef7bc5541324eb3499a553a28d347bedcba55d6c1dc56ccfc4670bed63786eb223e7f8b
+EBUILD acme-tiny-9999.ebuild 1114 BLAKE2B f89edfc1bbbe6d7775a19672d269a0e52aebb6e0d5ad3e9af8db495cd4d6c4f6ab21db97d7baea00ee289d67e5bf9e22191bc154bfba2cd67ed2b2dd80373cf0 SHA512 9701da44e3c150c0a27204ac933e21060e62f86dc16ba66fa10406a6c9e8525521f30bbf2a32acc80fa21ebc7e33c6b229065b10304c4f66740c80106554b301
 MISC metadata.xml 329 BLAKE2B ced7f9ec6d26b74b6c0ee133935595f1d7d4dcb7d0e134f072b66725151980d013fcc5a7ef30708dca402c6a8449e119bbf3084b85afa301965aee3465e1b034 SHA512 3c6601f8249de10c7cf8b14bd128d5d564671ebb5eb6554eaebf7b6e01b0469f2a26ae658aa05f6391ce28029c5a5d422e2ed12115f2a5451d17ceca4258684b
diff --git a/app-crypt/acme-tiny/acme-tiny-4.0.4.ebuild b/app-crypt/acme-tiny/acme-tiny-4.0.4.ebuild
deleted file mode 100644
index 73e586b47f1c..000000000000
--- a/app-crypt/acme-tiny/acme-tiny-4.0.4.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python{3_6,3_7} )
-inherit distutils-r1
-
-if [[ ${PV} == 9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/diafygi/${PN}.git"
-	KEYWORDS="amd64"
-else
-	SRC_URI="https://github.com/diafygi/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="amd64 ~x86"
-fi
-
-DESCRIPTION="A tiny, auditable script for Let's Encrypt's ACME Protocol"
-HOMEPAGE="https://github.com/diafygi/acme-tiny"
-
-LICENSE="MIT"
-SLOT="0"
-IUSE=""
-
-DEPEND="dev-python/setuptools_scm[${PYTHON_USEDEP}]"
-RDEPEND="dev-libs/openssl:0"
-
-pkg_setup() {
-	if [[ ${PV} != 9999 ]]; then
-		export SETUPTOOLS_SCM_PRETEND_VERSION="${PV}"
-	fi
-}
-
-src_prepare() {
-	sed -i 's|#!/usr/bin/sh|#!/bin/sh|g' README.md || die
-
-	distutils-r1_src_prepare
-}
-
-pkg_postinst() {
-	for v in ${REPLACING_VERSIONS}; do
-		if ver_test "$v" "-lt" "4.0.3" || ver_test "$v" "-ge" "9999"; then
-			einfo "The --account-email flag has been changed to --contact and"
-			einfo "has different syntax."
-			einfo "Please update your scripts accordingly"
-		fi
-	done
-}
diff --git a/app-crypt/acme-tiny/acme-tiny-4.1.0.ebuild b/app-crypt/acme-tiny/acme-tiny-4.1.0.ebuild
index a1911edadfdc..fef86ec767a9 100644
--- a/app-crypt/acme-tiny/acme-tiny-4.1.0.ebuild
+++ b/app-crypt/acme-tiny/acme-tiny-4.1.0.ebuild
@@ -11,7 +11,7 @@ if [[ ${PV} == 9999 ]]; then
 	EGIT_REPO_URI="https://github.com/diafygi/${PN}.git"
 else
 	SRC_URI="https://github.com/diafygi/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="amd64 x86"
 fi
 
 DESCRIPTION="A tiny, auditable script for Let's Encrypt's ACME Protocol"
diff --git a/app-crypt/acme-tiny/acme-tiny-9999.ebuild b/app-crypt/acme-tiny/acme-tiny-9999.ebuild
index 8521a3767ad0..a1911edadfdc 100644
--- a/app-crypt/acme-tiny/acme-tiny-9999.ebuild
+++ b/app-crypt/acme-tiny/acme-tiny-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python{3_6,3_7,3_8,3_8} )
+PYTHON_COMPAT=( python{3_6,3_7,3_8,3_9} )
 inherit distutils-r1
 
 if [[ ${PV} == 9999 ]]; then
diff --git a/app-crypt/acme/Manifest b/app-crypt/acme/Manifest
index 27430e8896d7..3b201057aac6 100644
--- a/app-crypt/acme/Manifest
+++ b/app-crypt/acme/Manifest
@@ -1,4 +1,6 @@
+DIST certbot-1.10.1.tar.gz 1416402 BLAKE2B e00ba6bf69dbf4bc91be325d4c9ba470214aeef18b4ad4ac5efbf7d077ffa9498e9cff2eff00045bc1024930f95ec56e1773c3a193a982b393caf7ee19f8ccc0 SHA512 332e92dd7d91b9774e55ef8d2c0217a57167a26d1e86d36196fc601b4abb23f40033f94112c4b4bff5f8bc54e1e32ecd68b1f01e7d67bc4fd8f7dd98ce0362cc
 DIST certbot-1.9.0.tar.gz 1425703 BLAKE2B 9bf78824649870b3e1fc3175aae551cbfaa675a8930a89f35ba2330647d86798e4fc43011c617be2d278ab20c43dd05b02e8e61956dd7f9d10d444181874346e SHA512 098d8c077f5760c1f40f7d673820488ad7643c8b9c12561a58921cd95f60ae76515cefc19f822747f3385a68eba6f49fe5484b20142994ef67a26b0b16293ce8
+EBUILD acme-1.10.1.ebuild 1727 BLAKE2B ac84ebb7f4297d6c2161f92ca674459aac9aff9eeabdefc5809a86821f7e93c91711380ec73748ba65440ff9e9d301e48b2f5e88ebeb4f4043bde6443962d26f SHA512 d1f1b78f04222efea90fe258cd1a45c43da90cea1d45b5158d72fb7a094c3f04d0b84a2e073fed365eaeea8a20c383fc572378d679ac37a1fd332a309d18c281
 EBUILD acme-1.9.0.ebuild 1721 BLAKE2B b6f1bf82f1a856659e423bf64da1e1db084e6ce9a3583cbdad5de574441b2b2a1216f23961352decd9323f8c6c115502d426312070891e1411d8632054a871ef SHA512 a017fea91a2c3b3ef8596e8a80b3bc9576e7fe80f4cea844b0be5a56c12578854a27b46c2921d0b5f32add2f4b64154a54b1183442c051366ae3764910cec668
 EBUILD acme-9999.ebuild 1723 BLAKE2B 1f9dcf588af71aa02df863c8d2704b261586fb72b088161cf4fd0643a941e7cf55f9d450c3a6c39bc9075092b63d62f7a16f2f5b295870de41c3bf409ab4e191 SHA512 cf5d3780b7dc9faf510b00ecd4342b52b6133f5852c7afe732ca50e52825cc6f8d55e3400928d3e99793e2457b86e8c0c1d199820fe3e2a086c596b4586970f0
-MISC metadata.xml 384 BLAKE2B 55780995cb61c11ca859c9f1de17b1c22c9c92902f551ccd1ee6f030df9d513bb5519a2c62bf33bc6a5872790d033ba966e5ed137d84a4f66ab4ba7636a88887 SHA512 cf8393b25aa363bc1db4ebd23274affd1eaf999a4c2ab8d359730f421961dafd5c96fcf14c247f3f5419616116e2351d72fbf0e29301ea44ac522e865c7b0fa1
+MISC metadata.xml 376 BLAKE2B 5a7076ef341b2599d7e91af0f563af2f1e1d7d9e85a02d78af75d87ea2f57ab06f603da824cb5e256191a25869c51891d5ce4c6dbf23fff1caa891fe4672828e SHA512 c3a734211c0053c85646aaa7ab03af05b021342b345da4bef5e37941ac19530a7f122abf276a9e7cd0b00ff7f3a087892ff6e98a4bec937dacae38f142a547ec
diff --git a/app-crypt/acme/acme-1.10.1.ebuild b/app-crypt/acme/acme-1.10.1.ebuild
new file mode 100644
index 000000000000..e6b050a6c6a9
--- /dev/null
+++ b/app-crypt/acme/acme-1.10.1.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=(python{3_6,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-1.3.4[${PYTHON_USEDEP}]
+	>=dev-python/idna-2.0.0[${PYTHON_USEDEP}]
+	>=dev-python/josepy-1.1.0[${PYTHON_USEDEP}]
+	>=dev-python/pyopenssl-0.15.1[${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/six-1.9.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/metadata.xml b/app-crypt/acme/metadata.xml
index d0f0d1620b50..4f4e4466f8aa 100644
--- a/app-crypt/acme/metadata.xml
+++ b/app-crypt/acme/metadata.xml
@@ -7,6 +7,6 @@
 	</maintainer>
 	<upstream>
 		<remote-id type="pypi">acme</remote-id>
-		<remote-id type="github">letsencrypt/letsencrypt</remote-id>
+		<remote-id type="github">certbot/certbot</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/app-crypt/argon2/Manifest b/app-crypt/argon2/Manifest
index ba7a466e0c6f..94636cd8d338 100644
--- a/app-crypt/argon2/Manifest
+++ b/app-crypt/argon2/Manifest
@@ -1,3 +1,3 @@
 DIST argon2-20190702.tar.gz 1505307 BLAKE2B fa9c3dde7b39c8d797a3d6b52992ebfe35f5eba1c7d7b3aa02c440edc36a3f5186cacee2e39e27ed7c6356dc1970dac0e8198d6f2065eb63ff77f9dfb2937cf8 SHA512 0a4cb89e8e63399f7df069e2862ccd05308b7652bf4ab74372842f66bcc60776399e0eaf979a7b7e31436b5e6913fe5b0a6949549d8c82ebd06e0629b106e85f
-EBUILD argon2-20190702.ebuild 1310 BLAKE2B ae465f1e130ce075cfa0f9163c82cb4a4c7ba292eb8e852ace21ffeb33021175523e2c83663872d351e9e81a466435762f7a32ab360a1a7d9487e5487cb6e378 SHA512 ddaf0207aa4ad58ae38d786d6172684fc83ae0b5f380a2ac81594cbad255d6a789da254888405e9142b46d2004e2d093ad83458469f8524181a36ef362b65621
+EBUILD argon2-20190702.ebuild 1321 BLAKE2B 76fc3bd6c47e9ea2f74c18eddb68d40f6236a56d829e725e358b1453058a6de2d25572610a85bd6251e0a40bb9b8379b8ad0ed1a02210891f819327b1dd5c3e1 SHA512 7ec43584222b5c58e5cb5396b065da25e4b7025557a98c307137ea3588d8af27039d47b79a6cd59dbc45afed84f8a3769da50015c346a7c22ba195c019f432b9
 MISC metadata.xml 638 BLAKE2B d07a626d9825ec2ce799713d1b43beefbc306b95f344b7ab40fdc7b4c4c9c6171385f91229d4a2d10159dcdde9e8d1806769277665a90f7419b5b3a2cb2b69c8 SHA512 24c2648534d4855d93eb91c8e127f08a34dcd21fdff3bf2665d26e62409b819a9ada15e6516f9c1649c848d3a57aa4c68adeeaa80f92b870ed5b4c48c40b5e9b
diff --git a/app-crypt/argon2/argon2-20190702.ebuild b/app-crypt/argon2/argon2-20190702.ebuild
index 335c2b502311..772e2743d6b9 100644
--- a/app-crypt/argon2/argon2-20190702.ebuild
+++ b/app-crypt/argon2/argon2-20190702.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/P-H-C/phc-winner-argon2/archive/${PV}.tar.gz -> ${P}
 
 LICENSE="|| ( Apache-2.0 CC0-1.0 )"
 SLOT="0/1"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-macos"
 IUSE="static-libs"
 
 S="${WORKDIR}/phc-winner-${P}"
diff --git a/app-crypt/cardpeek/Manifest b/app-crypt/cardpeek/Manifest
index 1be554126806..d7991392800c 100644
--- a/app-crypt/cardpeek/Manifest
+++ b/app-crypt/cardpeek/Manifest
@@ -1,5 +1,5 @@
 DIST cardpeek-0.7.2.tar.gz 1130295 BLAKE2B c2aec139c8834947dd2e04fe384719bccdbce9b75b24f791136d5afb5873e6e0afb8306ebb2ddf6fa4e8b4cb46078667fae8eb962b425278351172292df6faaf SHA512 9fd1790794b8d092859670bb36a0cdd235e7d098d563032ccdb8143eac00bb77532f1ab918897c4b753afd184079975de34a6f645e31eadb28b6c5a81d344ecd
 DIST cardpeek-0.8.4.tar.gz 1520613 BLAKE2B f31a0298ab8423b384b0ad62abb0599da75fd968385e9e6c9a5982e6fbaf7bec8a6098e3e7a5c30ce6634c65e05db084772f4a33c7ef5d6fdcdee0022cc56b86 SHA512 f6eebc7a17f270dd56529ee36815fee72b2f9d62b24d6cc90060f20c7604b9b99ab76858d9c04c60aaec838b02b8db76476a91ee22a4e10f01f852cd1f536efb
 EBUILD cardpeek-0.7.2.ebuild 528 BLAKE2B 510a780b8ea3528c6d97f099609e50b439858c8eaf71a7f87d3d00b5d95cbdddd38c1ce2dd66c023e8fe1fa48daf48347c5a121a4d62aeb5f6b189ce0d0ad087 SHA512 61930483a3ec7833ecb52775c8bb412ccf566624d433b267a19ca501c23885f9e73df7b50b9336704628cb1630a84b264de48b7897dfd6c27195988ee5175a04
-EBUILD cardpeek-0.8.4.ebuild 601 BLAKE2B 6e7b42b8eda51b962b234ab48c40321a89f29c5023310f67ff96cc8a3c04c730d1996256a2bf3a8a877d35d6a77e7b7cade9a95bd7c30b4a6de3690ea3500bb9 SHA512 f59a786e5fad8598d3ded1c7a7ce0e504395f5a638e1025dafdebe54ba23569e0871c5e6f5e1579cddb4478e497be5e4806d9ca02e1c0bf9e9cf050ecea99195
+EBUILD cardpeek-0.8.4.ebuild 607 BLAKE2B b06e12aa486b40ba7f61e8fbfab1d52f0b47568389a36c65ad45e86431ebd463977c52cd325c04b6b1c38ce966ace6a40620de880ed391828e32d1712c5c56fd SHA512 4dd08041350eaabb3efc0d3fb9da025232783fd2c4128467e60157bcebbea1659a4a9a3e57c9d809a6a979f342f8770686775a9b7d4fa4a66b4929320552a09e
 MISC metadata.xml 167 BLAKE2B e4dadf27fd344484f2bccb5b904909c89aac568c32e5b3c44bdf139eacefd4b4fae74419f503d2b7da0dccc1b68ba05d777d11292c0f89270d1ac5c9c703e8ca SHA512 7c8decb24ee3a850e38186cf3c7f8933a28017426806870ad6ef9ceb2533be147a2681fc789b535a81cb528af8c29d90d3006e4f250aee23bd7dea4561294e33
diff --git a/app-crypt/cardpeek/cardpeek-0.8.4.ebuild b/app-crypt/cardpeek/cardpeek-0.8.4.ebuild
index 7845cde99bb1..502219dfe65b 100644
--- a/app-crypt/cardpeek/cardpeek-0.8.4.ebuild
+++ b/app-crypt/cardpeek/cardpeek-0.8.4.ebuild
@@ -13,7 +13,7 @@ SRC_URI="http://downloads.pannetrat.com/install/${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS=""
+KEYWORDS="~amd64"
 IUSE="libressl"
 
 REQUIRED_USE="${LUA_REQUIRED_USE}"
diff --git a/app-crypt/certbot-apache/Manifest b/app-crypt/certbot-apache/Manifest
index 2cafe9adffbe..d37c5ea79acb 100644
--- a/app-crypt/certbot-apache/Manifest
+++ b/app-crypt/certbot-apache/Manifest
@@ -1,4 +1,6 @@
+DIST certbot-1.10.1.tar.gz 1416402 BLAKE2B e00ba6bf69dbf4bc91be325d4c9ba470214aeef18b4ad4ac5efbf7d077ffa9498e9cff2eff00045bc1024930f95ec56e1773c3a193a982b393caf7ee19f8ccc0 SHA512 332e92dd7d91b9774e55ef8d2c0217a57167a26d1e86d36196fc601b4abb23f40033f94112c4b4bff5f8bc54e1e32ecd68b1f01e7d67bc4fd8f7dd98ce0362cc
 DIST certbot-1.9.0.tar.gz 1425703 BLAKE2B 9bf78824649870b3e1fc3175aae551cbfaa675a8930a89f35ba2330647d86798e4fc43011c617be2d278ab20c43dd05b02e8e61956dd7f9d10d444181874346e SHA512 098d8c077f5760c1f40f7d673820488ad7643c8b9c12561a58921cd95f60ae76515cefc19f822747f3385a68eba6f49fe5484b20142994ef67a26b0b16293ce8
+EBUILD certbot-apache-1.10.1.ebuild 922 BLAKE2B ee7a35a10cef4129f766e2f77a9b32dde4d7c7b6862a2282c6321f0577aaf6f96a426aa57c94394e151d5c714c90597675e00d10fbf88e18eb4a8c19cd193295 SHA512 03f3b715ad49cb358f112ec76cb8ea50d2988de9a2f0c81ae447410fc76e08e1c56686e67e8a28dfb6e9563a8b73e6e2f6d0454bbe0de7d19bea25f05bef45aa
 EBUILD certbot-apache-1.9.0.ebuild 916 BLAKE2B 366995d48952ab5d4b3b1b9afa68561097b9238c2c56a505a49854c0e0c6126d5092d81b1178d4b45ff690194ec3b8de695f4d6b88455559ea3162dcaf2a09e9 SHA512 13ddca2809910b3c044bf725b58d0d728531314b0a02e7dea7836f047469b3e79d9bf38a729c045dc3f096689c10e9f829d44a14bd647e6687021fe9bf24ec1b
 EBUILD certbot-apache-9999.ebuild 918 BLAKE2B fb5b5acbb7373042f8960130f44e384494cfba7786e4964381631da44651c1e0b88f68c331cb1d7aa614e4aeabdc11bfa38bfa15d96af7cc3ad7cf38fd44ac41 SHA512 5b9d2895c2ced803d962aaf2dfffe8e934131b7d1d6bf09169b1df997baac9e992043804e7d7370ea92440d0c40ee5c2946b80a4e4fb3b4ba26c50146986b4ea
 MISC metadata.xml 334 BLAKE2B 4adbd04c0edcc84925da47b32fee63d4652bf2a1bf5222a56e0e1c7cfe8aaa34275a2652c4416f8a80de11fd88217d8626d610fa857f0615f18bfd773a279e55 SHA512 e3d6dda6c44557523fd48b464b6d39fc45b90ba2ecbe03fb300a655973c1b2e654a24d8d381b769eba00d0d80fb5881e1dfec1694e223cd83047abba9f01a44f
diff --git a/app-crypt/certbot-apache/certbot-apache-1.10.1.ebuild b/app-crypt/certbot-apache/certbot-apache-1.10.1.ebuild
new file mode 100644
index 000000000000..b7e449dda5b7
--- /dev/null
+++ b/app-crypt/certbot-apache/certbot-apache-1.10.1.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=(python{3_6,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-dns-nsone/Manifest b/app-crypt/certbot-dns-nsone/Manifest
index 3b5c701fa5da..b13bb0d1ecaa 100644
--- a/app-crypt/certbot-dns-nsone/Manifest
+++ b/app-crypt/certbot-dns-nsone/Manifest
@@ -1,3 +1,3 @@
 DIST certbot-dns-nsone-0.39.0.tar.gz 1350312 BLAKE2B 5f21c45d25754cb1ed0ad92e8d03637928a274637de09903509c7e78c40fd197e95cfa1f3effecef938d6ab8369dc6811714ddb5a93a806048e0998d1032e4f9 SHA512 17ab17a5f74e3fba58b1a8b9afe0c3656c7b2a5ea3585edb05ad84e36250c6a8d4d28bd692bc97d033c95eb0bbeff4eb84981ae0006e36d55846cd38373b86a0
-EBUILD certbot-dns-nsone-0.39.0-r1.ebuild 953 BLAKE2B 596f64848b906959fe7e542e7d61c3462efe35253b67f7cb8f64bd13b4cf386ebb090d5008518b51a713362c4fd81782dc40344094f7631f90c790965f661434 SHA512 e65a292b00f55c5d0bd79e242427ff78012acaed3a391fa3b4f5d97ce367730c7a5e4f03626e0afc4a0ad518a12b5e701a8e10ac43fcf575d42badcc5bcab393
+EBUILD certbot-dns-nsone-0.39.0-r1.ebuild 899 BLAKE2B f2c6ac6220a87fb0333aafc72b4f4522f136294adc37168139a9497d8e3d468d9327baddc3f88c3e34979525fceb65541ed00c0eb939d3819363b4f6753b2019 SHA512 2740c93feb15d4732406089d6795f1d171e5639289a192d42b51a51bf2d5fb8065db405148b94d4a37a94bd38ef7c92aaea49aab9eac7047a32a88a2c185bd9a
 MISC metadata.xml 253 BLAKE2B 7dac7f77dcc8de31f439cc6d7770a503f95be9c2f8ae57df9e725df941e2b31a90a43664a485a5fad9510b9ae060ba7aaaddba29324338dd9eb07d88a63c7dce SHA512 303268e1f46e337e32c64b544c0962ecbe8de1799c42736b3c3515b6f31954a655830c402317bd0534cac12059e17eeb5f360d010432dff795a136662a5c10f1
diff --git a/app-crypt/certbot-dns-nsone/certbot-dns-nsone-0.39.0-r1.ebuild b/app-crypt/certbot-dns-nsone/certbot-dns-nsone-0.39.0-r1.ebuild
index 221d334e171b..3f80a50feaa7 100644
--- a/app-crypt/certbot-dns-nsone/certbot-dns-nsone-0.39.0-r1.ebuild
+++ b/app-crypt/certbot-dns-nsone/certbot-dns-nsone-0.39.0-r1.ebuild
@@ -2,7 +2,10 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=(python3_6 python3_7)
+
+PYTHON_COMPAT=( python3_{6..9} )
+
+DISTUTILS_USE_SETUPTOOLS=rdepend
 
 if [[ ${PV} == 9999* ]]; then
 	EGIT_REPO_URI="https://github.com/certbot/certbot.git"
@@ -23,11 +26,9 @@ LICENSE="Apache-2.0"
 SLOT="0"
 IUSE=""
 
-CDEPEND=">=dev-python/setuptools-1.0[${PYTHON_USEDEP}]"
-RDEPEND="${CDEPEND}
+RDEPEND="
 	>=app-crypt/certbot-0.31.0[${PYTHON_USEDEP}]
 	>=app-crypt/acme-0.39.0[${PYTHON_USEDEP}]
 	dev-python/mock[${PYTHON_USEDEP}]
 	dev-python/zope-interface[${PYTHON_USEDEP}]
 	>=dev-python/dns-lexicon-2.2.1[${PYTHON_USEDEP}]"
-DEPEND="${CDEPEND}"
diff --git a/app-crypt/certbot-nginx/Manifest b/app-crypt/certbot-nginx/Manifest
index 1f87401d3671..a225f7172b9b 100644
--- a/app-crypt/certbot-nginx/Manifest
+++ b/app-crypt/certbot-nginx/Manifest
@@ -1,4 +1,6 @@
+DIST certbot-1.10.1.tar.gz 1416402 BLAKE2B e00ba6bf69dbf4bc91be325d4c9ba470214aeef18b4ad4ac5efbf7d077ffa9498e9cff2eff00045bc1024930f95ec56e1773c3a193a982b393caf7ee19f8ccc0 SHA512 332e92dd7d91b9774e55ef8d2c0217a57167a26d1e86d36196fc601b4abb23f40033f94112c4b4bff5f8bc54e1e32ecd68b1f01e7d67bc4fd8f7dd98ce0362cc
 DIST certbot-1.9.0.tar.gz 1425703 BLAKE2B 9bf78824649870b3e1fc3175aae551cbfaa675a8930a89f35ba2330647d86798e4fc43011c617be2d278ab20c43dd05b02e8e61956dd7f9d10d444181874346e SHA512 098d8c077f5760c1f40f7d673820488ad7643c8b9c12561a58921cd95f60ae76515cefc19f822747f3385a68eba6f49fe5484b20142994ef67a26b0b16293ce8
+EBUILD certbot-nginx-1.10.1.ebuild 930 BLAKE2B 79cf8aeeaa3efab873a55c80e610ee949004d986b4a73459c211d5c5a673c90b0ed411bbffee6093e13ce4d2db05bb690a26c2bac2b166eed72d7cdde9082975 SHA512 623920ccfdb7b9f6dbb8245715483fe371038aa7602c99a5e19c82bd1c985359767c26c3af7e3248926f7804e63a6ca30bfed8591a5353161140da989c4b3123
 EBUILD certbot-nginx-1.9.0.ebuild 924 BLAKE2B d71d8e3d72d3a0f81a12474bcf4a67721b7f02fc4b8209e190cef58da3bcb3010e8b6b3384750aa2359d97950ad0169c8b016629b04b7d66f7668d48fe0d81a2 SHA512 87d6e7a796aa1ef9134fa2e35c63fd95147da73b36f0bdf4f7cb6870a9f42c7721557581aea518e5b39e8b6770f0d8e680b550b93311699b7459ddbf57ed2266
 EBUILD certbot-nginx-9999.ebuild 926 BLAKE2B c42649f6ceaeb670919b8660deb06e3380b4e971e0eedcd44db6c56a9ea88f9698e5c943b989fabcf067e8f716bc648474a5f2ad4a0f987d3e8edebbfe88f63a SHA512 0b959a25ebd24879649357928bbcf24d6de501c068a782b3ca073ba46312502480dc10ae540bd478fd4ed1979abe17dc8ca2461b5fc73686539eeb14b5dc2307
 MISC metadata.xml 334 BLAKE2B 4adbd04c0edcc84925da47b32fee63d4652bf2a1bf5222a56e0e1c7cfe8aaa34275a2652c4416f8a80de11fd88217d8626d610fa857f0615f18bfd773a279e55 SHA512 e3d6dda6c44557523fd48b464b6d39fc45b90ba2ecbe03fb300a655973c1b2e654a24d8d381b769eba00d0d80fb5881e1dfec1694e223cd83047abba9f01a44f
diff --git a/app-crypt/certbot-nginx/certbot-nginx-1.10.1.ebuild b/app-crypt/certbot-nginx/certbot-nginx-1.10.1.ebuild
new file mode 100644
index 000000000000..ad7e21e944ef
--- /dev/null
+++ b/app-crypt/certbot-nginx/certbot-nginx-1.10.1.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=(python{3_6,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[${PYTHON_USEDEP}]
+	>=dev-python/pyparsing-1.5.5[${PYTHON_USEDEP}]
+	dev-python/zope-interface[${PYTHON_USEDEP}]"
diff --git a/app-crypt/certbot/Manifest b/app-crypt/certbot/Manifest
index c6870f189d89..ea29a7de051b 100644
--- a/app-crypt/certbot/Manifest
+++ b/app-crypt/certbot/Manifest
@@ -1,4 +1,6 @@
+DIST certbot-1.10.1.tar.gz 1416402 BLAKE2B e00ba6bf69dbf4bc91be325d4c9ba470214aeef18b4ad4ac5efbf7d077ffa9498e9cff2eff00045bc1024930f95ec56e1773c3a193a982b393caf7ee19f8ccc0 SHA512 332e92dd7d91b9774e55ef8d2c0217a57167a26d1e86d36196fc601b4abb23f40033f94112c4b4bff5f8bc54e1e32ecd68b1f01e7d67bc4fd8f7dd98ce0362cc
 DIST certbot-1.9.0.tar.gz 1425703 BLAKE2B 9bf78824649870b3e1fc3175aae551cbfaa675a8930a89f35ba2330647d86798e4fc43011c617be2d278ab20c43dd05b02e8e61956dd7f9d10d444181874346e SHA512 098d8c077f5760c1f40f7d673820488ad7643c8b9c12561a58921cd95f60ae76515cefc19f822747f3385a68eba6f49fe5484b20142994ef67a26b0b16293ce8
+EBUILD certbot-1.10.1.ebuild 1148 BLAKE2B 09152480cb110bb45e0c133b87e1de40dffaac4e419aac8735f2500121f4fe65da64ce4bfcad4cd91a6f926a5bf6b68620b7dea00a5d9cac5fa33b514f9cf66a SHA512 629c1fec0aea8cde13a635ebd2018e269f119ecd0013dcd5618a12d0bebb6daa4d3ba37967318cfeaee70a2d0dd41823c8bf8ca65db578cf69c261332a69e706
 EBUILD certbot-1.9.0.ebuild 1142 BLAKE2B 1f0f1256a7b81bda66c46a80129489f7f78cd30f53df771ed6fa70182f201baeb2917455fd6d9c7623d9f2b152c838d60a117fd3628436fda24bf69d75be44f4 SHA512 e12effe51a0c174441915ffd4f55dff83e22865fadf92ae6cc045b0fc05fca143dc4ad8ac0a17ccf7c71a18af850dddd60773bce0376e5ac0498b4c598e85f00
 EBUILD certbot-9999.ebuild 1144 BLAKE2B a5fc182ad4c58b23d018d63162641b27381e710d2bd2276ba9f0cdf8dc1a8fb5d222a8f0d6f248c06d70b1687e202e2a938b3176ae152ce22feceb342c7ef9a2 SHA512 6a35d2ce7faed403fb33bd345439371f277ffb2528b37b59f9130a234d4bf0bd166fde6c5e5349903b2cecc991b2deda3f054fb7c011e44094665c3e2901fab9
 MISC metadata.xml 334 BLAKE2B e7b28e7d3e7c6fdce0c5120b29fbf5aa607408e2add6c0ad42e921fb1add9def38c6cb191129a5a6e1f0e3ea119caa6cdc74955b572e5d2c6f854d0b7c7c521a SHA512 a24ccf633fc9c2670dcd35801d95bd8ca0f4ea4d3d53b6651f2e8e3e280b95ec8a464d99f5423942c14b0777ae4551f46c1ff285caea460bc91cbc417a7a5b70
diff --git a/app-crypt/certbot/certbot-1.10.1.ebuild b/app-crypt/certbot/certbot-1.10.1.ebuild
new file mode 100644
index 000000000000..d6f1add60616
--- /dev/null
+++ b/app-crypt/certbot/certbot-1.10.1.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=(python{3_6,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[${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-1.3[${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/ekeyd/Manifest b/app-crypt/ekeyd/Manifest
index b2ef3171ca57..255e8a7c0023 100644
--- a/app-crypt/ekeyd/Manifest
+++ b/app-crypt/ekeyd/Manifest
@@ -11,6 +11,6 @@ AUX ekeyd-1.1.5-udev-rule.patch 2325 BLAKE2B 5617dd160c6f3617bb93dc97755f22c535e
 AUX ekeyd.init.2 699 BLAKE2B 4ce17a42ffc60b49232cc0bb5a19d36fecc55071df699a7ad7da6a49de352a599b8f0f11fc05fa4159d8975245e7b6181e96303182870519a7f57070a6b54da4 SHA512 3c1fe923e6f08d83d02b9559fa5b817e9abdbc97a50815ab01c7c17e3e953f54701eb1110340dc164bb67ef67905041054cd4fc98c11ea5932a539f4330c8b71
 AUX ekeyd.service 157 BLAKE2B d7976301d7eb0d9be05de574f3b25c13ed3767629dff7024e7621a2d29686045cfd7664e2127a87b92d32e719b470a2795159e45c310bfdcfffa75897341213f SHA512 1082a1dc58b820882015c4f09d5154691d9d8810bfe953049a6853ea5025ec7cff2377ee931ec8ceef295241083c162e582a75fd0b134f7e8789f6d470285445
 DIST ekeyd_1.1.5.orig.tar.gz 101366 BLAKE2B 7edd6d291f7553864c9aa96ee3d9533e33b6c94989b2c6b1a56eda42f61afe1633af5e7c3c8f5f57920ac0577f8567d1b09238eae35138ab2023600f01096466 SHA512 c30620d5e54a49929be72ed04448a4f08eb9658dbf7534586c49a3b43bdd5fc95a0659e09cc04b012c339ca20a1e914fa5a4b4d970171c46b64235f284516b9a
-EBUILD ekeyd-1.1.5-r1.ebuild 4787 BLAKE2B a7c0dca3f0eb471b061884e3898f254bf7f186d5cc0c70f93a1421248616ebbddeabaec1d802291ee64a4edbcb8a056fabc9775de839890e36e5a111f28269aa SHA512 99b54a375305242dd898cd62bcf1684f93ed3b9b3fb23504155dbb0c941df4c7eb309ccadb030a9fd7a52c4db74bd3c34bc0a245bf4144bdf23da86776a3501c
-EBUILD ekeyd-1.1.5-r100.ebuild 4907 BLAKE2B aee773b503a180067973c06da3248f6ac315acdae9e6b53b07f76dd30fe08ff3f26c150fa490411abc5f63135487fd51b8186897a0a8494bd0e757d3cfdbc0a9 SHA512 00b228d5c04b5db68f49489d45150126c8582f63d9f1dddc1690f3f1b70b4e3565a8a147ae44efd820e78d173fe58327c46f2f227ceea7d0d9fbdab010a7f626
+EBUILD ekeyd-1.1.5-r1.ebuild 4778 BLAKE2B 650a54d579ff416ed6895bc5a64c609df3ff3e0a0d4ec4ed7931a21c36480bf11e1a7c8b3e0ba74b84cf65367c5a1bb49da64811a9a310bb68972c342ced3826 SHA512 23deb8bc56f3d582c81cd67588fa3bdf9cbddf44a024e8d826836b332c2c70d6302d9100fe5d01b3a8629ad114c1b68c055bd66e6965132ead0072b473b00614
+EBUILD ekeyd-1.1.5-r100.ebuild 4898 BLAKE2B cfef82e459b492409b1e4622d17f10806c924017922437d3229db2c583aa1f1f03330418a24cd13d127c7be41df113aebef99a69df75cb905072b9ab6c8281bd SHA512 c4d880416c9fbbcac5f45d3f2a039b256ec900873079ba9a0f3e570b4c15b9e08fc19872ec297f6a6b5fd1b19f362820fbea92543208ebd3e1fe17ba1fad427a
 MISC metadata.xml 775 BLAKE2B f20c01d6a705492bfeeb4788f3f2950ac5f3a012abaaacb4e526ff7b5685475515c229f8c14ca7961ad946497a3636d02e6a9e4ee4e6bedf5cbeee39af6c4a27 SHA512 7a202bbf5b18e938f16ecb0773fdb80ec72d00d3d88f396632e552cfa3c7e7c4104362e34aec356833800833b7b531d9694906dd1174ee76f06ad8ef09758b03
diff --git a/app-crypt/ekeyd/ekeyd-1.1.5-r1.ebuild b/app-crypt/ekeyd/ekeyd-1.1.5-r1.ebuild
index 7816044711fd..afdd149626dd 100644
--- a/app-crypt/ekeyd/ekeyd-1.1.5-r1.ebuild
+++ b/app-crypt/ekeyd/ekeyd-1.1.5-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit multilib linux-info toolchain-funcs udev systemd
+inherit linux-info systemd toolchain-funcs udev
 
 DESCRIPTION="Entropy Key userspace daemon"
 HOMEPAGE="http://www.entropykey.co.uk/"
diff --git a/app-crypt/ekeyd/ekeyd-1.1.5-r100.ebuild b/app-crypt/ekeyd/ekeyd-1.1.5-r100.ebuild
index 7bec76200631..c3a1d948e95b 100644
--- a/app-crypt/ekeyd/ekeyd-1.1.5-r100.ebuild
+++ b/app-crypt/ekeyd/ekeyd-1.1.5-r100.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 
 LUA_COMPAT=( lua5-1 )
 
-inherit multilib linux-info lua-single toolchain-funcs udev systemd
+inherit linux-info lua-single systemd toolchain-funcs udev
 
 DESCRIPTION="Entropy Key userspace daemon"
 HOMEPAGE="http://www.entropykey.co.uk/"
diff --git a/app-crypt/gpgme/Manifest b/app-crypt/gpgme/Manifest
index c26df0c5d30d..233d6c871bd3 100644
--- a/app-crypt/gpgme/Manifest
+++ b/app-crypt/gpgme/Manifest
@@ -6,5 +6,5 @@ EBUILD gpgme-1.13.0-r1.ebuild 2673 BLAKE2B ff54cdd1d4b54b3c63d7beca5a05487fabb71
 EBUILD gpgme-1.13.0.ebuild 2667 BLAKE2B 2a6a8ecc4e3dfa56a2f8fbc7a57b9ffa122eef195aa282a1d39acf604c5919e0cf8799eb428f541e549e567b07407bd06f3edfab6b6c0281a514da9124e39c5e SHA512 46cd9d29817cf74edc9e4b55696851cc3723ae8b718edeae012515e7be42c1cd91bc711a7b7255a792c1f4369931b5f3b5c52240fe5af2eaf86d5f2c32574b0f
 EBUILD gpgme-1.13.1.ebuild 2675 BLAKE2B 01bdd7bda6982fa4c4ad37f5a18c5b6c36fd8abc66e2905557abeb85dd3cd4d48368e8632789bbd0969a9831e6bebcff679674353e0d045ce9d1693958467e5d SHA512 212e51b8c18150a14ad83a547fa98153d7368da321e28d2b2b6e97a1f49437bda6072d9919d8c01b593fdcd44a0a813b6a5314cf92736a34a98c1e28cc4ef473
 EBUILD gpgme-1.14.0.ebuild 2678 BLAKE2B 5e104080342a978e227d62de4bd52495676a7d47131cf52e45ebe0648f786b9e5522cd1c919238693755896a5988d519d969bc6b0d94bc46311df2e98350a042 SHA512 0d9f2e3e411ba8851ff433246712e6822340bd44794b815eb9399f22188a514293377605f592dac2e720d3dd25539867fbeb933d98d308cc68c333362dfd981a
-EBUILD gpgme-1.15.0.ebuild 2686 BLAKE2B f7e77ca589bff5e3d943d55d9bd9f4cfb055be99356d54be0a51d42d126cdaa44f70e1b1a4e7712a2191335b1ee0704e1b4cef04634b2327f2c2ec41503f4b49 SHA512 3af6b06788bd82b2a88666a2da5a283201a5b574070233191294e144354b1f16777b0ad78c7cfd982cac71388e64c9b7279bbeb345f02167a315e832731bb182
+EBUILD gpgme-1.15.0.ebuild 2692 BLAKE2B 77c3e8ad4d04ecfe24859d03e00c34b46cde1d759368aa85a9d63494b6cfff5fb850b6082816a559c6d7fff09548818bdda0279da3116dcab96dbff33f709d3f SHA512 97b2402689def522e27d039a1cba316932040aa6cfc337216ddb341038d03682ce598c909467d984cd71b3c46736d721ed56bcbcc03ac315a4e1fb4648efde86
 MISC metadata.xml 326 BLAKE2B 982fe6e2ae0b6ce81980b477a39341c363c867202d646ff4acc9fb361785026919cc0de914e0deee67b79441115cea8a8b36f095d4719442f527f1a0d3ba06b8 SHA512 1223f3cdd325623e524c5bf46bea592b6930bdcc2ba40f9ebf27e568c6a527f59c8315194e4ffd70c29b778d25a2e2b8f57282d5e788814d3fbbcb1de4cf6334
diff --git a/app-crypt/gpgme/gpgme-1.15.0.ebuild b/app-crypt/gpgme/gpgme-1.15.0.ebuild
index 9dc577ff560f..d1f20d53c008 100644
--- a/app-crypt/gpgme/gpgme-1.15.0.ebuild
+++ b/app-crypt/gpgme/gpgme-1.15.0.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 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-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 ~x86-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/libsecret/Manifest b/app-crypt/libsecret/Manifest
index af0bfd93d35c..23193b8150e0 100644
--- a/app-crypt/libsecret/Manifest
+++ b/app-crypt/libsecret/Manifest
@@ -1,5 +1,8 @@
+AUX libsecret-0.20.4-meson-build-test-vala-unstable-with-DSECRET_WITH_UNS.patch 1316 BLAKE2B 0c0fb8c10d869ff98d0644067336e54f907904ed8c4899e58e5d65aa84406442a550a6d4d6939cc34d5f6a80ec5d1d96dc7dcc91e44e955a8eef9b272f2fef6f SHA512 e2e4474a2af3e6f8a5bde2eff58417991b3d85f3042fe77776815f86567094168ca01c25f101cbc82a5f66573b1bc4592e6dee6b1be082fb8ec612c1394a7ce9
 DIST libsecret-0.20.2.tar.xz 526224 BLAKE2B cae93962480f65d2c91b1c26a23321d19c256692754ef37c658e346a6cb6b91cdebe134516c3c8652c5ee502b8f7a070a8d519ed878b2f6dfc124ea7b032613f SHA512 89143c8ccc8f6fa0cda2c98baef92e8cbf9b319a984826a09c527125e14712023ee65cada42a2c9232524528da8c1c3d2235ecbcb93e2f06e94121a601c22857
 DIST libsecret-0.20.3.tar.xz 526388 BLAKE2B ae2e64af61c269eb109fa7840cc7ff2362ac69eab4b452074c2cb3a80b26cc88e8d341a7649e0f16fa73541943d968dfbd6f3cc802d99a37f3a7d91e8b20cfe3 SHA512 020e1954e0965f33ee15f35e1f439b6c1650322a9112078f7a3e265cee83ad99d217ae3b363fbadc06c5cb0941f7e544d91da72e5be1c6b96992c071e6170c22
+DIST libsecret-0.20.4.tar.xz 529916 BLAKE2B d5922dcb1eb27e4cc6bc7770926fc3191c9f4634867ff9682fd33f9373d6fa2d334c9c1b995bd208bbf178af008ec7b224bd5388427617fbd7e48d05d2e35823 SHA512 599482796af001703c25d181a710c5a3207f44d4d0036ef2001cc541bde9ef453172b71df9bb214d27d1fbd2f28c1b5a5efdbd5faca3561188c07dccdc7d7c15
 EBUILD libsecret-0.20.2.ebuild 2636 BLAKE2B 6083e45d12586eb27132f69e3c196bee711d50738e2367a4b2e87eac0b8279d919c38ffab902e608d1bb074c59ce2817caf295cfc1c53f031403b15cfb83869d SHA512 501a7d8853cb3698e558b5cb3307a40d2dbf00820ee8da2163d73de5900c6d5a84c3a1e2aacc0e0f66cff4633a9c6499e3d5707dda0c1a8d2d2769e1899e9f58
 EBUILD libsecret-0.20.3.ebuild 2636 BLAKE2B 6083e45d12586eb27132f69e3c196bee711d50738e2367a4b2e87eac0b8279d919c38ffab902e608d1bb074c59ce2817caf295cfc1c53f031403b15cfb83869d SHA512 501a7d8853cb3698e558b5cb3307a40d2dbf00820ee8da2163d73de5900c6d5a84c3a1e2aacc0e0f66cff4633a9c6499e3d5707dda0c1a8d2d2769e1899e9f58
+EBUILD libsecret-0.20.4.ebuild 2583 BLAKE2B 9a3253c0643cf3b2f77d18e398a8a507c3ca0a85533bfa0236f04d3053f2a35b07525482927330c3576a5601078a14b1d6364b2f71d3eb5d836d98f713dd6e27 SHA512 8486570dc6f01ad4b5a2cc01d9f6d79290db616f8d04073456255ff042f51bc9ec2464c60f61db93f0f376d203720980aaca29367f3b8035428a3b58f00bb607
 MISC metadata.xml 253 BLAKE2B a1efbd3751efaa83ee173f557ec1c8a4497a90b60896cf5a7a07da40b4f94a7a299ca0385477e82b2f5e5dbdf9afa482ccbe21f35ef44214e9c451d764b65529 SHA512 8d59f413993268ca783f7407b676900bb2d964754bf705d4175e2bafbe058a52af74f3928e4bd84d292518f8cf13fab7051486ab7cdc61d02fae6e0188d44442
diff --git a/app-crypt/libsecret/files/libsecret-0.20.4-meson-build-test-vala-unstable-with-DSECRET_WITH_UNS.patch b/app-crypt/libsecret/files/libsecret-0.20.4-meson-build-test-vala-unstable-with-DSECRET_WITH_UNS.patch
new file mode 100644
index 000000000000..99e5f6902e5d
--- /dev/null
+++ b/app-crypt/libsecret/files/libsecret-0.20.4-meson-build-test-vala-unstable-with-DSECRET_WITH_UNS.patch
@@ -0,0 +1,44 @@
+From 92fe125ee1b9f36bd69308c173e9d6147a5fc1e1 Mon Sep 17 00:00:00 2001
+From: Matt Turner <mattst88@gmail.com>
+Date: Thu, 10 Dec 2020 23:19:55 -0500
+Subject: [PATCH] meson: build test-vala-unstable with -DSECRET_WITH_UNSTABLE
+
+Fixes: https://gitlab.gnome.org/GNOME/libsecret/-/issues/54
+---
+ libsecret/meson.build | 12 ++++++------
+ 1 file changed, 6 insertions(+), 6 deletions(-)
+
+diff --git a/libsecret/meson.build b/libsecret/meson.build
+index f57e363..55e9d95 100644
+--- a/libsecret/meson.build
++++ b/libsecret/meson.build
+@@ -310,12 +310,12 @@ if get_option('introspection')
+     add_languages('vala')
+     valac = meson.get_compiler('vala')
+ 
+-    valatest_names = [
+-      'test-vala-lang',
+-      'test-vala-unstable',
+-    ]
++    valatests = {
++      'test-vala-lang': [],
++      'test-vala-unstable': ['-DSECRET_WITH_UNSTABLE'],
++    }
+ 
+-    foreach _valatest : valatest_names
++    foreach _valatest, extra_cflags : valatests
+       test_bin = executable(_valatest,
+         '@0@.vala'.format(_valatest),
+         dependencies: [
+@@ -327,7 +327,7 @@ if get_option('introspection')
+         ],
+         link_with: mock_service_lib,
+         include_directories: config_h_dir,
+-        c_args: test_cflags,
++        c_args: test_cflags + extra_cflags,
+       )
+ 
+       test(_valatest, test_bin,
+-- 
+2.26.2
+
diff --git a/app-crypt/libsecret/libsecret-0.20.4.ebuild b/app-crypt/libsecret/libsecret-0.20.4.ebuild
new file mode 100644
index 000000000000..c29109aa42fc
--- /dev/null
+++ b/app-crypt/libsecret/libsecret-0.20.4.ebuild
@@ -0,0 +1,99 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{6..9} )
+VALA_USE_DEPEND=vapigen
+
+inherit gnome2 meson multilib-minimal python-any-r1 vala virtualx
+
+DESCRIPTION="GObject library for accessing the freedesktop.org Secret Service API"
+HOMEPAGE="https://wiki.gnome.org/Projects/Libsecret"
+
+LICENSE="LGPL-2.1+ Apache-2.0" # Apache-2.0 license is used for tests only
+SLOT="0"
+
+IUSE="+crypt gtk-doc +introspection test +vala"
+RESTRICT="!test? ( test )"
+REQUIRED_USE="vala? ( introspection )"
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+
+DEPEND="
+	>=dev-libs/glib-2.44:2[${MULTILIB_USEDEP}]
+	crypt? ( >=dev-libs/libgcrypt-1.2.2:0=[${MULTILIB_USEDEP}] )
+	introspection? ( >=dev-libs/gobject-introspection-1.29:= )
+"
+RDEPEND="${DEPEND}"
+# gnome-keyring needed at runtime as explained at https://bugs.gentoo.org/475182#c2
+PDEPEND=">=gnome-base/gnome-keyring-3" # to avoid circular dep (bug #547456)
+BDEPEND="
+	dev-libs/libxslt
+	dev-util/gdbus-codegen
+	>=sys-devel/gettext-0.19.8
+	virtual/pkgconfig
+	test? (
+		$(python_gen_any_dep '
+			dev-python/mock[${PYTHON_USEDEP}]
+			dev-python/dbus-python[${PYTHON_USEDEP}]
+			introspection? ( dev-python/pygobject:3[${PYTHON_USEDEP}] )')
+		introspection? ( >=dev-libs/gjs-1.32 )
+	)
+	vala? ( $(vala_depend) )
+"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-meson-build-test-vala-unstable-with-DSECRET_WITH_UNS.patch
+)
+
+python_check_deps() {
+	if use introspection; then
+		has_version -b "dev-python/pygobject:3[${PYTHON_USEDEP}]" || return
+	fi
+	has_version -b "dev-python/mock[${PYTHON_USEDEP}]" &&
+	has_version -b "dev-python/dbus-python[${PYTHON_USEDEP}]"
+}
+
+pkg_setup() {
+	use test && python-any-r1_pkg_setup
+}
+
+src_prepare() {
+	use vala && vala_src_prepare
+	default
+
+	# Remove @filename@ from the header template that would otherwise cause
+	# differences dependent on the ABI
+	sed -e '/enumerations from "@filename@"/d' \
+		-i libsecret/secret-enum-types.h.template || die
+}
+
+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_multilib_native_use introspection)
+		$(meson_multilib_native_use 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/openpgp-keys-django/Manifest b/app-crypt/openpgp-keys-django/Manifest
index 6e4c1170a095..388130d5b694 100644
--- a/app-crypt/openpgp-keys-django/Manifest
+++ b/app-crypt/openpgp-keys-django/Manifest
@@ -1,3 +1,5 @@
+DIST ABB2C2A8CD01F1613618B70D2EF56372BA48CD1B.asc 6888 BLAKE2B 2782b48f59abbc1caed8f91ea0ba5ad85edf921628bc8b3a56b3b71020e88693657ada02dddf1d667a2005b59751c4dcd27bd1950edf90dd50760822b8857923 SHA512 7c814596f1818a83ab5dd5ae781a2323b4a3fe3f1c21c6b8152d76c29366d0a1be50e0d4584307ba52cf0252245385ad138a01a6c99d8c071482c9c3f1dd461b
 DIST FE5FB63876A1D718A8C67556E17DF5C82B4F9D00.asc 5710 BLAKE2B 92cc184b779e7279f5e11d579ea12d604f955f4b422c6d7a58436567130cacfe138765cf76217ff6790fcf2a27dfd70d25a7b38911630a9c7d74c0e7d079bfe4 SHA512 8edfe3db0dd77feb52ee8683db103f3c0b2c87adac52047dd66f17e956227a9a2378a182351cf2d761645e3e755795528896f4e82f1c85aa77331a1f1a38de6e
 EBUILD openpgp-keys-django-20201105.ebuild 640 BLAKE2B 42d9e498b9e1f629046a2f213ee9a8e144c09d790bf60dce9129a85a5511072f878d8c5f512b65db223a391056fa10086978b58fcfbc23877b69e368239fa84b SHA512 4394f34ea3be333e533f1ca0a0e2a04cb18a8f7e088328597153ec9d3bba270c9b7daf6bb2a694b381521c411487942684a6dd21e8e4b41ae9ea03635b5391f3
+EBUILD openpgp-keys-django-20201201.ebuild 783 BLAKE2B 96a3f3a880b1c65fa720e17ed669eb3cc91bc19de59e62434ee7d15ed25ac2d2c03dc373cb25293e0650590440aa3de7a3ed6861198af3b4b96a7c15b0eda1d0 SHA512 16ec2470f9a5b48df1f1b5845f4b0997e7ec07eb19de02db5540f77643316514bdc41e34af2cffaade1397c5f41cfe3092c52490c2bb04a1943310509ee69ac2
 MISC metadata.xml 247 BLAKE2B b1be080032e657afc879ab3aaa222f493f548e83f31b4d760ed187eb47a7063e725e4d4c38ec73891d530e6ac8480aa69a659039bc9bb259981d2c7af3a7decb SHA512 5a4c7eac292be21b8ade871e7e31f73bd55c1f39220b457ee5ab021e85a3063bc913f33b4c36f4da97a038c786ce63ab43ccf4dccc9ae4da7596ae1c5bc8e709
diff --git a/app-crypt/openpgp-keys-django/openpgp-keys-django-20201201.ebuild b/app-crypt/openpgp-keys-django/openpgp-keys-django-20201201.ebuild
new file mode 100644
index 000000000000..89d87a7ac86d
--- /dev/null
+++ b/app-crypt/openpgp-keys-django/openpgp-keys-django-20201201.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="OpenPGP keys used to sign Django releases"
+HOMEPAGE="https://www.djangoproject.com/download/"
+SRC_URI="
+	https://keys.openpgp.org/vks/v1/by-fingerprint/FE5FB63876A1D718A8C67556E17DF5C82B4F9D00
+		-> FE5FB63876A1D718A8C67556E17DF5C82B4F9D00.asc
+	https://keybase.io/felixx/pgp_keys.asc?fingerprint=abb2c2a8cd01f1613618b70d2ef56372ba48cd1b
+		-> ABB2C2A8CD01F1613618B70D2EF56372BA48CD1B.asc
+"
+
+LICENSE="public-domain"
+SLOT="0"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86"
+
+S=${WORKDIR}
+
+src_install() {
+	local files=( ${A} )
+	insinto /usr/share/openpgp-keys
+	newins - django.asc < <(cat "${files[@]/#/${DISTDIR}/}")
+}
diff --git a/app-crypt/seahorse/Manifest b/app-crypt/seahorse/Manifest
index 99056deb5340..79f6218da904 100644
--- a/app-crypt/seahorse/Manifest
+++ b/app-crypt/seahorse/Manifest
@@ -1,5 +1,5 @@
 DIST seahorse-3.34.1.tar.xz 1271616 BLAKE2B 64956d0ee4f15bc048f42cefd827aad91927b34eecf4a2e53d988c379b3eae1ce0ae29ef469c2ff80ec9cceeaf77a271c57e28cb98dd24ae55c048faff487c1d SHA512 d2dff7d73a0968c1a5a8d39460f08b67f6794f22812200f564ef719354ab5cc2dac2213cba0d4bc10a455aecb9f55de8ff39943db4482beaac9cfdc2ca1012b8
 DIST seahorse-3.36.2.tar.xz 1695824 BLAKE2B e4efb20f952e879b0ff17a9c8664ba61d10c69e377a2fdda52904a8bf5c026d147f9feb9b55c07982f256b366f756dd1567a522d89969c8c5c461f653a130676 SHA512 6a0cb7847fe9917d6d6da31f9b81a4737e425d451fc80604d8e3deb9fa57798f04aa577dae68bc156a15743975f74fbde5ff06a0b05b34228bdc9ef2539b6451
 EBUILD seahorse-3.34.1.ebuild 1556 BLAKE2B d74e2df94472048b48c8df990860d8848bae46774e26184528d5e04ee3de032262c943db32c55177c72d989c49c37ca129dbe93be29bc3cf24d609ef1b63f879 SHA512 9a4c566f6b3801ca42d0dcca75fbd6fdc3efb1a2bd712d5dc1b33d123fecf2b879b4906c127754a79554fcef8aff3c026b078e519648ee1ca03b43d763f5b4d2
-EBUILD seahorse-3.36.2.ebuild 1611 BLAKE2B 470d4458006d5e5359099c5a6967245b39fa3ef45b7f1c0f7680b399e31520bfdc0f86e830c779fa0e09e1ca22a6336c65b26a89a05d204cfbc0dd81c5c1b8a1 SHA512 e701ac22c7246f8b75214281f6c31db30f9f46fcb4b249166eedb70ad822b12b98e7864e154a74288f2cc3ac1ad4d81e79425b721a67d829fe1435a6407bbf7c
+EBUILD seahorse-3.36.2.ebuild 1618 BLAKE2B 0a6b8f2c2636a209580a4c11a702a37dbbf9ad1b3d764ee0126cad75d23acc6af35feed10d4f9c9f00018ba2dd7b04e7077c0161e66841f772d7704d5126b104 SHA512 c70e2995d082a7c71a2743060d11b8020d33f82e8edaa6102629e70432302bebb579aa61543ac2adff977a3fe9dd86dcec6f780c825042bfb735a326c27f351d
 MISC metadata.xml 742 BLAKE2B 11cc6cebe3f395ccd9f2570a419e812951287d7a9af2bd88720a66c7349305c108c451b67a33f9a6da0c82d7b0731ca74980dd7515db3d167993008633973a6f SHA512 cf7cceeaedb1fdb503def974d945a7a5d38a95105dda77f7e917abcec8ce823b461bf3cd1ab5f1a458de859e48a4d58abde71a5a4599685772936eb3525ae3af
diff --git a/app-crypt/seahorse/seahorse-3.36.2.ebuild b/app-crypt/seahorse/seahorse-3.36.2.ebuild
index 38e02be066ef..0634a6142013 100644
--- a/app-crypt/seahorse/seahorse-3.36.2.ebuild
+++ b/app-crypt/seahorse/seahorse-3.36.2.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://wiki.gnome.org/Apps/Seahorse"
 LICENSE="GPL-2+ FDL-1.1+"
 SLOT="0"
 IUSE="ldap zeroconf"
-KEYWORDS="amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86"
 
 RDEPEND="
 	>=dev-libs/glib-2.44:2
diff --git a/app-crypt/ssss/Manifest b/app-crypt/ssss/Manifest
index 49e54af6e6d9..f5f6d21c3ede 100644
--- a/app-crypt/ssss/Manifest
+++ b/app-crypt/ssss/Manifest
@@ -1,5 +1,5 @@
 DIST ssss-0.5.6.tar.gz 20128 BLAKE2B d42fff5878e2ebcc62cd86b86f0f8a3e522c089cbb5e8fb2585cf375ff133da7d9ccf00e62cc6888e00abe5d64f87ac19ddbb3f6e6a0d86913e6a6aa5a8a1d4c SHA512 964af01610a7a269d19ae1fa1712ef12ca1afab02636ba83dd84ec5aeb185210a1247d932ee39d2869aa76e54ffb051d802800d295d17355d6fe2a8010edd509
 DIST ssss-0.5.tar.gz 17435 BLAKE2B 76aae463ce11341f8b0336526f7d19c9921025cabc05bc9e00005b0bdeb676ed5e069226962232f277de2fecb1cd71bafbd4b2fa0c03ef4faf0f66daa24599d1 SHA512 be8df1666ac61d4097b5fd54f2cee3640db8f85ec21411f1b208a35b671c5699bc692079525d8d313d1cf2500da31bfb03771829a9fdccc0bb6d806749526ec9
 EBUILD ssss-0.5-r1.ebuild 774 BLAKE2B 08fa8b0d2c88ba22cb3a74bd728a32c2e54ff9cd92b88c8345e407b035bc2916f547ed18ab90d76efb401e6cd7aa015f0262bdb9b9629039091aef5c19725dd6 SHA512 364456d49bf4625c632e42dfee4013b84cb4dee6df747b113dcc11362c4bbb9cbbc2c5b460411986c751c4fd0a4c34a288464b383601bc2eb6c331ad295224f8
-EBUILD ssss-0.5.6.ebuild 810 BLAKE2B 353efe544e4d85bf4cb3d7c400fbb9c9d351efd30aa50a276838db169add2c5c2ff01dbe742722c96dd65cef569314111305a65874422b803efda80f55274b29 SHA512 f1133c11c1c54777ab0ece70c2dabcec82cd599ba95c063648255aad6aeb2d55d6876bbace45d3aa754b08b4c1a8795bba443538aeaea7c56e86724422765efe
+EBUILD ssss-0.5.6.ebuild 809 BLAKE2B 5025aae75562b85423ff9996c9a83da107ea53bd0e0e0485ee86a35094c64705171ee82471a99ef89ddbe896f4ad36f908ac72c78ea01f90b812462ecd2112aa SHA512 e686cfc6579e2cafa17bf03d8d03a11cae0306f16dff410792cdd8bc4dcbae1ddb6a4c8693bb1021c5d8deaa2abe45fb2ff1cc6f454cc5e920af97eeca2730b4
 MISC metadata.xml 571 BLAKE2B 8e5b2a9efdbac1e9cf15c2e7c60e6c6a9c41300a6ec65df5751043ac85536ba31ace97f033aac89e47f9792b8003c134e1b8a8c3af6513e3406e38027d413e42 SHA512 daebb2e758087ee3cb49c5c89c0bafe3bdf57e2f7c3b64e1053e465b765ad8e95594065a7e236cf8072a406f7d92702a84807393820fcaec26ff29bee73ceff6
diff --git a/app-crypt/ssss/ssss-0.5.6.ebuild b/app-crypt/ssss/ssss-0.5.6.ebuild
index 724f2c160f99..89420c41084e 100644
--- a/app-crypt/ssss/ssss-0.5.6.ebuild
+++ b/app-crypt/ssss/ssss-0.5.6.ebuild
@@ -12,7 +12,7 @@ S="${WORKDIR}/${PN}-releases-v${PV}"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 x86"
 
 RDEPEND="dev-libs/gmp:0="
 DEPEND="${RDEPEND}"
diff --git a/app-crypt/veracrypt/Manifest b/app-crypt/veracrypt/Manifest
index 199353069d6b..666c28744320 100644
--- a/app-crypt/veracrypt/Manifest
+++ b/app-crypt/veracrypt/Manifest
@@ -1,4 +1,6 @@
 AUX veracrypt.init 384 BLAKE2B 0325852e3bb9d8427298c46b0e7caefb1f62d957a158c8a6f898c6609c0363449ef5f48c9cd5a1092efbd9d2e1077a6218bdbebacebde936afc40ec3bfd0b3eb SHA512 574b18b7cbc5f4ea71bb35ec3343af5bdcc7848801decf3b93157bc4fde44ca5daec01847e3ff9f3a638b297f33023ea46a0ada5cc64bab0d14cbe12b93b66ed
 DIST veracrypt-1.24_p7.tar.gz 25113248 BLAKE2B 8ead3325ce6fadf4ca8211ea45daaa82a655f29006f224235f44200839289d42fabe84da2e731fc6a169a7d157535c719b2cd9294524e68532c0065e41ed733c SHA512 d149736d4d6740a89bfce892f44757600c6411776b471a208a75b4573bbc6125535ef1b68c2f55903ff82f4d0fff13b8b07d3cf15c7a301c39158aefffc29e17
+DIST veracrypt-1.24_p8.tar.gz 25116825 BLAKE2B fccab3e7de7637f6f3a7f448a9dcc6671198ea6155e8f6741844c5bd844819c639f968e4cc6e13c274c90f2ba8e540a020b98cb12617a109d5911ce8dd9cb991 SHA512 16139d055e2b2dda6c38ecf156cf5d15cd4788253fe0c85e42050eafd8afbd5c5908e590e53a7b5220767ebbb3b9e81d0049a910b322e42f1c29d2c131bd29d0
 EBUILD veracrypt-1.24_p7.ebuild 2538 BLAKE2B 5860c80d59157f5eb10a6017d837a7eaaf746aba035760b3d4a03bfa00f53fed9b62e83c706ff729a7c873c71cf80ef32eba7269b75c9a9ea5d4d3eb14e20094 SHA512 ecb74dbd33d71828558fab05e246cd7d2bda552f3b9998ecd97b5259a3cee54fb8fb3fcf1b75399fbd41c3d308e91d3f188795baffb7f5284561e9bd3a0856e4
+EBUILD veracrypt-1.24_p8.ebuild 2546 BLAKE2B cc1835c653518e616f0a415009c96b25bebeab934ebf6dfeba3f4e05431bd5b138069a1a2119e22cc7c8dfd929df23ee4956956adef6a0f59ab4c2cf991f4fc0 SHA512 c67b6f4377618b21a1c40caff13d4c33146351c2b7f9ede33d6b4c91f288de56b9544338c4847faea5253df5b837b86054639979b761c6fad1a661b8df1ed520
 MISC metadata.xml 399 BLAKE2B a7d22abada8009869e82b80f8b2274e1acc2fb1488d584c9d730f231057519404445a0d048ad70a47f7d946bc987f836fdfd87da296537a307e234175e521acc SHA512 ac0676510d8d2ac2430dd244ed5e4d18de1cbb7050563fcdd46fc8511c9813dc3609565a6c071f75d9cd26e73c1f453cc8cf9b9b47e0822bd93548a8baaf62ca
diff --git a/app-crypt/veracrypt/veracrypt-1.24_p8.ebuild b/app-crypt/veracrypt/veracrypt-1.24_p8.ebuild
new file mode 100644
index 000000000000..3e0f7086fe38
--- /dev/null
+++ b/app-crypt/veracrypt/veracrypt-1.24_p8.ebuild
@@ -0,0 +1,101 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit desktop eapi7-ver linux-info pax-utils toolchain-funcs wxwidgets
+
+MY_PV="$(ver_cut 1-2)-Update$(ver_cut 4)_MacOSX"
+DESCRIPTION="Disk encryption with strong security based on TrueCrypt"
+HOMEPAGE="https://www.veracrypt.fr/en/Home.html"
+SRC_URI="https://github.com/${PN}/VeraCrypt/archive/VeraCrypt_${MY_PV}.tar.gz -> ${P}.tar.gz"
+
+# The modules not linked against in Linux include (but not limited to):
+#   libzip, chacha-xmm, chacha256, chachaRng, rdrand, t1ha2
+# Tested by actually removing the source files and performing a build
+# For this reason, we don't have to worry about their licenses
+LICENSE="Apache-2.0 BSD truecrypt-3.0"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="+asm cpu_flags_x86_sse2 cpu_flags_x86_sse4_1 cpu_flags_x86_ssse3 doc X"
+RESTRICT="bindist mirror"
+
+WX_GTK_VER="3.0-gtk3"
+
+RDEPEND="
+	sys-fs/lvm2
+	sys-fs/fuse:0
+	x11-libs/wxGTK:${WX_GTK_VER}[X?]
+	app-admin/sudo
+	dev-libs/pkcs11-helper
+"
+DEPEND="
+	${RDEPEND}
+	virtual/pkgconfig
+	asm? ( dev-lang/yasm )
+"
+
+S="${WORKDIR}/VeraCrypt-VeraCrypt_${MY_PV}/src"
+
+pkg_setup() {
+	local CONFIG_CHECK="~BLK_DEV_DM ~CRYPTO ~CRYPTO_XTS ~DM_CRYPT ~FUSE_FS"
+	linux-info_pkg_setup
+
+	setup-wxwidgets
+}
+
+src_compile() {
+	local myemakeargs=(
+		NOSTRIP=1
+		NOTEST=1
+		VERBOSE=1
+		CC="$(tc-getCC)"
+		CXX="$(tc-getCXX)"
+		AR="$(tc-getAR)"
+		RANLIB="$(tc-getRANLIB)"
+		TC_EXTRA_CFLAGS="${CFLAGS}"
+		TC_EXTRA_CXXFLAGS="${CXXFLAGS}"
+		TC_EXTRA_LFLAGS="${LDFLAGS}"
+		WX_CONFIG="${WX_CONFIG}"
+		$(usex X "" "NOGUI=1")
+		$(usex asm "" "NOASM=1")
+		$(usex cpu_flags_x86_sse2 "" "NOSSE2=1")
+		$(usex cpu_flags_x86_sse4_1 "SSE41=1" "")
+		$(usex cpu_flags_x86_ssse3 "SSSE3=1" "")
+	)
+
+	emake "${myemakeargs[@]}"
+}
+
+src_test() {
+	"${S}/Main/veracrypt" --text --test || die "tests failed"
+}
+
+src_install() {
+	local DOCS=( Readme.txt )
+	local HTML_DOCS=( )
+
+	dobin Main/veracrypt
+	if use doc; then
+		DOCS+=( "${S}"/../doc/EFI-DCS )
+		docompress -x "/usr/share/doc/${PF}/EFI-DCS"
+		HTML_DOCS+=( "${S}"/../doc/html/. )
+	fi
+	einstalldocs
+
+	newinitd "${FILESDIR}/${PN}.init" ${PN}
+
+	if use X; then
+		local s
+		for s in 16 48 128 256; do
+			newicon -s ${s} Resources/Icons/VeraCrypt-${s}x${s}.xpm veracrypt.xpm
+		done
+		make_desktop_entry ${PN} "VeraCrypt" ${PN} "Utility;Security"
+	fi
+
+	pax-mark -m "${D%/}/usr/bin/veracrypt"
+}
+
+pkg_postinst() {
+	ewarn "VeraCrypt has a very restrictive license. Please be explicitly aware"
+	ewarn "of the limitations on redistribution of binaries or modified source."
+}