gentoo resync : 05.02.2020

author: V3n3RiX <venerix@redcorelinux.org> 2020-02-05 18:44:56 +0000
committer: V3n3RiX <venerix@redcorelinux.org> 2020-02-05 18:44:56 +0000
commit: 29aabba0ea759c6a2864ff5631735b67ee38e5e0 (patch)
tree: ab466b4dfa7abecb401b2f8039d08af4689306bb /app-crypt
parent: d42200bec37eef2a7478d88988ff00addd0a9202 (diff)
89 files changed, 191 insertions, 320 deletions
diff --git a/app-crypt/Manifest.gz b/app-crypt/Manifest.gz
index 4e4ec6390152..34fdf02da361 100644
--- a/app-crypt/Manifest.gz
+++ b/app-crypt/Manifest.gz
diff --git a/app-crypt/acme/Manifest b/app-crypt/acme/Manifest
index 41a3bd9d236a..0769b403a527 100644
--- a/app-crypt/acme/Manifest
+++ b/app-crypt/acme/Manifest
@@ -1,10 +1,8 @@
-DIST certbot-0.39.0.tar.gz 1350312 BLAKE2B 5f21c45d25754cb1ed0ad92e8d03637928a274637de09903509c7e78c40fd197e95cfa1f3effecef938d6ab8369dc6811714ddb5a93a806048e0998d1032e4f9 SHA512 17ab17a5f74e3fba58b1a8b9afe0c3656c7b2a5ea3585edb05ad84e36250c6a8d4d28bd692bc97d033c95eb0bbeff4eb84981ae0006e36d55846cd38373b86a0
-DIST certbot-0.40.1.tar.gz 1353347 BLAKE2B 86b3df4047101d00d5f17cf3a1a11e5800e850f5a9f736507ad373e552c27e9e4a3a17695f5a817d191cad383fc17336214fc1d8de7a99354ce4d2f5c6e728c1 SHA512 e5517a20cf26efba850728b3f81db5d6c3c5570b0a1c8eeeec9d4a4401ac04bcf44c6a2f1c248bf6e0b1be4a21b54f6168ccd11dc766304805f13b4cb16336b3
 DIST certbot-1.0.0.tar.gz 1336032 BLAKE2B ca26cfd3d9f802b09eaf387225f24fbb01385f81dfa661dfb5acbd97982a6fc773c56abf6b3f99db7f2b0cdc8c5a7175d264714592858b38217e444d4e1d2b4b SHA512 649ddd3d9305e166ef36de4e4e48b1171d5f369d9d60c026ab37a03e7b221cd815e93e69460662e6436b56cec076005582457e9d45499114306ad808a2497912
 DIST certbot-1.1.0.tar.gz 1346768 BLAKE2B 5c86edec3102ce0eb822465458ec86cbc98eb5e76c3c582d8a72ecab91e709f16e7a1576c684bc04bfd0c70918f34e84e0b3b264f949a1fb9bf9503fa9d6b179 SHA512 905b21a8a50b4df4eb92b464d10dec094ba4e7f5eaf3ad3dae1704a794952df6b51873ca919246a9b6698fd652a7c264efc742617ba0a25757ab99397759c343
-EBUILD acme-0.39.0.ebuild 1744 BLAKE2B 734b126626b41f7ba046178e124f9c44c78780b46cdcd0c9b0f4ad26234786bd8a9ee671db44389da7f5974bf62a485becadf4a70b29f8f93df3eedf16acf274 SHA512 31e18e93384147859a65562ab0dca57e7c2e8a646194932b316cd28e8c3a81f43d628340448720846b823230807f43e6dceec6f237cbcb4482585e4ac706fbbc
-EBUILD acme-0.40.1.ebuild 1744 BLAKE2B 734b126626b41f7ba046178e124f9c44c78780b46cdcd0c9b0f4ad26234786bd8a9ee671db44389da7f5974bf62a485becadf4a70b29f8f93df3eedf16acf274 SHA512 31e18e93384147859a65562ab0dca57e7c2e8a646194932b316cd28e8c3a81f43d628340448720846b823230807f43e6dceec6f237cbcb4482585e4ac706fbbc
-EBUILD acme-1.0.0.ebuild 1744 BLAKE2B 734b126626b41f7ba046178e124f9c44c78780b46cdcd0c9b0f4ad26234786bd8a9ee671db44389da7f5974bf62a485becadf4a70b29f8f93df3eedf16acf274 SHA512 31e18e93384147859a65562ab0dca57e7c2e8a646194932b316cd28e8c3a81f43d628340448720846b823230807f43e6dceec6f237cbcb4482585e4ac706fbbc
-EBUILD acme-1.1.0.ebuild 1750 BLAKE2B 93dd49e3c1329e7377544581c53aaf2a949a6d8f3f9d09a121e50c52fe618714b6173cb82b3a7179591bcff12051389e35705bac79bd1e6eacf45e3a67bcb59c SHA512 80cdd3fc105bd094a3c78066b4913112871a150e4797db5469450cbb709c17a63c1b39c0b2932d819c9f47242872801fba31b16b7b0072a1f15de8a42939a849
-EBUILD acme-9999.ebuild 1750 BLAKE2B 93dd49e3c1329e7377544581c53aaf2a949a6d8f3f9d09a121e50c52fe618714b6173cb82b3a7179591bcff12051389e35705bac79bd1e6eacf45e3a67bcb59c SHA512 80cdd3fc105bd094a3c78066b4913112871a150e4797db5469450cbb709c17a63c1b39c0b2932d819c9f47242872801fba31b16b7b0072a1f15de8a42939a849
+DIST certbot-1.2.0.tar.gz 1354262 BLAKE2B 1abdf4cb99ecdac6b9b8d2ebdd6897a3182a147f0175e2db4c6b0feaa3f6c615ee3146dd63627a83266c223456c5aba44b018be4059574d0209aec89065d9925 SHA512 ed52a31a71b3762b8cd217ea2784d9cb01f7c1a50cef3b7e0d99483ca3ab623b90ab7d4896674e0d1c06e2e8370c02162418d934de7d3048b0471416616146fe
+EBUILD acme-1.0.0.ebuild 1740 BLAKE2B 36f55fbd1d389ac9b009bbb46d0de42cde53ae1c01f7a05318c5ce6725094c7cf55a1850c01af01bb92bef1c0720026889cdc042dcdd04a1a7ba4d5343787a50 SHA512 12ef8bdefb9bedc3dae4c549a2af0a26b223ca1266660f1a06e8926e4bc53a7478b4fc55c7a952c10008f0e5c83934704d5eec3e6056fb4ae17fbc7e61e41876
+EBUILD acme-1.1.0.ebuild 1746 BLAKE2B eb09320774e53a3f6b2b0c9cf229ca86b40f98c1cac803a359d5ba4310556afcc223d54818fac64bb34bddb9033676a5fb6321376874da73e8cf01024a14019f SHA512 c87f8c6be501bde475a17525f6cb5b1f26e627590fc393b06f62ec0d211952f4ab146a66718cb37e4e275d7bbd2fd861eadfae814035b5a2b81b59d8574d1670
+EBUILD acme-1.2.0.ebuild 1750 BLAKE2B 93dd49e3c1329e7377544581c53aaf2a949a6d8f3f9d09a121e50c52fe618714b6173cb82b3a7179591bcff12051389e35705bac79bd1e6eacf45e3a67bcb59c SHA512 80cdd3fc105bd094a3c78066b4913112871a150e4797db5469450cbb709c17a63c1b39c0b2932d819c9f47242872801fba31b16b7b0072a1f15de8a42939a849
+EBUILD acme-9999.ebuild 1746 BLAKE2B eb09320774e53a3f6b2b0c9cf229ca86b40f98c1cac803a359d5ba4310556afcc223d54818fac64bb34bddb9033676a5fb6321376874da73e8cf01024a14019f SHA512 c87f8c6be501bde475a17525f6cb5b1f26e627590fc393b06f62ec0d211952f4ab146a66718cb37e4e275d7bbd2fd861eadfae814035b5a2b81b59d8574d1670
 MISC metadata.xml 384 BLAKE2B 55780995cb61c11ca859c9f1de17b1c22c9c92902f551ccd1ee6f030df9d513bb5519a2c62bf33bc6a5872790d033ba966e5ed137d84a4f66ab4ba7636a88887 SHA512 cf8393b25aa363bc1db4ebd23274affd1eaf999a4c2ab8d359730f421961dafd5c96fcf14c247f3f5419616116e2351d72fbf0e29301ea44ac522e865c7b0fa1
diff --git a/app-crypt/acme/acme-0.40.1.ebuild b/app-crypt/acme/acme-0.40.1.ebuild
deleted file mode 100644
index f045a98c0861..000000000000
--- a/app-crypt/acme/acme-0.40.1.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=(python{2_7,3_6,3_7})
-
-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/mock[${PYTHON_USEDEP}]
-	>=dev-python/pyopenssl-0.13.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}]
-	)
-	>=dev-python/setuptools-1.0[${PYTHON_USEDEP}]
-"
-
-src_compile() {
-	python_foreach_impl run_in_build_dir default
-	if use doc ; then
-		cd docs || die
-		sphinx-build -b html -d _build/doctrees   . _build/html
-	fi
-}
-
-python_test() {
-	nosetests -w ${PN} || die
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( docs/_build/html/. )
-
-	distutils-r1_python_install_all
-}
diff --git a/app-crypt/acme/acme-1.0.0.ebuild b/app-crypt/acme/acme-1.0.0.ebuild
index f045a98c0861..0ce5fe5770d8 100644
--- a/app-crypt/acme/acme-1.0.0.ebuild
+++ b/app-crypt/acme/acme-1.0.0.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=(python{2_7,3_6,3_7})
+PYTHON_COMPAT=(python{3_6,3_7})
 
 if [[ ${PV} == 9999* ]]; then
 	EGIT_REPO_URI="https://github.com/certbot/certbot.git"
diff --git a/app-crypt/acme/acme-1.1.0.ebuild b/app-crypt/acme/acme-1.1.0.ebuild
index da68660fa26a..4aaf884c944a 100644
--- a/app-crypt/acme/acme-1.1.0.ebuild
+++ b/app-crypt/acme/acme-1.1.0.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=(python{2_7,3_6,3_7,3_8})
+PYTHON_COMPAT=(python{3_6,3_7,3_8})
 
 if [[ ${PV} == 9999* ]]; then
 	EGIT_REPO_URI="https://github.com/certbot/certbot.git"
diff --git a/app-crypt/acme/acme-0.39.0.ebuild b/app-crypt/acme/acme-1.2.0.ebuild
index f045a98c0861..da68660fa26a 100644
--- a/app-crypt/acme/acme-0.39.0.ebuild
+++ b/app-crypt/acme/acme-1.2.0.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=(python{2_7,3_6,3_7})
+PYTHON_COMPAT=(python{2_7,3_6,3_7,3_8})
 
 if [[ ${PV} == 9999* ]]; then
 	EGIT_REPO_URI="https://github.com/certbot/certbot.git"
@@ -10,7 +10,7 @@ if [[ ${PV} == 9999* ]]; then
 	S=${WORKDIR}/${P}/${PN}
 else
 	SRC_URI="https://github.com/certbot/certbot/archive/v${PV}.tar.gz -> certbot-${PV}.tar.gz"
-	KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
 	S=${WORKDIR}/certbot-${PV}/acme
 fi
 
diff --git a/app-crypt/acme/acme-9999.ebuild b/app-crypt/acme/acme-9999.ebuild
index da68660fa26a..4aaf884c944a 100644
--- a/app-crypt/acme/acme-9999.ebuild
+++ b/app-crypt/acme/acme-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=(python{2_7,3_6,3_7,3_8})
+PYTHON_COMPAT=(python{3_6,3_7,3_8})
 
 if [[ ${PV} == 9999* ]]; then
 	EGIT_REPO_URI="https://github.com/certbot/certbot.git"
diff --git a/app-crypt/argon2/Manifest b/app-crypt/argon2/Manifest
index 3dec2782b3c8..f3781e9ca5c9 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 1301 BLAKE2B 2426652416d6a061400d0aae1a1479093b9b6ba9d02f8b7d91b4dad07a3172253c3460f575c15189002bb14fce34f9252fd9471b1f83b350114081bd07e89385 SHA512 2190db0ef257ae81ccbe380b75cfed763fa7112ea1a30f95cbbf09d055662d00aafc928570c580666c046c54da70ce0678c4c14302bd0d88ebe2836cc48439cd
+EBUILD argon2-20190702.ebuild 1302 BLAKE2B 90d617dd3a4081609a96536ab0289811f0a404aef98ac356e072af98e669a8eccd5afd6cd561cbc1361682f2b659de1723adabd66d39c7fd99c22242ec1870d5 SHA512 c9b1dade0dc468c2055cc6799744b8a45b2f897638a78565127c5e3b2846f8d683cec9dfd77879a709b4c83a8f4015dcaaa4cd3199b32b30b91c58c6ca074da6
 MISC metadata.xml 768 BLAKE2B 294ef62768a6e09f38479670b9ee12f056822d43fa7de681e7243d676a037c77e1724777c20a13d564ad364dba84f55089734b3546d593bb4f362f7a0cba3475 SHA512 bd066d4ad7d717ec6316a9ce307b38fd35be60149619c82ab4d636d4ae7e17c3dd22c328f9a5b6e9b3e54f15bfb5d11fd57b4e73e3f5399f3042a08611500553
diff --git a/app-crypt/argon2/argon2-20190702.ebuild b/app-crypt/argon2/argon2-20190702.ebuild
index f3cc9e2302f4..49d2b6eb8244 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 s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86"
 IUSE="static-libs"
 
 S="${WORKDIR}/phc-winner-${P}"
diff --git a/app-crypt/certbot-apache/Manifest b/app-crypt/certbot-apache/Manifest
index 30ec8c0ea7ac..70891cfef048 100644
--- a/app-crypt/certbot-apache/Manifest
+++ b/app-crypt/certbot-apache/Manifest
@@ -1,8 +1,8 @@
-DIST certbot-0.40.1.tar.gz 1353347 BLAKE2B 86b3df4047101d00d5f17cf3a1a11e5800e850f5a9f736507ad373e552c27e9e4a3a17695f5a817d191cad383fc17336214fc1d8de7a99354ce4d2f5c6e728c1 SHA512 e5517a20cf26efba850728b3f81db5d6c3c5570b0a1c8eeeec9d4a4401ac04bcf44c6a2f1c248bf6e0b1be4a21b54f6168ccd11dc766304805f13b4cb16336b3
 DIST certbot-1.0.0.tar.gz 1336032 BLAKE2B ca26cfd3d9f802b09eaf387225f24fbb01385f81dfa661dfb5acbd97982a6fc773c56abf6b3f99db7f2b0cdc8c5a7175d264714592858b38217e444d4e1d2b4b SHA512 649ddd3d9305e166ef36de4e4e48b1171d5f369d9d60c026ab37a03e7b221cd815e93e69460662e6436b56cec076005582457e9d45499114306ad808a2497912
 DIST certbot-1.1.0.tar.gz 1346768 BLAKE2B 5c86edec3102ce0eb822465458ec86cbc98eb5e76c3c582d8a72ecab91e709f16e7a1576c684bc04bfd0c70918f34e84e0b3b264f949a1fb9bf9503fa9d6b179 SHA512 905b21a8a50b4df4eb92b464d10dec094ba4e7f5eaf3ad3dae1704a794952df6b51873ca919246a9b6698fd652a7c264efc742617ba0a25757ab99397759c343
-EBUILD certbot-apache-0.40.1.ebuild 1101 BLAKE2B 66cdbe3b5e7206e4d7fadddf3b753040ad16528fe56bdc1a6c834c1be7e45bb1c1b195575ef9c9e8067e10cb871ba899a7fa440cf787ba62f9c9730d30b25218 SHA512 aca7ee1371497e50be16734735a50003ecb36749c73e242d1c7c127b49576260d095286ae7cb9220a4a670c8cca86debf6b93724a15316f18892b5b07aaa3968
-EBUILD certbot-apache-1.0.0.ebuild 1101 BLAKE2B 66cdbe3b5e7206e4d7fadddf3b753040ad16528fe56bdc1a6c834c1be7e45bb1c1b195575ef9c9e8067e10cb871ba899a7fa440cf787ba62f9c9730d30b25218 SHA512 aca7ee1371497e50be16734735a50003ecb36749c73e242d1c7c127b49576260d095286ae7cb9220a4a670c8cca86debf6b93724a15316f18892b5b07aaa3968
-EBUILD certbot-apache-1.1.0.ebuild 1102 BLAKE2B 1551f97612e57eb681e2f240dcae60d1887b253836d34eaeb61c25bbdb3699dde8ad9343e09995d7716567f1a81b438f5a597046a3a4aedfa203624b3ff85030 SHA512 d366870c966c749dd720c4f882c14b6d41056bb17ee243be2ee5b9b92f76bcbec6bf6247c96738679e994658c147e191dcb714ec4467a21cefd725303203fa30
-EBUILD certbot-apache-9999.ebuild 1103 BLAKE2B 84acaedaf61419da63f51b28aa28d987a93da73f69bfb1be06aff403abbc7f1f08cd31a71d08ca2b563f3872b13b1220024ef93085fdb3c9ea00f21b07a21ebe SHA512 e07bafd8f6f4a3308c1fecd01f1a62dfc761c27b26f34b022fe4a447e476b3cf16dfbe7afbb6de9c701d44a1df4d3f95cb5b4bb122c41ef8c9662b52690b31d1
+DIST certbot-1.2.0.tar.gz 1354262 BLAKE2B 1abdf4cb99ecdac6b9b8d2ebdd6897a3182a147f0175e2db4c6b0feaa3f6c615ee3146dd63627a83266c223456c5aba44b018be4059574d0209aec89065d9925 SHA512 ed52a31a71b3762b8cd217ea2784d9cb01f7c1a50cef3b7e0d99483ca3ab623b90ab7d4896674e0d1c06e2e8370c02162418d934de7d3048b0471416616146fe
+EBUILD certbot-apache-1.0.0.ebuild 1097 BLAKE2B 313adadcf61861dd7b3ac60bed718590e70ee86da4bb67d91544b76da821c2cd2780fb8c0fbdd7ffd241189deef90c710d1b4b060c0fc981d254c68ca75b45da SHA512 b61efbe4957fe60e394ecadf56e51abb3f362027d26106223c84d9f89ca6e1158d9c24e036ff6fda6313942d390325f207e79a238b9a6b642646528b09002dc8
+EBUILD certbot-apache-1.1.0.ebuild 1098 BLAKE2B 774ad4f402a5b07c7ac2b845569a6f76d142680e010f654965ec010ca5ccc08918260fac4f96e5cfb4fe414c3bae4f9d5e6228c07bcc079852eac9ec9e04c9ff SHA512 468a948daf3723be0da7984d5f19b9c27c6a9a9585d32d0ae69c4ff181590005e7c112518b50e29da28ff823cc783d407f7c06d33ea3f262f9f6192541f26c7b
+EBUILD certbot-apache-1.2.0.ebuild 1098 BLAKE2B 48134461ad6db972453423f9d57c4d3bbb0c4823015f2ae8f36c2059a75124d105e7fa6594eb7a313e3220f07d0fed8f56cfe99d0a37df64b66e8e14dd3c67ad SHA512 0f276ad597397a20050801349dfd03782ad40a414f13a28070594468484e9761a629a3c8e4889d36a8cf8c58f3b0b2ca61b98761ecf8d2a7b66a80584eb65a73
+EBUILD certbot-apache-9999.ebuild 1098 BLAKE2B 48134461ad6db972453423f9d57c4d3bbb0c4823015f2ae8f36c2059a75124d105e7fa6594eb7a313e3220f07d0fed8f56cfe99d0a37df64b66e8e14dd3c67ad SHA512 0f276ad597397a20050801349dfd03782ad40a414f13a28070594468484e9761a629a3c8e4889d36a8cf8c58f3b0b2ca61b98761ecf8d2a7b66a80584eb65a73
 MISC metadata.xml 334 BLAKE2B 4adbd04c0edcc84925da47b32fee63d4652bf2a1bf5222a56e0e1c7cfe8aaa34275a2652c4416f8a80de11fd88217d8626d610fa857f0615f18bfd773a279e55 SHA512 e3d6dda6c44557523fd48b464b6d39fc45b90ba2ecbe03fb300a655973c1b2e654a24d8d381b769eba00d0d80fb5881e1dfec1694e223cd83047abba9f01a44f
diff --git a/app-crypt/certbot-apache/certbot-apache-1.0.0.ebuild b/app-crypt/certbot-apache/certbot-apache-1.0.0.ebuild
index c926083fd0ac..775499f0b0df 100644
--- a/app-crypt/certbot-apache/certbot-apache-1.0.0.ebuild
+++ b/app-crypt/certbot-apache/certbot-apache-1.0.0.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=(python{2_7,3_6,3_7})
+PYTHON_COMPAT=(python{3_6,3_7})
 
 if [[ ${PV} == 9999* ]]; then
 	EGIT_REPO_URI="https://github.com/certbot/certbot.git"
diff --git a/app-crypt/certbot-apache/certbot-apache-1.1.0.ebuild b/app-crypt/certbot-apache/certbot-apache-1.1.0.ebuild
index d7739ed00d89..cef80d06281a 100644
--- a/app-crypt/certbot-apache/certbot-apache-1.1.0.ebuild
+++ b/app-crypt/certbot-apache/certbot-apache-1.1.0.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=(python{2_7,3_6,3_7})
+PYTHON_COMPAT=(python{3_6,3_7})
 
 if [[ ${PV} == 9999* ]]; then
 	EGIT_REPO_URI="https://github.com/certbot/certbot.git"
diff --git a/app-crypt/certbot-apache/certbot-apache-0.40.1.ebuild b/app-crypt/certbot-apache/certbot-apache-1.2.0.ebuild
index c926083fd0ac..56e71bffc582 100644
--- a/app-crypt/certbot-apache/certbot-apache-0.40.1.ebuild
+++ b/app-crypt/certbot-apache/certbot-apache-1.2.0.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=(python{2_7,3_6,3_7})
+PYTHON_COMPAT=(python{3_6,3_7})
 
 if [[ ${PV} == 9999* ]]; then
 	EGIT_REPO_URI="https://github.com/certbot/certbot.git"
@@ -10,7 +10,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
 
@@ -25,7 +25,7 @@ IUSE="test"
 RESTRICT="!test? ( test )"
 
 RDEPEND=">=app-crypt/acme-0.29.0[${PYTHON_USEDEP}]
-	>=app-crypt/certbot-0.39.0[${PYTHON_USEDEP}]
+	>=app-crypt/certbot-1.1.0[${PYTHON_USEDEP}]
 	dev-python/mock[${PYTHON_USEDEP}]
 	dev-python/python-augeas[${PYTHON_USEDEP}]
 	dev-python/zope-component[${PYTHON_USEDEP}]
diff --git a/app-crypt/certbot-apache/certbot-apache-9999.ebuild b/app-crypt/certbot-apache/certbot-apache-9999.ebuild
index 718afbc37025..56e71bffc582 100644
--- a/app-crypt/certbot-apache/certbot-apache-9999.ebuild
+++ b/app-crypt/certbot-apache/certbot-apache-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=(python{2_7,3_6,3_7})
+PYTHON_COMPAT=(python{3_6,3_7})
 
 if [[ ${PV} == 9999* ]]; then
 	EGIT_REPO_URI="https://github.com/certbot/certbot.git"
@@ -25,7 +25,7 @@ IUSE="test"
 RESTRICT="!test? ( test )"
 
 RDEPEND=">=app-crypt/acme-0.29.0[${PYTHON_USEDEP}]
-	>=app-crypt/certbot-0.39.0[${PYTHON_USEDEP}]
+	>=app-crypt/certbot-1.1.0[${PYTHON_USEDEP}]
 	dev-python/mock[${PYTHON_USEDEP}]
 	dev-python/python-augeas[${PYTHON_USEDEP}]
 	dev-python/zope-component[${PYTHON_USEDEP}]
diff --git a/app-crypt/certbot-dns-nsone/Manifest b/app-crypt/certbot-dns-nsone/Manifest
index bd259fd57d94..9dd37bcd0fe3 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.ebuild 945 BLAKE2B 2dc4d5aa0936653a549f3f40d9283111f392fe4ed810cc6117c32dca41d220b04638a3fdc606eddffca84bf15130514d22689a636e4a26615c7d7a97544b509f SHA512 60520729dcc2a7e2133b5ac91ea87c61625f1f3d8065948e5e3e05d60f8c2f79144a190ef57d44b95727712db88fa6b0f7b2529258e3c6d43e76aa4e8a6c2aee
+EBUILD certbot-dns-nsone-0.39.0.ebuild 939 BLAKE2B d6245541de24ac10cbd80d05d459987d368e8f3c63181cc526ed63f38af7f8c45ba858825ec4e7540be818c5af3d7cf9c4acf9fa7a15678ea82ac3e87b930212 SHA512 5b48a8ec5f7ee92c02129344e95d2dd8ec44eb4ac1dd630096728282feb5329b9b3b71acd7a1e5f226f079ed1d9c909c247f12a2f56ec9ab850718b4ff8aad7a
 MISC metadata.xml 253 BLAKE2B 7dac7f77dcc8de31f439cc6d7770a503f95be9c2f8ae57df9e725df941e2b31a90a43664a485a5fad9510b9ae060ba7aaaddba29324338dd9eb07d88a63c7dce SHA512 303268e1f46e337e32c64b544c0962ecbe8de1799c42736b3c3515b6f31954a655830c402317bd0534cac12059e17eeb5f360d010432dff795a136662a5c10f1
diff --git a/app-crypt/certbot-dns-nsone/certbot-dns-nsone-0.39.0.ebuild b/app-crypt/certbot-dns-nsone/certbot-dns-nsone-0.39.0.ebuild
index 8278a0a87d4c..6a9e578cd9a5 100644
--- a/app-crypt/certbot-dns-nsone/certbot-dns-nsone-0.39.0.ebuild
+++ b/app-crypt/certbot-dns-nsone/certbot-dns-nsone-0.39.0.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=(python{2_7,3_6})
+PYTHON_COMPAT=(python3_6)
 
 if [[ ${PV} == 9999* ]]; then
 	EGIT_REPO_URI="https://github.com/certbot/certbot.git"
diff --git a/app-crypt/certbot-nginx/Manifest b/app-crypt/certbot-nginx/Manifest
index 4213f884dfbe..c94f523861f4 100644
--- a/app-crypt/certbot-nginx/Manifest
+++ b/app-crypt/certbot-nginx/Manifest
@@ -1,8 +1,8 @@
-DIST certbot-0.40.1.tar.gz 1353347 BLAKE2B 86b3df4047101d00d5f17cf3a1a11e5800e850f5a9f736507ad373e552c27e9e4a3a17695f5a817d191cad383fc17336214fc1d8de7a99354ce4d2f5c6e728c1 SHA512 e5517a20cf26efba850728b3f81db5d6c3c5570b0a1c8eeeec9d4a4401ac04bcf44c6a2f1c248bf6e0b1be4a21b54f6168ccd11dc766304805f13b4cb16336b3
 DIST certbot-1.0.0.tar.gz 1336032 BLAKE2B ca26cfd3d9f802b09eaf387225f24fbb01385f81dfa661dfb5acbd97982a6fc773c56abf6b3f99db7f2b0cdc8c5a7175d264714592858b38217e444d4e1d2b4b SHA512 649ddd3d9305e166ef36de4e4e48b1171d5f369d9d60c026ab37a03e7b221cd815e93e69460662e6436b56cec076005582457e9d45499114306ad808a2497912
 DIST certbot-1.1.0.tar.gz 1346768 BLAKE2B 5c86edec3102ce0eb822465458ec86cbc98eb5e76c3c582d8a72ecab91e709f16e7a1576c684bc04bfd0c70918f34e84e0b3b264f949a1fb9bf9503fa9d6b179 SHA512 905b21a8a50b4df4eb92b464d10dec094ba4e7f5eaf3ad3dae1704a794952df6b51873ca919246a9b6698fd652a7c264efc742617ba0a25757ab99397759c343
-EBUILD certbot-nginx-0.40.1.ebuild 1008 BLAKE2B 4d895d074f5435d98110b07da9d257d1d7c90d2c587d7da4c6c096c7672c1766bb7edf8be9d629f603f3bfc2db42c1f45e77cb74b9b73397a3fcc26e490ab954 SHA512 67dc280acb81a1033e01b36e8894cd50f9df9dca3c64e1412107b30ef4be0c68aac564911ec6eb835680f071eb2365ddf04ad52b424cf396667b959a1f9e22f6
-EBUILD certbot-nginx-1.0.0.ebuild 1006 BLAKE2B 6cf500750450e99fbbc69f6f3cafa45ced1dc78ed608d8260dd9509b40ac97a4e0d8ca0e24def32704417d633504eb9b68c402ce02a6db59f876de0d4cd2f32c SHA512 ce348dc452de4cded12eb633d75f647702ab2d72c241b574428c91cc6b3c04939245e089d17e023c588fc1ac2f3e0380359740a5abbdd895f1e28be0a8198862
-EBUILD certbot-nginx-1.1.0.ebuild 1008 BLAKE2B 931887bf14479cb91c2963642a1302fb07f032a9aa57f97953f485db16a176511bc7b0cea39f319d9e1da0db2fa5e771406b524350813c6d7108c7f91c8ef038 SHA512 bb58e74009c0051fabd22f2d5384de642fdfcfdf259eff6fe91b33d58506c19fd24c8abc72bf602ac02a4403f879740e400de5ff732f8e34b967a2bc874d021a
-EBUILD certbot-nginx-9999.ebuild 1008 BLAKE2B 931887bf14479cb91c2963642a1302fb07f032a9aa57f97953f485db16a176511bc7b0cea39f319d9e1da0db2fa5e771406b524350813c6d7108c7f91c8ef038 SHA512 bb58e74009c0051fabd22f2d5384de642fdfcfdf259eff6fe91b33d58506c19fd24c8abc72bf602ac02a4403f879740e400de5ff732f8e34b967a2bc874d021a
+DIST certbot-1.2.0.tar.gz 1354262 BLAKE2B 1abdf4cb99ecdac6b9b8d2ebdd6897a3182a147f0175e2db4c6b0feaa3f6c615ee3146dd63627a83266c223456c5aba44b018be4059574d0209aec89065d9925 SHA512 ed52a31a71b3762b8cd217ea2784d9cb01f7c1a50cef3b7e0d99483ca3ab623b90ab7d4896674e0d1c06e2e8370c02162418d934de7d3048b0471416616146fe
+EBUILD certbot-nginx-1.0.0.ebuild 1002 BLAKE2B d6602a191e2accb784b6be26005156a450b2225eedcc5a6c9b95543af4621d93a5f1f863c23ffd916ed0f6e611d47b08860cba761ab95de362c337cd8c39d8da SHA512 5ea3e1e23b26c784e9d0e3a28bb465849256e64157b1c04fb8a1848943d539fc7ac7ca81428d194b62f11d4753214cc03b718deb9767225620171c22d4892868
+EBUILD certbot-nginx-1.1.0.ebuild 1004 BLAKE2B 41f4dbc93cc7553c439796fcf2af1dde5d466fbd622471984bf15abedc54cad3fb15d069993baa736c71cb4ea65bb0f741dbbb20814156bbc04abcd1d468b240 SHA512 83647384bcf381a783d2871c7e09e90423345c5ea726eab7a42a9219f091cbd6cc96c621d00cfe3e6f32f79d7383a25be023867e3c7cec9d83291555fe5833d4
+EBUILD certbot-nginx-1.2.0.ebuild 1004 BLAKE2B d9c6cdfb14346b94daab36f639191aeb826d1e550ac22c972d6f7203690a565274992111172c5672f2d695030920e762bca222f7fea1ccfc415a3b8e5c7951a2 SHA512 b728d99c7675bb42c1af6dcd3c88cbca72f7e3a3e4651e916437ec7aaac5fa43b675b47560a04b879c2f454c1e8f11bd2dd436eba1fe6761399c44c9068a0116
+EBUILD certbot-nginx-9999.ebuild 1004 BLAKE2B d9c6cdfb14346b94daab36f639191aeb826d1e550ac22c972d6f7203690a565274992111172c5672f2d695030920e762bca222f7fea1ccfc415a3b8e5c7951a2 SHA512 b728d99c7675bb42c1af6dcd3c88cbca72f7e3a3e4651e916437ec7aaac5fa43b675b47560a04b879c2f454c1e8f11bd2dd436eba1fe6761399c44c9068a0116
 MISC metadata.xml 334 BLAKE2B 4adbd04c0edcc84925da47b32fee63d4652bf2a1bf5222a56e0e1c7cfe8aaa34275a2652c4416f8a80de11fd88217d8626d610fa857f0615f18bfd773a279e55 SHA512 e3d6dda6c44557523fd48b464b6d39fc45b90ba2ecbe03fb300a655973c1b2e654a24d8d381b769eba00d0d80fb5881e1dfec1694e223cd83047abba9f01a44f
diff --git a/app-crypt/certbot-nginx/certbot-nginx-1.0.0.ebuild b/app-crypt/certbot-nginx/certbot-nginx-1.0.0.ebuild
index 1ae5cc3ffcf0..0344f2130cb1 100644
--- a/app-crypt/certbot-nginx/certbot-nginx-1.0.0.ebuild
+++ b/app-crypt/certbot-nginx/certbot-nginx-1.0.0.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=(python{2_7,3_6,3_7})
+PYTHON_COMPAT=(python{3_6,3_7})
 
 if [[ ${PV} == 9999* ]]; then
 	EGIT_REPO_URI="https://github.com/certbot/certbot.git"
diff --git a/app-crypt/certbot-nginx/certbot-nginx-1.1.0.ebuild b/app-crypt/certbot-nginx/certbot-nginx-1.1.0.ebuild
index b7c737e19b3c..f272a24ec51d 100644
--- a/app-crypt/certbot-nginx/certbot-nginx-1.1.0.ebuild
+++ b/app-crypt/certbot-nginx/certbot-nginx-1.1.0.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=(python{2_7,3_6,3_7})
+PYTHON_COMPAT=(python{3_6,3_7})
 
 if [[ ${PV} == 9999* ]]; then
 	EGIT_REPO_URI="https://github.com/certbot/certbot.git"
diff --git a/app-crypt/certbot-nginx/certbot-nginx-0.40.1.ebuild b/app-crypt/certbot-nginx/certbot-nginx-1.2.0.ebuild
index 460957ae7e95..b87bdbf7b7dd 100644
--- a/app-crypt/certbot-nginx/certbot-nginx-0.40.1.ebuild
+++ b/app-crypt/certbot-nginx/certbot-nginx-1.2.0.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=(python{2_7,3_6,3_7})
+PYTHON_COMPAT=(python{3_6,3_7})
 
 if [[ ${PV} == 9999* ]]; then
 	EGIT_REPO_URI="https://github.com/certbot/certbot.git"
@@ -10,7 +10,7 @@ if [[ ${PV} == 9999* ]]; then
 	S=${WORKDIR}/${P}/${PN}
 else
 	SRC_URI="https://github.com/${PN%-nginx}/${PN%-nginx}/archive/v${PV}.tar.gz -> ${PN%-nginx}-${PV}.tar.gz"
-	KEYWORDS="amd64 ~arm ~arm64 x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 	S=${WORKDIR}/${PN%-nginx}-${PV}/${PN}
 fi
 
@@ -25,8 +25,8 @@ IUSE=""
 
 CDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
 RDEPEND="${CDEPEND}
-	>=app-crypt/acme-0.29.0[${PYTHON_USEDEP}]
-	>=app-crypt/certbot-0.35.0[${PYTHON_USEDEP}]
+	>=app-crypt/acme-1.0.0[${PYTHON_USEDEP}]
+	>=app-crypt/certbot-1.1.0[${PYTHON_USEDEP}]
 	dev-python/mock[${PYTHON_USEDEP}]
 	dev-python/pyopenssl[${PYTHON_USEDEP}]
 	>=dev-python/pyparsing-1.5.5[${PYTHON_USEDEP}]
diff --git a/app-crypt/certbot-nginx/certbot-nginx-9999.ebuild b/app-crypt/certbot-nginx/certbot-nginx-9999.ebuild
index b7c737e19b3c..b87bdbf7b7dd 100644
--- a/app-crypt/certbot-nginx/certbot-nginx-9999.ebuild
+++ b/app-crypt/certbot-nginx/certbot-nginx-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=(python{2_7,3_6,3_7})
+PYTHON_COMPAT=(python{3_6,3_7})
 
 if [[ ${PV} == 9999* ]]; then
 	EGIT_REPO_URI="https://github.com/certbot/certbot.git"
@@ -26,7 +26,7 @@ IUSE=""
 CDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
 RDEPEND="${CDEPEND}
 	>=app-crypt/acme-1.0.0[${PYTHON_USEDEP}]
-	>=app-crypt/certbot-1.0.0[${PYTHON_USEDEP}]
+	>=app-crypt/certbot-1.1.0[${PYTHON_USEDEP}]
 	dev-python/mock[${PYTHON_USEDEP}]
 	dev-python/pyopenssl[${PYTHON_USEDEP}]
 	>=dev-python/pyparsing-1.5.5[${PYTHON_USEDEP}]
diff --git a/app-crypt/certbot/Manifest b/app-crypt/certbot/Manifest
index 814d3df6a92b..23325d756aac 100644
--- a/app-crypt/certbot/Manifest
+++ b/app-crypt/certbot/Manifest
@@ -1,10 +1,8 @@
-DIST certbot-0.39.0.tar.gz 1350312 BLAKE2B 5f21c45d25754cb1ed0ad92e8d03637928a274637de09903509c7e78c40fd197e95cfa1f3effecef938d6ab8369dc6811714ddb5a93a806048e0998d1032e4f9 SHA512 17ab17a5f74e3fba58b1a8b9afe0c3656c7b2a5ea3585edb05ad84e36250c6a8d4d28bd692bc97d033c95eb0bbeff4eb84981ae0006e36d55846cd38373b86a0
-DIST certbot-0.40.1.tar.gz 1353347 BLAKE2B 86b3df4047101d00d5f17cf3a1a11e5800e850f5a9f736507ad373e552c27e9e4a3a17695f5a817d191cad383fc17336214fc1d8de7a99354ce4d2f5c6e728c1 SHA512 e5517a20cf26efba850728b3f81db5d6c3c5570b0a1c8eeeec9d4a4401ac04bcf44c6a2f1c248bf6e0b1be4a21b54f6168ccd11dc766304805f13b4cb16336b3
 DIST certbot-1.0.0.tar.gz 1336032 BLAKE2B ca26cfd3d9f802b09eaf387225f24fbb01385f81dfa661dfb5acbd97982a6fc773c56abf6b3f99db7f2b0cdc8c5a7175d264714592858b38217e444d4e1d2b4b SHA512 649ddd3d9305e166ef36de4e4e48b1171d5f369d9d60c026ab37a03e7b221cd815e93e69460662e6436b56cec076005582457e9d45499114306ad808a2497912
 DIST certbot-1.1.0.tar.gz 1346768 BLAKE2B 5c86edec3102ce0eb822465458ec86cbc98eb5e76c3c582d8a72ecab91e709f16e7a1576c684bc04bfd0c70918f34e84e0b3b264f949a1fb9bf9503fa9d6b179 SHA512 905b21a8a50b4df4eb92b464d10dec094ba4e7f5eaf3ad3dae1704a794952df6b51873ca919246a9b6698fd652a7c264efc742617ba0a25757ab99397759c343
-EBUILD certbot-0.39.0.ebuild 1432 BLAKE2B 67d86895ea48efc41c4027ed1ded1a9df8ec9d47465737c72755848b8cf256f00e7f9f9c48d6031f462f375cad7e3458531731befed92b2428e413097f0ee30d SHA512 bb2dea6370c5736b2ec1ae45f063d9e934ef796a5a57d0e0d389183391254e536135d32c8d01d63884ca49677ed3075326cb30504156f0d4447d10dba59d6663
-EBUILD certbot-0.40.1.ebuild 1432 BLAKE2B 0fbe7131796c2adb6d6ba5e598cdd9099029b90aedc643f9cb02707bcd3e77d68346317370b511fcc08fd7257339cbfd6e112a16ae2dfb6faef4555aa317fcca SHA512 b75782ac4f4281f22cf52525891ea0b256a3c97e7f082c5c897c4bca713076b53370be98f82f382e4beb96f1acf1041911a328e35a8f623202ee6c44a2c6495b
-EBUILD certbot-1.0.0-r1.ebuild 1459 BLAKE2B 4922cdb95f523e70d51e8f2ea52a50f29e5293caaf8b024d0d56bc02047565acfc5cd3584e602a38192c5a96e41e5bd8d436f8e0b9cc6d34bb3ae80df5d0c9b8 SHA512 a4f0003e86bc27fdb734b0551762d915f1662da62ebcf4af69bdbbaa256fc4d37f7206161bd73b8fdbba1a354cc32c387977fe573708c98e0726fc03458f7cc3
-EBUILD certbot-1.1.0.ebuild 1459 BLAKE2B 8786bdd75cf34ba205d6df9eaab74946dc3253bb1aa087183181e440f9a79dee26ce35c9a61fbe6ffc8581d08fe30c33a376a3189cab8e8146326574ed5b37cf SHA512 49c5da10cc52f8ffa40f71ef4bd33ebade098dd9692e99ed669a9a49e1c5602bd171d3ab3a5a48b5e37e1ba79967d14a55aad30c56fe1da6d50c664a5719cabb
-EBUILD certbot-9999.ebuild 1459 BLAKE2B 8786bdd75cf34ba205d6df9eaab74946dc3253bb1aa087183181e440f9a79dee26ce35c9a61fbe6ffc8581d08fe30c33a376a3189cab8e8146326574ed5b37cf SHA512 49c5da10cc52f8ffa40f71ef4bd33ebade098dd9692e99ed669a9a49e1c5602bd171d3ab3a5a48b5e37e1ba79967d14a55aad30c56fe1da6d50c664a5719cabb
+DIST certbot-1.2.0.tar.gz 1354262 BLAKE2B 1abdf4cb99ecdac6b9b8d2ebdd6897a3182a147f0175e2db4c6b0feaa3f6c615ee3146dd63627a83266c223456c5aba44b018be4059574d0209aec89065d9925 SHA512 ed52a31a71b3762b8cd217ea2784d9cb01f7c1a50cef3b7e0d99483ca3ab623b90ab7d4896674e0d1c06e2e8370c02162418d934de7d3048b0471416616146fe
+EBUILD certbot-1.0.0-r1.ebuild 1455 BLAKE2B 91ae921207d96441d709b1115cf23339bb2bbc2d425af09d49f7ff355671b3ec828ff9149e00741090fcbc4437f61391a8fa0b2855e7597df746f2ea0829fd61 SHA512 fe422a4c25b7425f7060a6e11dad6accd665fcb749ed0212d6e77fe38bd99e54492aec2fe53c1e07b702a1eb7b94d0613fc925cf9bdd86ffe744179395230120
+EBUILD certbot-1.1.0.ebuild 1455 BLAKE2B de6c7604cbc1438fcd7f143a84ed56391afbd6c20a9fa52b6672c229776c6fc79f14382a5f3f8023e1fdbc9d8914bed0402b575327a6bc92dde2b77484060658 SHA512 2d7959da9ba52dfd5b29b4da05133b016c7764b8c48b5906b046a41aa66399f47662d8a829b7f6d34ce791379d719fd57195fc3ac20df9539dcf1b39090e9983
+EBUILD certbot-1.2.0.ebuild 1455 BLAKE2B de6c7604cbc1438fcd7f143a84ed56391afbd6c20a9fa52b6672c229776c6fc79f14382a5f3f8023e1fdbc9d8914bed0402b575327a6bc92dde2b77484060658 SHA512 2d7959da9ba52dfd5b29b4da05133b016c7764b8c48b5906b046a41aa66399f47662d8a829b7f6d34ce791379d719fd57195fc3ac20df9539dcf1b39090e9983
+EBUILD certbot-9999.ebuild 1455 BLAKE2B de6c7604cbc1438fcd7f143a84ed56391afbd6c20a9fa52b6672c229776c6fc79f14382a5f3f8023e1fdbc9d8914bed0402b575327a6bc92dde2b77484060658 SHA512 2d7959da9ba52dfd5b29b4da05133b016c7764b8c48b5906b046a41aa66399f47662d8a829b7f6d34ce791379d719fd57195fc3ac20df9539dcf1b39090e9983
 MISC metadata.xml 334 BLAKE2B e7b28e7d3e7c6fdce0c5120b29fbf5aa607408e2add6c0ad42e921fb1add9def38c6cb191129a5a6e1f0e3ea119caa6cdc74955b572e5d2c6f854d0b7c7c521a SHA512 a24ccf633fc9c2670dcd35801d95bd8ca0f4ea4d3d53b6651f2e8e3e280b95ec8a464d99f5423942c14b0777ae4551f46c1ff285caea460bc91cbc417a7a5b70
diff --git a/app-crypt/certbot/certbot-0.39.0.ebuild b/app-crypt/certbot/certbot-0.39.0.ebuild
deleted file mode 100644
index 186da7592eca..000000000000
--- a/app-crypt/certbot/certbot-0.39.0.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=(python{2_7,3_6,3_7})
-
-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
-
-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"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-CDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-RDEPEND="
-	${CDEPEND}
-	>=app-crypt/acme-0.29.0[${PYTHON_USEDEP}]
-	>=dev-python/configargparse-0.9.3[${PYTHON_USEDEP}]
-	dev-python/configobj[${PYTHON_USEDEP}]
-	>=dev-python/cryptography-1.2.3[${PYTHON_USEDEP}]
-	>=dev-python/distro-1.0.1[${PYTHON_USEDEP}]
-	>=dev-python/josepy-1.1.0[${PYTHON_USEDEP}]
-	dev-python/mock[${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}]"
-DEPEND="
-	${CDEPEND}
-	test? (
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)"
-
-python_test() {
-	# acme is not installed, removing it here is fine, the dir just confuses tests
-	rm -R acme
-	pytest -vv ${PN} || die
-}
diff --git a/app-crypt/certbot/certbot-1.0.0-r1.ebuild b/app-crypt/certbot/certbot-1.0.0-r1.ebuild
index 23177e8bb65c..6b8dd39904dd 100644
--- a/app-crypt/certbot/certbot-1.0.0-r1.ebuild
+++ b/app-crypt/certbot/certbot-1.0.0-r1.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=(python{2_7,3_6,3_7})
+PYTHON_COMPAT=(python{3_6,3_7})
 
 if [[ ${PV} == 9999* ]]; then
 	EGIT_REPO_URI="https://github.com/certbot/certbot.git"
diff --git a/app-crypt/certbot/certbot-1.1.0.ebuild b/app-crypt/certbot/certbot-1.1.0.ebuild
index e3c2f890315a..ec673774775d 100644
--- a/app-crypt/certbot/certbot-1.1.0.ebuild
+++ b/app-crypt/certbot/certbot-1.1.0.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=(python{2_7,3_6,3_7})
+PYTHON_COMPAT=(python{3_6,3_7})
 
 if [[ ${PV} == 9999* ]]; then
 	EGIT_REPO_URI="https://github.com/certbot/certbot.git"
diff --git a/app-crypt/certbot/certbot-0.40.1.ebuild b/app-crypt/certbot/certbot-1.2.0.ebuild
index 308bd367bff6..ec673774775d 100644
--- a/app-crypt/certbot/certbot-0.40.1.ebuild
+++ b/app-crypt/certbot/certbot-1.2.0.ebuild
@@ -2,15 +2,16 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=(python{2_7,3_6,3_7})
+PYTHON_COMPAT=(python{3_6,3_7})
 
 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"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
 fi
+S=${WORKDIR}/${P}/${PN}
 
 inherit distutils-r1
 
@@ -28,7 +29,7 @@ RDEPEND="
 	>=app-crypt/acme-0.40.0[${PYTHON_USEDEP}]
 	>=dev-python/configargparse-0.9.3[${PYTHON_USEDEP}]
 	dev-python/configobj[${PYTHON_USEDEP}]
-	>=dev-python/cryptography-1.2.3[${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/mock[${PYTHON_USEDEP}]
@@ -45,6 +46,6 @@ DEPEND="
 
 python_test() {
 	# acme is not installed, removing it here is fine, the dir just confuses tests
-	rm -R acme
+	rm -R ../acme
 	pytest -vv ${PN} || die
 }
diff --git a/app-crypt/certbot/certbot-9999.ebuild b/app-crypt/certbot/certbot-9999.ebuild
index e3c2f890315a..ec673774775d 100644
--- a/app-crypt/certbot/certbot-9999.ebuild
+++ b/app-crypt/certbot/certbot-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=(python{2_7,3_6,3_7})
+PYTHON_COMPAT=(python{3_6,3_7})
 
 if [[ ${PV} == 9999* ]]; then
 	EGIT_REPO_URI="https://github.com/certbot/certbot.git"
diff --git a/app-crypt/gcr/Manifest b/app-crypt/gcr/Manifest
index 0a046554d893..c46588da4fa8 100644
--- a/app-crypt/gcr/Manifest
+++ b/app-crypt/gcr/Manifest
@@ -2,7 +2,7 @@ AUX 3.34.0-fix-desktop-files.patch 2102 BLAKE2B a733e4c0c62d8d80229663efe81d5d56
 DIST gcr-3.20.0.tar.xz 1324216 BLAKE2B dca283d1bde4994ee60666b2d5fdc4f0861df453355dcf20cea22a87808da0b9284506460ecdfe779ab9ecdf4ce17e231bd1d9426d677511684c35e43da19550 SHA512 0acd0fb085a38507b1cc895ac773f91c6f4e14d2ea7e27b8e74c85ef78426597b6ea08ebee696452b0651939ec4a0d8a4a2523c41b3a8a0bd1b0d7b338b1d9c7
 DIST gcr-3.28.1.tar.xz 1334896 BLAKE2B e7035dd0ac5ef9e9b0898e3e4512768ec7cb548cf0ec4ace5a4f0f9a63d3015f8a041bc6f0a0c990c1666eb92c047eab4c19338a8ccf2d8aa9b11830dbd9d5c5 SHA512 ae36c39584d6bc2ba9d86de8bc71eac21fb3251b966ab1eddf467d01ed5789ba6e6597c83ea2ed9403e632893e7c7cb6c17e04878d726b72528af9199bebb3da
 DIST gcr-3.34.0.tar.xz 1454244 BLAKE2B fc84e5eaa3b2822d1c04fff3b8b343de2655cce34317327a3594b506172c703a9d4b1d5562ed213bc1ae7df5d31ac1c5ab3c5733cfe8e5edf85e334ce7ff85f4 SHA512 9314b531ed46a42b2c8c1531c7d95003db04f2c8065e46f4e6a84ec26400ce6302ea71c4db42a8c7b98884a0b84d75a0ca65d988aa0fe6de6d897d772b070093
-EBUILD gcr-3.20.0.ebuild 1829 BLAKE2B 4cdb4fb25af92ac581d523cb513f4e9f3ad0093e3a76f1aad302c2acf0ca504124844ff74e12cdd6e09033f773dbc73e9a6aac584372e7fc77f8539b191a947a SHA512 2600a29a8235220a14fbfaa97253d9aa879edfcb0551095e2b45aca4879d8ade80bdf7f3dbc6ec1d05fd41b5f287b885a01de88cd55104f01722dacc37db4a1c
-EBUILD gcr-3.28.1.ebuild 1870 BLAKE2B 6fa9610bebbeea98214a751bf7302a759c21d584dc0e9d7bda104bc1ffdbc8d9c9879af23a0eed3e8fbbb854cf4fae77845c101ca2e643425a1b9bc8c30bc925 SHA512 575baec3c6962b1df651d74895d105a9251878eb107637ed000350bfc216201a249eef098b5f77661db82ffb53a469cd12b18b09fe1931386ef2e1eaa2120906
-EBUILD gcr-3.34.0-r1.ebuild 1903 BLAKE2B 23288de8ea7ad89cf509ccd8f52a5c25d06706727c0a6b59210a5edb24d4f245bd2c91ae236fffe867282bc0bfc8406a4e6547a74f364bba6ac46bb7de31dc7d SHA512 812b9e273dada36303997dd7e097f98a8cb3e17e7a600f1f2c990ca32cd69e17c0f0c9e2a24ea7a71c57539bb544010cae80157dfcc0c36aa3459e22ea392431
+EBUILD gcr-3.20.0.ebuild 1830 BLAKE2B 38d18d2e2b4cf13d8ad5f9fbb7eb8ccd21c038eed114b2f5b22f7ebf51e37fc93d53403d07c0d8519db3f1c62a2e54cc4e472465cf1683f0bfb105c240cdcad6 SHA512 8fc50555fa762a3cd89e5d224361c7b58f2253db402928d59ad595707ee76e2ee15bc9a0547730f318347d4017974471c23e9fd28520e077069d2c2590cda00b
+EBUILD gcr-3.28.1.ebuild 1871 BLAKE2B fce62eb9dbbf5f51545d7506ec2f439ae3d2991c077b4fdb00ed6f0e47d1b8310437843c3e291d8661c487e75bed955404c23fff8c4bc46b014934c93b74f63d SHA512 8af0259414d7777538fab1dd68da4c39f9c68cbe37bc9ce5f01c833530673db4f2d4d92c259e9c3589918256a43175f0c59acabb747b29d9f567263a7fd2fe19
+EBUILD gcr-3.34.0-r1.ebuild 1897 BLAKE2B 547c94084e23f342d15c7fe24558bd63608734ebec1430800ad719591be1f91bcb8388f6d3ca2ed3d2b8307b0be6854e6daec1289a5601fa971f0852bb57f9f1 SHA512 e9df77eb782b097d0376a6129bb43915a1f76fd2f731dae57a688fb749a452ae0a9f1d07db0c613a0c34b38f306e9ed656af0c89646e68d77746a405a912a86e
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/app-crypt/gcr/gcr-3.20.0.ebuild b/app-crypt/gcr/gcr-3.20.0.ebuild
index c92d9cee4eb7..822c8e5baacc 100644
--- a/app-crypt/gcr/gcr-3.20.0.ebuild
+++ b/app-crypt/gcr/gcr-3.20.0.ebuild
@@ -16,7 +16,7 @@ SLOT="0/1" # subslot = suffix of libgcr-3
 IUSE="debug gtk +introspection vala"
 REQUIRED_USE="vala? ( introspection )"
 
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris"
 
 COMMON_DEPEND="
 	>=app-crypt/p11-kit-0.19
diff --git a/app-crypt/gcr/gcr-3.28.1.ebuild b/app-crypt/gcr/gcr-3.28.1.ebuild
index 868f38cc2306..5cd37b1e48f6 100644
--- a/app-crypt/gcr/gcr-3.28.1.ebuild
+++ b/app-crypt/gcr/gcr-3.28.1.ebuild
@@ -16,7 +16,7 @@ SLOT="0/1" # subslot = suffix of libgcr-3
 IUSE="debug gtk +introspection +vala"
 REQUIRED_USE="vala? ( introspection )"
 
-KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris"
 
 COMMON_DEPEND="
 	>=app-crypt/p11-kit-0.19
diff --git a/app-crypt/gcr/gcr-3.34.0-r1.ebuild b/app-crypt/gcr/gcr-3.34.0-r1.ebuild
index 3c984e3e1e38..45860e2fe1a0 100644
--- a/app-crypt/gcr/gcr-3.34.0-r1.ebuild
+++ b/app-crypt/gcr/gcr-3.34.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -18,7 +18,7 @@ IUSE="debug gtk +introspection +vala"
 RESTRICT="!test? ( test )"
 REQUIRED_USE="vala? ( introspection )"
 
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris"
 
 COMMON_DEPEND="
 	>=app-crypt/p11-kit-0.19
diff --git a/app-crypt/gentoo-keys/Manifest b/app-crypt/gentoo-keys/Manifest
index cb16e0735520..18f17c90ba57 100644
--- a/app-crypt/gentoo-keys/Manifest
+++ b/app-crypt/gentoo-keys/Manifest
@@ -1,3 +1,3 @@
 DIST gentoo-keys-201901130136.tar.xz 57124 BLAKE2B 93963930743ec3b6497b90de7080c5796af90601b311a0ad1d0049f945ae63e384526c3858bb1b209e2ddcf26a862f6ea3b474fc69ed4a22f1ec5c2be4ae952f SHA512 2c87a85d2c5e2c51af8f64183a0cc4d372dd84af9aa3d7e92ae0d9dc804c5109c0c7121419503213eba3fcb8f7fa81ccaf0550418991f8d6b4b43560e02f777b
-EBUILD gentoo-keys-201901130136.ebuild 550 BLAKE2B f9838e2ad76d15cc08cbc81162fcc43a2ac58021f3ae03a8489145468e993749358912560a698d104b6c3cb3ffa9e3fa934f8e8fbda8abdecc76d852a2b6cb80 SHA512 f018e23a0771d91b57b95f76071197aec76ae220613457fb7baf1bd0935a9b8f97cb0f3579c4bcdf89e4a70080eaed9e7ff4420b9919e4107045d94868ed9610
+EBUILD gentoo-keys-201901130136.ebuild 551 BLAKE2B 6b93c4e2cdc7dbc04571676e8c58836d5da925132de8e93a2666ead0d738e6fd2cd8407ada6bbd668797fee14b4a4db79dee709c7fb6fa39ccb93884560178e2 SHA512 2f36799ed7e7a33f24deb7996e1b6032f10eb739fdac3a7c3839e792deebf1259fece9480919d890f88a5c996a71a6f3bbef7b8f1f3c799a8f265b91dbdf43b9
 MISC metadata.xml 257 BLAKE2B cf62bcaddae6a9a234fa866aa93f3f8435bc640ded3947993321f8a85e622a2cc0d3df0290bec76b227a4286544314e6a31dc37026482541b4922d6dc11d174a SHA512 62e56bca988936416042bb794e7c8dad9930a46c1f81f51c60a22f3f43e2d0babaacdbef430a6f8ecc8ea7d949effa6136b6d066dabb0a80fde55c36ea3c080c
diff --git a/app-crypt/gentoo-keys/gentoo-keys-201901130136.ebuild b/app-crypt/gentoo-keys/gentoo-keys-201901130136.ebuild
index 3c104fab50d3..a45a2b59cefe 100644
--- a/app-crypt/gentoo-keys/gentoo-keys-201901130136.ebuild
+++ b/app-crypt/gentoo-keys/gentoo-keys-201901130136.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://dev.gentoo.org/~dolsen/releases/keyrings/${P}.tar.xz"
 LICENSE="GPL-2"
 SLOT="0"
 
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~x64-cygwin ~amd64-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~x64-cygwin ~amd64-linux"
 
 S="${WORKDIR}"
 
diff --git a/app-crypt/gkeys/Manifest b/app-crypt/gkeys/Manifest
index 00558b443d89..e07d4f707443 100644
--- a/app-crypt/gkeys/Manifest
+++ b/app-crypt/gkeys/Manifest
@@ -1,4 +1,4 @@
 DIST gkeys-0.2.tar.bz2 47726 BLAKE2B f85fcad78251ce8e4b49d452332af869140611161256663310c3a050f7a3c5313f6e37836d90c5a40b1abb043ff7412cea3b5decd3f1c6db24ff5811dd1b9709 SHA512 0c594b5f451329e5e85998bb96243812e0c6e7ef7fa4db0f276a870148adffcf41acc31631fb28c44c473690f154e130ddcb10b986d4546ca19e2cc8cda95036
-EBUILD gkeys-0.2.ebuild 1684 BLAKE2B 1f418301bae7a28231c2e81db9cf4528fe75c68e20dddb728f15e0158ba853c399665da545a738241c59b00c9b1e5d7bf4fdbc85e9aa013e7f57bddb5ffb7bb8 SHA512 917e58b5c69c3c0fba5f1806c4147268417943dba9fdc911f0f61126755b320c7b8b971a6091ecb609829423a7db9fdbc37ba7f90ce7113dc210dbae31803079
-EBUILD gkeys-9999.ebuild 1605 BLAKE2B 764541d0e17fddadf4a97e140a361f0c2a3794eef9cf2c61415fdf97bee20a877f49cd9627028fd03271e1ab737c70bfe8f372aa04eed19315155ea88c7060ed SHA512 51876445bb3785a3a0cf318ce2a9bdc7ccc6dc4b228cba031f3e81c64d63d25e5a48a4d7750bea113c13a8e3855d85728afd56ac3b87420438db26f785314e51
+EBUILD gkeys-0.2.ebuild 1678 BLAKE2B d00426355a870f2e831e3b3501a3213a050cda76b1479d5ff50fb074b8852f98c48b45a75f2eba73bea6b1365e14cb0546afcc4c7be888b7c3f08ddf3ea06f51 SHA512 733e2a419031d5b366bcad1ac5c32a30fddd77ced5e69df5eb9d969f2489f1f86929e459fca25899d554de9f5ffae43c936c464349c2c1edd26fa46a1dcbe2a8
+EBUILD gkeys-9999.ebuild 1599 BLAKE2B 620f14a72cc4b6b24e8bed657f0176ab6c249ef1671d56da5f0d4183d9e310135891c0ebb2ab7f7acdce933c2ded8fc27334678e1ac7ff42d06285192ec503a3 SHA512 a29d606f76f71eb689e611a64742af8ecd45e60e82f2756d4a5b5161990ed139a326f00c2c3e3b34a8ce042089c37dce7f3489537f7745ee57223f0d998a49af
 MISC metadata.xml 257 BLAKE2B cf62bcaddae6a9a234fa866aa93f3f8435bc640ded3947993321f8a85e622a2cc0d3df0290bec76b227a4286544314e6a31dc37026482541b4922d6dc11d174a SHA512 62e56bca988936416042bb794e7c8dad9930a46c1f81f51c60a22f3f43e2d0babaacdbef430a6f8ecc8ea7d949effa6136b6d066dabb0a80fde55c36ea3c080c
diff --git a/app-crypt/gkeys/gkeys-0.2.ebuild b/app-crypt/gkeys/gkeys-0.2.ebuild
index 6c43acef19a1..3f6a31b7af09 100644
--- a/app-crypt/gkeys/gkeys-0.2.ebuild
+++ b/app-crypt/gkeys/gkeys-0.2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI="5"
 
-PYTHON_COMPAT=(python{2_7,3_6})
+PYTHON_COMPAT=(python3_6)
 
 inherit distutils-r1
 
diff --git a/app-crypt/gkeys/gkeys-9999.ebuild b/app-crypt/gkeys/gkeys-9999.ebuild
index 537c49af63af..6729c94cb2fc 100644
--- a/app-crypt/gkeys/gkeys-9999.ebuild
+++ b/app-crypt/gkeys/gkeys-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI="5"
 
-PYTHON_COMPAT=(python{2_7,3_6})
+PYTHON_COMPAT=(python3_6)
 
 #EGIT_PROJECT="gentoo-keys.git"
 EGIT_BRANCH="master"
diff --git a/app-crypt/gnupg/Manifest b/app-crypt/gnupg/Manifest
index f5674dce1a67..61ce2cf5d92b 100644
--- a/app-crypt/gnupg/Manifest
+++ b/app-crypt/gnupg/Manifest
@@ -2,6 +2,6 @@ AUX gnupg-2.1.20-gpgscm-Use-shorter-socket-path-lengts-to-improve-tes.patch 1048
 AUX gnupg-2.2.14-quiet-sending.patch 1225 BLAKE2B 3165d5b8242a0bad7913881dfac66433bcea9f5d97a58f43999166ce682671060a934ea1618fd90c7b892b4f3565ae0c3e57ad2f8f7b200a52145452d56ad8bc SHA512 f61f029ac72626e0c7d3bf29d483fd313ba723ae47bd7659b4fa72252ec9b5f329510d37ae92c41dd7dd45a3b99e846ae3d83a7bb37825e95e6d10f29b131853
 DIST gnupg-2.2.17.tar.bz2 6717554 BLAKE2B ad052a0d1e970fe7748563a0ffa105d427e3d9299237f15ce93aa47b676cc1fbf0691cf2112dd5b55ba5fc9d2a6988f999415dd5026d44c5cb4bfef9f99189cd SHA512 a3cd094addac62b4b4ec1683005a2bec761ea2aacf6daf904316b1819f4f6a41f256a8d9452cf28cad71b3e68228465baa27ae0eb1fa734fa91542ef0f159c5d
 DIST gnupg-2.2.19.tar.bz2 6754972 BLAKE2B fc1b9afb398ef78a6d239c62fc88cba7148679b1b666ac39dbd9644847e99de1a683a7938bc112cb33adafe555472319dde4f64860071446a66cd79934f7d69c SHA512 d7700136ac9f0a8cf04b33da4023a42427fced648c2f90d76250c92904353b85fe728bdd89a713d847e8d38e5900c98d46075614492fdc3d1421f927a92f49dd
-EBUILD gnupg-2.2.17.ebuild 4526 BLAKE2B 5d8955d5d61bca911b9a98f68d2116837eebc647e95c43bccdc818a0a7cadaa1eed3ec8ced1088e6f58ff5395d0a5a848dbb1cdbacc939054e717db6618aa9bf SHA512 bb6fa0405728540c99d57b4e8287c6b7e8cb785536e348641ed146eacbe8c27600a8e37db9150e888f7ce9580445c1fbd731132f02545d60973b5c3d0a8c4c76
+EBUILD gnupg-2.2.17.ebuild 4527 BLAKE2B c0bf1d5e921aae616e71f502f07393eaf2ca08ade976508e641ef7c433d3ecc679f6e99717660268cf4c2b50fcc122b8275456ccc49b979f0078d6a81b48e994 SHA512 2132540fdb5cac7b8a254a78eea6bcff7acdc869fdce06502ff736a559304df0672b01efdc19d5996f0ebb1d6be6c2e864d67a4fd17f62933c784a18add7ccbd
 EBUILD gnupg-2.2.19.ebuild 4489 BLAKE2B bb208c75fd25593169ab9683837ae8e1eaf2b804bc5e9ef0603d8b1f4419ac004b2e98efcefb11bb06a8b36a9cb4d2d3117b9333c329a1c2dd2998fd6abe5a20 SHA512 773032d850e56b525332b5589f564b79b85c2cab7c8909f5fc945b0e4a5cd33364f56eec6b2655d34f5e8ca034bea1e484d218f609787c652bc3336012417f9f
 MISC metadata.xml 1212 BLAKE2B 36bd1e7478abbb579b33292418dc621c65869151cfd0cbe9cb7b553adf92b606273f415db763ec5c3884e91f29929f79de1cbf15cc47626b1115b168d567790e SHA512 646ec87262b7069808976e17fae4b2101f9a8aae7ad5bbd10abce6077a5e4e741eb5692997af4383cf8cd3e6b03ded83f9dd5245ed112533c6a6e4c752b1060a
diff --git a/app-crypt/gnupg/gnupg-2.2.17.ebuild b/app-crypt/gnupg/gnupg-2.2.17.ebuild
index b55bb14f0e29..62dc562e7bf2 100644
--- a/app-crypt/gnupg/gnupg-2.2.17.ebuild
+++ b/app-crypt/gnupg/gnupg-2.2.17.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 ~sh sparc x86 ~ppc-aix ~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 ~m68k ~mips ppc ppc64 ~riscv s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-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/gpa/Manifest b/app-crypt/gpa/Manifest
index 2eb06682bb4c..c1f0eedf5130 100644
--- a/app-crypt/gpa/Manifest
+++ b/app-crypt/gpa/Manifest
@@ -1,3 +1,3 @@
 DIST gpa-0.10.0.tar.bz2 782455 BLAKE2B ef663432cbe20fb5c543696627f448b3970099b6a0f8f68b57e3d87af03550597adcfe4c27c2774d1f278cfc9d07a089652f42ef4f8c3cbc0192b645c465ac0e SHA512 87004fb0806e76012bc194f95afe9ef6044aec890b26e845f45c314e1bd8864f056ba5e32f9ef2e15b24b50840235e6e548a5e3006b255b4f1c20e0fd7710a3b
-EBUILD gpa-0.10.0.ebuild 817 BLAKE2B b22b22370bf02d4cadbf7cce92ea82998c5038a76696cc054c06567ce895ad210b60ab6941007f4330e6506c8b43aac0dc82c046684649b79b64fb2c52b29635 SHA512 7d4c2fdb650842c1548bf23841773e5a0d6b51a8f6c43cf87e9fcf4bd29e1803d92ebfb06272bbbb6eea5c29f71f3daed5d21fa670c1eed87f4ad6e48917aecc
+EBUILD gpa-0.10.0.ebuild 818 BLAKE2B 8bc073b2a475f7673fc7742e65233b67df919bb790430ff0b923b64fc31eb4952b4f1b4fb0cf406b29a0c430c74a968ed7f19ea47c8325e512dd5323c4c73fe7 SHA512 17cf1c0dc7c09b81f6b0c3f03e5fb41da6ee524670c7161173b5cc4077a5b15c9b8c365da0b6d5b08df782738ff81c9c92837ad44e0b7ba6815f1353654d44e1
 MISC metadata.xml 251 BLAKE2B d75781c46bd2764ba6a64a2ba01f0098ac80664dff29e71d7804bf2687cb04d0255c6f0f33f29cec0aeb5507307be34d78de33f308a032990759bca2ce26108b SHA512 bd4fa9d3efc3d892de2b5912049b96e4c55bb081c85d032e1cb84f68e7e22acbca76b82b20c9dae524e9c7a7802dd0b7dfed9a8f7521e04bd8c0c115213f4346
diff --git a/app-crypt/gpa/gpa-0.10.0.ebuild b/app-crypt/gpa/gpa-0.10.0.ebuild
index 6dc36a184f1a..1f194ba4974d 100644
--- a/app-crypt/gpa/gpa-0.10.0.ebuild
+++ b/app-crypt/gpa/gpa-0.10.0.ebuild
@@ -9,7 +9,7 @@ SRC_URI="mirror://gnupg/${PN}/${P}.tar.bz2"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="alpha amd64 ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 ppc ppc64 sparc x86"
 IUSE="nls"
 
 RDEPEND="
diff --git a/app-crypt/gpg-ringmgr/Manifest b/app-crypt/gpg-ringmgr/Manifest
index f3d2295ea2cd..078b130f71a9 100644
--- a/app-crypt/gpg-ringmgr/Manifest
+++ b/app-crypt/gpg-ringmgr/Manifest
@@ -1,3 +1,3 @@
 DIST gpg-ringmgr-1.12 9378 BLAKE2B 673b1f6719dda0019c599a8ebc1d38e748c7749f07c8145f48dfff81515574080eec0b208868f89aa9f32b225d6efa4205e60a6298bda8151eb4a7d6cfb86df0 SHA512 f6aedf0db58c15163f6f08b37a5fef43a80655f5602d8ee856764177a33e2f5eb4c0b8a09e9f3ee5b36544039051909d48397be5793243eba5002526652dd194
-EBUILD gpg-ringmgr-1.12-r1.ebuild 624 BLAKE2B 25fe2112ad9b822fd9ff27dae59c26171f916b5169b619d5e7005dbb04e8f5b605b7513cc7fcdd3c48872cbfc821fb17fa6ba107a36debb603e02ba97c863674 SHA512 0d922bd657deb018d8b24aa24283cab8fe42c15780bb5d34fb6db589b5beb5eee41a404afbbca10bda08d401a65aa3bee15b1b5cb635a83b95a78dc9ce19c79d
+EBUILD gpg-ringmgr-1.12-r1.ebuild 625 BLAKE2B 8fc6aa28b1115e02d41c32fbf13e0877603c48079a5c2290ce9041ba63edf61ed4d6a2d38a37f046af7effb099950a0dc4abf55ddfcc2c96bbbb6e8a25f8fa9c SHA512 cb92cd1c33072398e94e4e3d3295dd2d9f8a79a2c65244587fd0e9871b78b0b4a3c5ecba357cb9905d19fa9c654435bf391cc727531a8f4f99f49ebf035cb15c
 MISC metadata.xml 268 BLAKE2B 914b6995ad966e2b83ec718b2598969b181c119d8805241b0046f69e161ac22a9f769204f4783240056804008475aa406cbd91b9de499ec7840f9595158bd291 SHA512 ffda1db3fd6ac952f41a970e2e496c6a9fd0b12ed11cdf363fd269c3b00f627c6e70421fd545aad61d69594af2e5f43d8ebc197232a39b596d012818fe758850
diff --git a/app-crypt/gpg-ringmgr/gpg-ringmgr-1.12-r1.ebuild b/app-crypt/gpg-ringmgr/gpg-ringmgr-1.12-r1.ebuild
index d8ce17dff6b8..d1bd4ee90e8e 100644
--- a/app-crypt/gpg-ringmgr/gpg-ringmgr-1.12-r1.ebuild
+++ b/app-crypt/gpg-ringmgr/gpg-ringmgr-1.12-r1.ebuild
@@ -9,7 +9,7 @@ SRC_URI="mirror://gentoo/${PN} -> ${P}"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 hppa ppc sparc x86"
+KEYWORDS="~alpha amd64 hppa ppc sparc x86"
 IUSE=""
 
 DEPEND="dev-lang/perl
diff --git a/app-crypt/gpgme/Manifest b/app-crypt/gpgme/Manifest
index 90cd15a357d4..2a13ec447f3a 100644
--- a/app-crypt/gpgme/Manifest
+++ b/app-crypt/gpgme/Manifest
@@ -1,6 +1,6 @@
 DIST gpgme-1.13.0.tar.bz2 1820504 BLAKE2B 71fbb034e3c5939d1953554ccbe0e89e2089c53a4c79e90ee51bdf96500bf4be8a5e1633772ab8dadd44616dde7be551ad7d3af0a59d7e1df10a19cd9cf56baa SHA512 47a7a67dcc6d111cddd805d288d42e870948114a6dc09ce0675ad8b3d1580bbc2a683e1e70cb2f416919cf2129c72a9ff30e2e3b9527809d04e863cc1f87267b
 DIST gpgme-1.13.1.tar.bz2 1759616 BLAKE2B 17fff261ab76b72e096aa42cc847443bfd3bbf0eb6d04af1d38561ddce1d11cfe9a98b6ced268b28f33e2cb7d900a9e6b3dfc56f1c784a021dbefbf493522e70 SHA512 11de670c6cf512508103fe67af56d9fbb2a9dda6fc6fa3cd321371bbe337c7c2c81913ca557d07187adb2a63d37ea1a44da97ab22345bbe6022c405d0cb083b8
-EBUILD gpgme-1.13.0-r1.ebuild 2887 BLAKE2B bc1667eb1d4542688ee5ecd33cc64cb4e3b4d62a79080c096f3faacc678fe5f4ec1fa151a63a9ca7633bb3d72060ad4f6bbe264d3a2259c567261257a6bae045 SHA512 8fbaf22d228d115ae95d15898b074dcc7e4fdd872790aace785f6c16ea37ee54902f3065280824bf06cbb147db0591ebc1ffd065c6614fedc8f4a4b8faa877f7
-EBUILD gpgme-1.13.0.ebuild 2878 BLAKE2B 9b5c3ffaaa3ca9de98afc23af1fe731000fe9aed662a9053ee6a791b33782d45ed9789e232b9fed497ee32b08bc43be2a2bad576e28fb77478cd94e4292548da SHA512 3135538a2f02f71aee1b93ebf9eece9f4f52085ca85d6a242531de19bdeab2b66aa03197751f4fb0c57e628b382a5757434bf297cdb121f48f960a187c81a695
+EBUILD gpgme-1.13.0-r1.ebuild 2888 BLAKE2B d03cdd1c7d7155a12ede43e1a2dc926ff02f8683939851f223429667a9f098aca9b81212c97a4ac110a36796329188a9fc81179ee12c4a012d4e6ac34e7fb559 SHA512 4a96c42c9ddaa716b23a7ef6ae0bd19be5841192b8b690000d13b647481877228a2df7647e594891e04f1d887018042b4075e67e19690071f3d081cce51526a4
+EBUILD gpgme-1.13.0.ebuild 2879 BLAKE2B a81453f31b8ac12f71f775c3e15a106c19568a95a100c2011325e930808178f7c49c3c329511ca024bd08385ccf6c5432cd8404d3189a3ca489bdec382057a36 SHA512 93f9151ec400608c96a20d9d41b72ca894eef83d6e4ff0ac853f99732736fd8154393bb62cb891aa3f75b408c9277ea34214553640186b33206834cea8fe0876
 EBUILD gpgme-1.13.1.ebuild 2888 BLAKE2B cc7ea42c3837b08e11b84052027a9aea30a5f817a91af70a5d7561b1c76e77429aeb75eb447d4efe3c728e1e38100b4c5c6e382015769bef3459afbecc3bb660 SHA512 9775783dfcfabc5988e680d03575754ac855666bfe87a12eb121ab4ec81dbd2e486a5dc1b06da1ec1e9e7af5688762670371e98d14b4dbe8a35b69c4ef712793
 MISC metadata.xml 438 BLAKE2B c080438b3f22dbb803acca5a47dd880271b97c2def132cb0fefbc3d3e30c663d02be6bc7553393ab1d33932313026ade3f3f0c576fb572938f0b5fdc6f07210f SHA512 5a5c496db2115e5bc4ccb81aa69995c85a6b967c3acaab1423f94d22c55965f8e9377711e8c3a4e359ae661ef9d6137959058500a6cb036656a5d14fb88d0bac
diff --git a/app-crypt/gpgme/gpgme-1.13.0-r1.ebuild b/app-crypt/gpgme/gpgme-1.13.0-r1.ebuild
index 365a5002510a..7b29d88b4f88 100644
--- a/app-crypt/gpgme/gpgme-1.13.0-r1.ebuild
+++ b/app-crypt/gpgme/gpgme-1.13.0-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://gnupg/gpgme/${P}.tar.bz2"
 
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="1/11" # subslot = soname major version
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~riscv s390 sh 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 sh 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"
 
 COMMON_DEPEND=">=app-crypt/gnupg-2
diff --git a/app-crypt/gpgme/gpgme-1.13.0.ebuild b/app-crypt/gpgme/gpgme-1.13.0.ebuild
index 07c417535970..bf39f0b5198a 100644
--- a/app-crypt/gpgme/gpgme-1.13.0.ebuild
+++ b/app-crypt/gpgme/gpgme-1.13.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 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"
 
 COMMON_DEPEND=">=app-crypt/gnupg-2
diff --git a/app-crypt/hashalot/Manifest b/app-crypt/hashalot/Manifest
index 084b727a0f84..f0b0fe5521f9 100644
--- a/app-crypt/hashalot/Manifest
+++ b/app-crypt/hashalot/Manifest
@@ -1,3 +1,3 @@
 DIST hashalot-0.3.tar.gz 80284 BLAKE2B 1ec902f917a1e3e5babb24ea8763360fff8d41ab0baa6fac8053313c2115bc03187fb805f6ae6c013eb7a4f8eb4111bc781d5ac04c275fdba87658f0346aa8fd SHA512 c9ee39cefce5cc73b9a3a67b240616db9b66cde94fa351e6ebd4d13fd0f9195de9021c07d223809107e50b0a091d0d55e4caf2f71bba93f6d0da86af10632145
-EBUILD hashalot-0.3-r2.ebuild 388 BLAKE2B cca763f4798b93ec43abae0d4c481680259e0644bbebaaf5ede498b032c79a267e4b72a088c86b0d7f5a62d9645b2fde356773211e470458aa6ea4bbfba6c445 SHA512 1586d8450a1d90482c862cb66c428a7913110086484e2c9ef701645e8a9fa69ecd8344438e62fa9e6ae7453535bf80adcf357a938753230475094a1194ac6e55
+EBUILD hashalot-0.3-r2.ebuild 389 BLAKE2B 9ec61c9e00b8e3de23b34e91e3168f7359cc42ea5b179cb13cc70476b1b4d617353d4e7bb5b4eacc7968fbf76d9b07b0a3dd3a14dbd2edc1d9a88627b2f98979 SHA512 e765d474ba6c318b517df8db4540eeb1dc1ca8ca5a10b194e49241931ca1a91db83840c1058f8d8020771114eadd4606e20b65528535be44c0d584692baad3fb
 MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555
diff --git a/app-crypt/hashalot/hashalot-0.3-r2.ebuild b/app-crypt/hashalot/hashalot-0.3-r2.ebuild
index 964b58f8e9cc..7a9be62b874f 100644
--- a/app-crypt/hashalot/hashalot-0.3-r2.ebuild
+++ b/app-crypt/hashalot/hashalot-0.3-r2.ebuild
@@ -9,4 +9,4 @@ SRC_URI="https://www.paranoiacs.org/~sluskyb/hacks/hashalot/${P}.tar.gz"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86"
+KEYWORDS="~alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86"
diff --git a/app-crypt/heimdal/Manifest b/app-crypt/heimdal/Manifest
index 573d275c8c4a..fc40900aa872 100644
--- a/app-crypt/heimdal/Manifest
+++ b/app-crypt/heimdal/Manifest
@@ -15,7 +15,7 @@ AUX krb5.conf 424 BLAKE2B 49b8a0aab6e0dacb70b91e030bb5f2b8bdfe4253026f85e2c9d16b
 DIST heimdal-7.5.0.tar.gz 10071281 BLAKE2B 917f5855248c333e5ec35bf992973d8b5fb84581b9c3bc8d42c328e5f878ce24c5596c5a1e3fbca786a71be04984068efbb817f7336135056d1feae38895758f SHA512 6d1ad77e795df786680b5e68e2bfefee27bd0207eab507295d7af7053135de9c9ebb517d2c0235bc3a7d50945e18044515f0d76c0899b6b74aa839f1f3e5b131
 DIST heimdal-7.6.0.tar.gz 10186832 BLAKE2B 456b495a3d0a196cf02d6042c6db72c772327545fbc84f7bb758f55f3fca025432bf319fc33e9e0b5fe5ca78b83aea9dc47d77bf1f5b69ae88f1286a22c41263 SHA512 3f7ce090cf8da91f19675a1d9f6bd65c83b3a847337739481506f09d74001cb44283b103ba684dac8a5f11ec48605b5476240c534f6fc36442fb874b73680200
 DIST heimdal-7.7.0.tar.gz 10189293 BLAKE2B db9cdd1861dc9214a7f76b3d8b9656cfc0bad11cb6eadffa4fa29ea7f9aabd4c3d1b628c510644ec9abe1b3bf27a413ccf8cd590d602c4a4ac54ba3deb4cedc4 SHA512 6660939b5a36ce36310721a08a089fb671d1e3d2e8ac74ea4775bfa5f8f772d32de805551456200fe96cc486c092c44beb84f5dd877008bc305490ee971bbf99
-EBUILD heimdal-7.5.0.ebuild 4345 BLAKE2B 1d6a9c1cb415c6561b19c3b4be269de3680cec4e74311e0f777b6247d737c3ceb2df3ed0d1150b9b66f695ffbf73bd3757b4e974fc88a7531b01a646e37def83 SHA512 b9125bdd94cc21c2868c64eb4776eae94e1081f31664ab9e1f2c58388e27ec4ed05a884b133ceecd300d74b1af600418ff41fefcd10efcdbc19a6027cb815666
-EBUILD heimdal-7.6.0.ebuild 4552 BLAKE2B e7828dec2a120c842e8706cdaabe8f1998efd53f8e52dfb3f49ce1919deec1cfad94efdf6fcd808bb4d27e8dec75f6c548624820955fa300a934c15a2ffe55d5 SHA512 305b1d1ab895bd714b3e34a188aacc03f86c92f1d4dde7f38aede4410e5f634a72f3451cb42b7bd129c523c8d2118cd70575c0b00c9e07b4ba0e602ae6a56ddd
+EBUILD heimdal-7.5.0.ebuild 4346 BLAKE2B 9a2a4af96f914167d224dc57a463ea4b5ddb6d2bb43f4fee5f8fe1734a947ed66382b919573538ae3c0c0773cec5e4ba15900427dd37c905cf9a3c3e6178b4ba SHA512 2d7caf14e6f7754c0aa2bbfd52d54b66c99dbcca8d6e5d870261d49ff6e8aeb2cc66472f12bd4370ad66e2fe752323ad95aaf35667d90a3c153c14873ff7f844
+EBUILD heimdal-7.6.0.ebuild 4553 BLAKE2B b48931abe23fc0127b920c73a26733ad9662b82acbe686995a396aa726f391e3c4bf286b8bcb4c98fb2e61dd228dd8e6b33665f8466614cc4c6bbe21b87777df SHA512 1f61122041a96810e9f6f5945a5ce116f3e44de6e47ff13c607b978edaa742aba32db7d756941d41e74d09ab5292510e8132bd014831517d6c0a71ce25d66266
 EBUILD heimdal-7.7.0-r1.ebuild 4545 BLAKE2B 38277ef5002d659f4260eeacd3b39cf82eb1e6a3b13ba67f2d3015d211592270d938e91f1060dd05a0fcd78f8ce8707d1807fa0164ef1e415130efe8324ffe5c SHA512 78c263c9abf545732fe091798f662c423a02e2e30180502b70676f6a653d71b9f8984db0b719ddc524028aa67bf74ceef545225cd77d27b516d11bb15c0e3d8e
 MISC metadata.xml 722 BLAKE2B 9ec2bb074bf4932b0bb2f949eb3c33c8ed8b82305d6641a6954084120c658005cecc2cac57ad85a1df520f5bfd115deef57f80d874ba850d857a813b5a87c139 SHA512 5f3c28c222eb668e3c1d3b7fe24ae3622c82f94b6008a4c3458aa76afac9508d6e7f150de0f06e4845a5b0653ea04112fe0c2b421f199b5feb9ef771ab0b0b28
diff --git a/app-crypt/heimdal/heimdal-7.5.0.ebuild b/app-crypt/heimdal/heimdal-7.5.0.ebuild
index 8db06b10a500..c3321f3eec67 100644
--- a/app-crypt/heimdal/heimdal-7.5.0.ebuild
+++ b/app-crypt/heimdal/heimdal-7.5.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/${PN}/${PN}/releases/download/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh ~sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh ~sparc x86"
 IUSE="afs +berkdb caps hdb-ldap ipv6 libressl otp +pkinit selinux ssl static-libs test X"
 RESTRICT="!test? ( test )"
 
diff --git a/app-crypt/heimdal/heimdal-7.6.0.ebuild b/app-crypt/heimdal/heimdal-7.6.0.ebuild
index e459e0905a2e..4cf287ec2237 100644
--- a/app-crypt/heimdal/heimdal-7.6.0.ebuild
+++ b/app-crypt/heimdal/heimdal-7.6.0.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://github.com/${PN}/${PN}/releases/download/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ~ppc64 s390 ~sh ~sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ~ppc64 s390 ~sh ~sparc x86"
 IUSE="afs +berkdb caps gdbm hdb-ldap ipv6 libressl +lmdb otp selinux ssl static-libs test X"
 RESTRICT="!test? ( test )"
 
diff --git a/app-crypt/jitterentropy/Manifest b/app-crypt/jitterentropy/Manifest
index 178bd2f5507c..8391d88a67fc 100644
--- a/app-crypt/jitterentropy/Manifest
+++ b/app-crypt/jitterentropy/Manifest
@@ -1,3 +1,3 @@
 DIST jitterentropy-2.1.2.tar.gz 24112 BLAKE2B 9328fcc6ac09b79765d53248e4d6d01be47348c6f22f660175de888a884ea9e65253cc2e6fd3620a96f69dd0051b97ea3c46462a24c8e0c94d2bba19afab059e SHA512 b1ba2fe22c6b7d5bca64bb1611f2da3f53f1979e515a16141ccf330e3ca27a6944f0e45f0db57f4e3963a30ea4b34920ce9173f9c4f3ea82b820dc739cbd95f4
-EBUILD jitterentropy-2.1.2.ebuild 1008 BLAKE2B 11ad9e49ba789d89a5214c542a910c93fc32838ef9d67aef46504456c10d40dfe0eba89a9114854963c0c638961b7335e4a2cb4527fcfd1a138dbf5912770e9c SHA512 228488a6e2ab91c01f02b797f04191b067310a7cb8f08fac98894964b2c8422fac8d8dd794672912c2c95607b1baa79d351279c8484c63dcc4b606148a3f5056
+EBUILD jitterentropy-2.1.2.ebuild 1009 BLAKE2B 1f8127f94b0c3c79afb1c4f9344320fd7a62c89596f1caa4ef84fc60c62200d67cc8fce06ed65e065172ed892ef028d040e925a826873e94b49fe6be36fdf3ef SHA512 0ce333852db58648d251019e79df22374f37c56d3c9489552e99e4bdddec97820264d8b58a9fa98b8a805cca1963895445ebf92dfaba83051d129587388eea56
 MISC metadata.xml 666 BLAKE2B 88598964271ee05c8427e8547d25dd50eb50bec1dafcaef064328dbca5140b9221b1d1823a1dc54289b73501556579fb39a85c49a6c25d6447a677e8db0f6252 SHA512 d6baaef1aa2e0958492872e7b0ba2c6c86dfa7e281268b6cb230c2cc2c8132df04e664e0449d24885357a1a791bb354253778e0e5f2436fa612b6e0c509729e0
diff --git a/app-crypt/jitterentropy/jitterentropy-2.1.2.ebuild b/app-crypt/jitterentropy/jitterentropy-2.1.2.ebuild
index a390c21e1d6f..e516259e8f5b 100644
--- a/app-crypt/jitterentropy/jitterentropy-2.1.2.ebuild
+++ b/app-crypt/jitterentropy/jitterentropy-2.1.2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/smuellerDD/jitterentropy-library/archive/v${PV}.tar.
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 ia64 ~mips ppc ppc64 ~riscv x86"
+KEYWORDS="~alpha amd64 arm ~arm64 ia64 ~mips ppc ppc64 ~riscv x86"
 IUSE="static-libs"
 
 S="${WORKDIR}/${PN}-library-${PV}"
diff --git a/app-crypt/johntheripper/Manifest b/app-crypt/johntheripper/Manifest
index d034be12a0e9..2e55aeaf2ce7 100644
--- a/app-crypt/johntheripper/Manifest
+++ b/app-crypt/johntheripper/Manifest
@@ -1,3 +1,3 @@
 DIST john-1.8.0.tar.xz 4468704 BLAKE2B 90d6acc03dc8d22ef869320723e4799e64e15b621cde327ad420595889a43242b182079fd306bb7741b766ddc5e1239e3bdd4f4e396a4ab1e86d635cbebf8f60 SHA512 e2820ecabd7ea4c7404c3d40f064994d0f5746b093c859a58fbf2588492ebcef411d9f3088c8e8ee726284ead969e26fdae834cdae3eb2d32408fc79ed906543
-EBUILD johntheripper-1.8.0.ebuild 3205 BLAKE2B 19020cb39d34709489ae53da2fb4d75bb802b36b387db610d31023cbde3f33baba49784c0198cff7ba17b30b6d18546045ce4a05f62e18ac2fe3382bba35aa1d SHA512 77ffdd4b3f049dd03e9ae91db19d7cbc5af4c673f329228d0d9f637356bb1cece0330fa35baf223b1deb68bb792d48dadca955e499bd526b74de2121089bfa36
+EBUILD johntheripper-1.8.0.ebuild 3206 BLAKE2B 60162946037ffa62b151caf235712ad2c0e25c7dd7c5384b29bde7dafbd623b417fa1244056af9b64d1494010d0f583078c9b3afd32f6db14806f26a6c4faec8 SHA512 b2674e7a04676cf8f40a1d9144bebacdaf30e222f3fada1f4ff77d5a457d80078832bc94c52aa0432b2aceb7168092e8d8e1dc8a438f153de8b402ed25e21f6e
 MISC metadata.xml 408 BLAKE2B 061c3b13a1528247c36a3c97dda9b4eb044a06abb953180723a83b7c069e6b40decac9e12605a17d9a6ed4d896ada27acbf8d2c42044872e64efa4cb895b609d SHA512 cb3df73a8466c79899cc1a8c2ed2431a84300fe09dd2a930c958c9d1fd68004191f2384722fe8a96ccca305be50143170b2722c672ec807971c9265064ca0d35
diff --git a/app-crypt/johntheripper/johntheripper-1.8.0.ebuild b/app-crypt/johntheripper/johntheripper-1.8.0.ebuild
index 6e2c26e4a594..065ead99d83c 100644
--- a/app-crypt/johntheripper/johntheripper-1.8.0.ebuild
+++ b/app-crypt/johntheripper/johntheripper-1.8.0.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://www.openwall.com/john/j/${MY_P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="~alpha amd64 arm hppa ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
 CPU_FLAGS="cpu_flags_x86_mmx cpu_flags_x86_sse2 cpu_flags_x86_avx cpu_flags_x86_xop"
 IUSE="custom-cflags openmp ${CPU_FLAGS}"
 
diff --git a/app-crypt/libb2/Manifest b/app-crypt/libb2/Manifest
index 78a53060f921..dbea0ca66812 100644
--- a/app-crypt/libb2/Manifest
+++ b/app-crypt/libb2/Manifest
@@ -1,4 +1,4 @@
 DIST libb2-0.98.1.tar.gz 280826 BLAKE2B aa8c3dee3032f457410479be12d00c79a6ca6a7c0376a5c70265d30ff25b50663171f7096141834d4faa4dd5027f38b23b774e59be63475a3ecba855337fb1aa SHA512 a666fdbd1efa9cfff3028e953c62f21ba092c6733ccd12d4d04f1f836fc9747fc90053bc9166510d251d332b91e133853d2cc9b61c279517bd65b05e8483250b
-EBUILD libb2-0.98.1-r1.ebuild 1744 BLAKE2B b2256260ca7312c87184a92e9b495fb7a7f4fed6353756f3c995c108f71b1abcb9dc304174760a8b624a743c3c39d9e4b275dc50c1daf3bfddfd18d100b0f2cc SHA512 73a90667e0786c443cccc566d43964ad78bfd10cd019f8d3544d2a3842721a58c225d509fedde0b34888da7031e04aabaac5f6311fe3f67ffa6034db646c4f01
+EBUILD libb2-0.98.1-r1.ebuild 1745 BLAKE2B fa1c845f66d5da854e35c06b31d779371522d694f8c572b8cdfae676e280291ef7176b9d385c7b93abae9789d04dc87ba83ecb6cbcfd37cba4ad7b9f4dd821b0 SHA512 1984a848544ab9a4793f72335230cc6b5ce5c3b0b3f1bcf38b8b3ac733757413b4b6dc193ed50d594bd48c5b0d17e01d01be6acb17e3009f9ff34e1f4dabd7f9
 EBUILD libb2-0.98.1-r2.ebuild 1809 BLAKE2B 2d5c467c920014e91a4204466ff77bbbec319396442557821c9b4ba2ee004bf112b4a05ab775260c8dacdf5c8b7eb8588f77d99d40cd25f0eab4d316c4e2a03d SHA512 e7969e74044073ab89ba2cfa39b9a8dd9b4d8f824400d092688c96d2eca7a9c9da9c934b57628ea6a9e502d9d5bcc2e5fb6be0511f92c277624e44b62222e20b
 MISC metadata.xml 688 BLAKE2B dafb52bda4cb5c27bbbb4cba85c178ce11e9511f0dedfed4ff3afe40789a28e4a8c9c275a1be7e86568419c29011c1a4ae5c67f7b778ece3c750d8a919d5d930 SHA512 a98e96312724a3af5d104e4adbb9f60cac16124c9beac2622045985c1b0c2276ff1d56561d59cfb5a24b57d29577312c7e73bdfe73bbe735c1c320b699065b11
diff --git a/app-crypt/libb2/libb2-0.98.1-r1.ebuild b/app-crypt/libb2/libb2-0.98.1-r1.ebuild
index 0cd884df7321..a2cb33d64b4e 100644
--- a/app-crypt/libb2/libb2-0.98.1-r1.ebuild
+++ b/app-crypt/libb2/libb2-0.98.1-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/BLAKE2/libb2/archive/${GITHASH}.tar.gz -> ${P}.tar.g
 
 LICENSE="CC0-1.0"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh 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 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="static-libs native-cflags openmp"
 
 DEPEND="
diff --git a/app-crypt/libscrypt/Manifest b/app-crypt/libscrypt/Manifest
index bd389711669b..00b61c468e36 100644
--- a/app-crypt/libscrypt/Manifest
+++ b/app-crypt/libscrypt/Manifest
@@ -1,4 +1,4 @@
 AUX libscrypt-1.21-build.patch 2460 BLAKE2B 139168dc59ea0001b5106a62731379c8a54e713d0bb5a30ab736eab36b2e8918d2ce47c8b3dc264b50172868c9c5108d0cd093c68e4fe4d3668301d84b15269c SHA512 74891b020e6115aa938368f43d727b3653160406f887f9958e66c688eb1191f7ba2ce6d753541af9369cf7724ecffff9b6633bef26062ebc0f74a092ed8cdd0d
 DIST libscrypt-1.21.tar.gz 19425 BLAKE2B 4f9f21c6ba36bad005d95203d1d2c206f50200973233670c4819fe2cc32de6941cc100360ba1683453fc7abcb0e0e024e32417beec06d5b43cbda56bfa89be5a SHA512 0f894bc2f47016cdd043ea692a4e4b08891b1a961443265230d5ccb76820d40e50b0d4d63588c44c985cd24e214f07b126d30989d3ce4cd79366f3b8f16c4d34
-EBUILD libscrypt-1.21.ebuild 716 BLAKE2B baf93494616119166deea11a244f313f51af3e120dfc816cb9d0fa60894135b2fa1358be7e67de6b937a6082bbb47a0b468609a35a97c05bdd3c2fd7076aec26 SHA512 cc09950aee74c7114bd2db5142c4a34e321247cad9af5e84cb750850ecc402b5b7f79fc7f3d61a6a09e004528a5f7b4ac5d597ad80d8b175be4b04f029f693a3
+EBUILD libscrypt-1.21.ebuild 712 BLAKE2B fba4c8b0c2cd35200287dc2fc10f92e0a1b9e9843dca8784a7d5c17429389d650321aa537b4dd331674a73b7a0ebf17158d5abfbdbca6bab0652ab1bff670f14 SHA512 1d57b76f432e1460f3259be098a1eece5d758d856423b94eed30efd9a8632124079de29948e11225f0ec8262c4f7958488a740f626aac2aab9a3c6f658f6998d
 MISC metadata.xml 345 BLAKE2B affc5819c29d3b72ccc6a15e4d0b01bbff5bd3fdbe617c1b90dbd3af812127731d9981bab6a5ddd4a66cb1dcbb6bfa91b692cae1e5daf8247b84f25aa9bc01c1 SHA512 d123a54ae5536171b145454494d00e340797239bc5614a36451b9b975ad7bb2f38c5330069e78dd99f1d23cdb6f252736885af78d8cef63eb57dc93d68033383
diff --git a/app-crypt/libscrypt/libscrypt-1.21.ebuild b/app-crypt/libscrypt/libscrypt-1.21.ebuild
index e4ac4392954b..efe99521fd08 100644
--- a/app-crypt/libscrypt/libscrypt-1.21.ebuild
+++ b/app-crypt/libscrypt/libscrypt-1.21.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/technion/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="amd64 arm ~arm64 ~mips ppc ppc64 sparc x86"
+KEYWORDS="amd64 arm arm64 ~mips ppc ppc64 sparc x86"
 IUSE=""
 
 DEPEND=""
diff --git a/app-crypt/libsecret/Manifest b/app-crypt/libsecret/Manifest
index 696b1fc89066..25b3c3ddbaa0 100644
--- a/app-crypt/libsecret/Manifest
+++ b/app-crypt/libsecret/Manifest
@@ -1,3 +1,3 @@
 DIST libsecret-0.18.8.tar.xz 509432 BLAKE2B 3e3995d2c44367e31f3914087494764acfe82fb597b524c4982b4fca4e16612509c675f545191ee3cdae59698614395bef54ad82ae88a7e4e19898ba0be7828f SHA512 9e2ec8d458af6ed078bf3c6d956599f73f2cc7720332c424e9aede1f77f3d969c5122cf7b70899bc07ad96a3a628bf79bc5fffa88274d1ef2bcaaca6719f90d4
-EBUILD libsecret-0.18.8.ebuild 2650 BLAKE2B 71568f8a006c2873a216c77b40ad86c8b0e9d07f049c3f40dab7cf46942e831bc039df990f828f540e535c1bf6e4024ec9f8c457b12dfef5987f3f41693d2933 SHA512 73abf7371bbadb14230fe95837ad6eb8affe573688cad0c78205a576df7d129ddba0c93c44c5e98b7ad6fa52a4717947ae8300798fa359cb4190cba54a2ef733
+EBUILD libsecret-0.18.8.ebuild 2651 BLAKE2B e28b34e4743a2c3b68b9695f8a17814d3a6149a95c8364437116650272ade483a1073d302bac7347dde454e1bc226bdcf8289701c42ad676513561498a546933 SHA512 fd8ad7f71b74002fd7ebf48fe90468f1d3a72778ddb06ed4113655ed7947c3754e14f9d70582156c92a3123ecd57678ac58b4ab21554eb6fbad8b042782a8f51
 MISC metadata.xml 253 BLAKE2B a1efbd3751efaa83ee173f557ec1c8a4497a90b60896cf5a7a07da40b4f94a7a299ca0385477e82b2f5e5dbdf9afa482ccbe21f35ef44214e9c451d764b65529 SHA512 8d59f413993268ca783f7407b676900bb2d964754bf705d4175e2bafbe058a52af74f3928e4bd84d292518f8cf13fab7051486ab7cdc61d02fae6e0188d44442
diff --git a/app-crypt/libsecret/libsecret-0.18.8.ebuild b/app-crypt/libsecret/libsecret-0.18.8.ebuild
index 26067ee2d002..ec6a29a201e1 100644
--- a/app-crypt/libsecret/libsecret-0.18.8.ebuild
+++ b/app-crypt/libsecret/libsecret-0.18.8.ebuild
@@ -19,7 +19,7 @@ RESTRICT="!test? ( test )"
 REQUIRED_USE="test? ( introspection )
 	vala? ( introspection )"
 
-KEYWORDS="alpha amd64 arm arm64 ia64 ~mips ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ia64 ~mips ppc ppc64 sparc x86"
 
 RDEPEND="
 	>=dev-libs/glib-2.44:2[${MULTILIB_USEDEP}]
diff --git a/app-crypt/mcrypt/Manifest b/app-crypt/mcrypt/Manifest
index 551415ff61f3..eb54cf60b324 100644
--- a/app-crypt/mcrypt/Manifest
+++ b/app-crypt/mcrypt/Manifest
@@ -6,4 +6,4 @@ AUX mcrypt-2.6.8-sprintf.patch 3617 BLAKE2B 9dc7fd48a12fbd34624ce4e02dd3e729444a
 AUX mcrypt-2.6.8-stdlib.h.patch 262 BLAKE2B 30735481ecc743554dc5a1fdf6d91d259ee2670ee39d939b90970aaaa0548c5edbe88fd5820f1cce4f7d4442d293258c5528f8c01d485a14fdda4cf060b27019 SHA512 6f20fe8982cca9fb448ace79c8b8b04260dc63f6a372da4cbf8a7a5d7458f32527e0f31d32387c9f326906fe6fe98013dc49a388b1c987ccca096c9796b409fd
 DIST mcrypt-2.6.8.tar.gz 471915 BLAKE2B 63bb51d2e0fac138ad1cadd6c0842b5c13e604a0a6dd134b85c1e4f4a3af2758955c09a032641f34861a52dee5b0ce138b22e849a26a6e3c27bc0838999718fc SHA512 eae5f831e950df69eb93efc8314100b4b5dc8a535b1d00f500e6b25382efcec321346776a92dadf101b878ef46a47de2e9e81f5ddf5c73563ece4741f169c8d1
 EBUILD mcrypt-2.6.8-r3.ebuild 706 BLAKE2B 1e2c4a33de9a9aafcbfdd5202c7e68eb5d812bb7733460d280f5980987fc8b68918e52f1695f82e8cd172e32454c49799f5be135631c9d9249f85b136effddad SHA512 9e35447105cfb0293415891a738b843ec93c29c39047c3c745db1d9f6d44665c1e4200f3c0685ca8cf7e5e6c15201ee8d0bc94e7614f4c37e64b661d434bcbd5
-MISC metadata.xml 247 BLAKE2B a5340d0ae31867f0b98c1d238b57479e18ae57c0fa9015ee0a08a89b118e5637a4464fce09d5ece6ff3762cd0296cc5b4c75c8d22c69fccf0677b1eb19bf51c4 SHA512 ededbe4f421761e06a1e8cd4cc0ff2f42fa24b16ae55c2feb89ad444c248d53246406dac4171ea8d7efb42509f8c382258fea7209de1684de65a7a357bc66b20
+MISC metadata.xml 243 BLAKE2B 7891de6465eeb439f99ecbac5b66fb85e295e8d0e3eb7898d7d1123bc7fd48226ae2fdfef3b0d5444d6775fa6bf7c95f8a7ffb7f32241bdc5117dbfdc39d5799 SHA512 386e677afb96c239287efdaddd9f759ff89b837c45fe43c656435f9f8d29820528a07406ae494f3261d6a194e9906b79322b83fdf5ebeafaba65421488ffd7b7
diff --git a/app-crypt/mcrypt/metadata.xml b/app-crypt/mcrypt/metadata.xml
index 8218d5403d95..69ebb1dfed9f 100644
--- a/app-crypt/mcrypt/metadata.xml
+++ b/app-crypt/mcrypt/metadata.xml
@@ -2,7 +2,7 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<!-- maintainer-needed -->
-  <upstream>
-    <remote-id type="sourceforge">mcrypt</remote-id>
-  </upstream>
+	<upstream>
+		<remote-id type="sourceforge">mcrypt</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/app-crypt/mhash/Manifest b/app-crypt/mhash/Manifest
index 7caa8a5578fd..ae1ea39a0654 100644
--- a/app-crypt/mhash/Manifest
+++ b/app-crypt/mhash/Manifest
@@ -7,5 +7,5 @@ AUX mhash-0.9.9.9-alignment.patch 579 BLAKE2B 2865e4d035a145f84de68730fb86929e33
 AUX mhash-0.9.9.9-force64bit-tiger.patch 537 BLAKE2B b37015b12eb213cd91207163b6eb922e3c9956081505066a01ac64a3cceb8d5eaf802a125168f2f6c5d7c3d2a0e18cb6913a33a66d66edfe1e1336edf3bca173 SHA512 7ca2118569ad28107672f081fa4d06758bc78da48612ba31d6655e91ebf4928055b1643a012d60538b915b05d906adf23a8aeb3d7b9f5d8c12eaf1058b9f5454
 AUX mhash-0.9.9.9-remove_premature_free.patch 464 BLAKE2B 89569b1addc287dc6ccce15142ca2d7f228b78ff0fa3412482dbe1aa98e3dd20c1e6e360934018cdf605330b9c0480989bf898ff110d9a9236fbe3ae63e4e226 SHA512 f8f9814c39890f14e760c6600998b628db27ca52efd864be123b646425be1edd106179840d8720c36948cfe509d2b320fd98c2aee0b3fcc7ae1fac8ccdba792e
 DIST mhash-0.9.9.9.tar.gz 931437 BLAKE2B 2daed92b731148c388d4340e67d99959f71783e68617614c9be797dae655ba1aeb087d4f604015edb752dedc2d69add305510996a06633ef26fd997ab7601bed SHA512 82ad8b8e9b0463c5a14f5c0e572badc42c4697bac5505443b144287b3f8510b1410721b4277f092a0d6045c4342e997831011cdfcbfa8f1dae6edd5d9e3cefee
-EBUILD mhash-0.9.9.9-r2.ebuild 1421 BLAKE2B 05f05e36dca4c2691c8d8da27913ef4cdd67d354ad4276035fa426df6842ea8dbfa415bdfb7881679655f066194a30e53e85ed2664e98425b19c760e82d15312 SHA512 b3057bde9f80e0eead4e705b0d681d1382433b02e4a6c4679cbbffca3635905b0f670efb94345cc9a9079c489d428283ed88dc0a1f8e77fd0f675ca9278244ae
+EBUILD mhash-0.9.9.9-r2.ebuild 1422 BLAKE2B 1d715cb421a4694e3cf9cc6649da78ea19330f8b22a92cd202b85650cc5b5b02e957da30ca0bc0f5eaec1785e19238c0bdf1289c954e8f0dd6d581d577a47e44 SHA512 29288a21b9ed382e56d8cc7a22063e642c5a2102685faa98e61603e5ebe569e70b17ed4fa32cd3beafc7f34125d9e2554b01ac5cbc678e64d5d34afc6f5a31d5
 MISC metadata.xml 240 BLAKE2B 930f7f4d63cd589f337e5fb82f0fd568e7b12917c1fbb663af43acb523311b683b7bd3e144af0673749143a5d7fa86f57e8bed96f87c32e054c28ae6bf8d768f SHA512 46b4040c549d189f732ec0752339b86521d8351f8d5529f272050722cb466e161772e5fd05db097e29a528786150aea5d78d80232d84cbf99521f4ff697d7a4a
diff --git a/app-crypt/mhash/mhash-0.9.9.9-r2.ebuild b/app-crypt/mhash/mhash-0.9.9.9-r2.ebuild
index 39732f87d787..173a90f1fdb8 100644
--- a/app-crypt/mhash/mhash-0.9.9.9-r2.ebuild
+++ b/app-crypt/mhash/mhash-0.9.9.9-r2.ebuild
@@ -9,7 +9,7 @@ SRC_URI="mirror://sourceforge/mhash/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86 ~ppc-aix ~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 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="static-libs"
 
 BDEPEND="dev-lang/perl" # pod2html
diff --git a/app-crypt/mit-krb5-appl/Manifest b/app-crypt/mit-krb5-appl/Manifest
index 415822a3df37..d3ec04e1117f 100644
--- a/app-crypt/mit-krb5-appl/Manifest
+++ b/app-crypt/mit-krb5-appl/Manifest
@@ -1,5 +1,5 @@
 AUX mit-krb5-appl-sig_t.patch 1411 BLAKE2B c2a34ada3f811459d006c1be6e79cb0811b0ab6ef7a1eb2fa6372db5b52b7db06e1cb94d7cbcd9b883fa14d9e0cf704ebfde7a441e7348728be9511ff2b6dae5 SHA512 a25ca113d8cae969ef370aa28b274dc4573964eb78e340a86ff4e3b130c6f7a73c97a41e657a5fabb634604a3bfb8f5a04c8925a248a8f9e45a22979fd8395f3
 AUX mit-krb5-appl-tinfo.patch 575 BLAKE2B e79cbae98ea7848bbe11f0aeda1f192d51bb1b9440952d0b8606d91b0fb8dd6d1057c4eece722112a3a3bcd26596868cf534d49f4bf5dbfeee227b16f8adde19 SHA512 076f34d70f43ae34fa6bc5e23171b2b31f579812527b7f78ba40ac3fca0cd92000b8caa40b8773bd2f9cc3ce0f6bcc6815f83422d5f8d320d34c4feb580231ab
 DIST krb5-appl-1.0.3-signed.tar 634880 BLAKE2B 0341ce0f3845bbf49ac2c43dea95d1bf196a9e6fb07a1bb4e8d1eac9ef74765f4b02b7f6e2794cf55ce6c7a7e2623bd325457dcb60f94b7e30bdc65a370751ad SHA512 1d85be6eb39a01c21308f6b159a375ae4ee331de8052c3990c9252f708d717b8b518f92c424bd6beebe344d940b4813e6ea11dd18df5d7caa4b5effc2513dd23
-EBUILD mit-krb5-appl-1.0.3.ebuild 1642 BLAKE2B 5636ff5fadd84d073ddb93e0e43461f864eed505ba49fa8d59a229aa97038e57d9d77888dde1390f69d9f826afc1307cbd8bce9f0a4d3787fc0522fafde92d3e SHA512 c246be6deaf8fe6651ab8b6c61cdc47f5e1afb73c7913beef5b66d571622e318751fc5e7514ef662c2ea0c4196a4dcdf64b4f685e2cef6435bc2cb6796f80bc9
+EBUILD mit-krb5-appl-1.0.3.ebuild 1643 BLAKE2B b379fecaf2c01b1a358cf315c557aa6454be87d3a424948e23024c23fe99a51bc27235e608eb5cda81f67038f40c3ca0ebc043b50408e710d114624df8107d98 SHA512 8cd50da2790e8c175adbe220b72e32be6cb638007cacd7cf36564471adf36d0764214e0085e488a3010406441b2a07a3f78dba407b1ba78a5f9e01e19ebf60b7
 MISC metadata.xml 240 BLAKE2B 3a20174df7c37c40098c716b97f64079f86d511e3740e43865ba8e1b1fe52de971091ee51a510543cb2a49373cff87e790f71fe397975f61eee2b308b0729e66 SHA512 57354970f719cd4e3a27f6024addadbb81919a5eaaefef094d3d2b362c44b5ab5cec740090ffce89730cc52f469bc93957c129865a71a4583e0309a93e6f970d
diff --git a/app-crypt/mit-krb5-appl/mit-krb5-appl-1.0.3.ebuild b/app-crypt/mit-krb5-appl/mit-krb5-appl-1.0.3.ebuild
index 5edde7606927..622e0b15f0a7 100644
--- a/app-crypt/mit-krb5-appl/mit-krb5-appl-1.0.3.ebuild
+++ b/app-crypt/mit-krb5-appl/mit-krb5-appl-1.0.3.ebuild
@@ -13,7 +13,7 @@ SRC_URI="http://web.mit.edu/kerberos/dist/krb5-appl/${MAJOR_MINOR}/${MY_P}-signe
 
 LICENSE="openafs-krb5-a BSD"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86"
+KEYWORDS="~alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86"
 IUSE=""
 
 RDEPEND=">=app-crypt/mit-krb5-1.8.0
diff --git a/app-crypt/mit-krb5/Manifest b/app-crypt/mit-krb5/Manifest
index f019dec10d23..3f4835a44c57 100644
--- a/app-crypt/mit-krb5/Manifest
+++ b/app-crypt/mit-krb5/Manifest
@@ -16,6 +16,6 @@ AUX mit-krb5kpropd.socket 122 BLAKE2B 2ce51e67b909c6955d9796f80f7985c9209af398ad
 AUX mit-krb5kpropd_at.service 162 BLAKE2B ccd1dea2419656a95ea1e5068457ea45a765a831f36e7abe3e27cdd9b42f2b703cd6ddad1ac60d75feff4d74bf31dbf146ee2cbfdd34ac38c11908d44162e77a SHA512 4b7121da07b11fa65db4edc185c57197ebb25ed5c49797e36bc31b8b7bbb22a6f512f4a986c8430dfc31b1b8fcfba66dcfe154cd6eeb8b4bb445d5006fff3802
 DIST krb5-1.17.1.tar.gz 8765399 BLAKE2B 46be864e2db9c70d164532d82776195bf57342ce4f1fd7dfcf3cf6bd72a3639a69954f742607a2b8950b4dea8acfac5d633aa379d669de20bafe54b407bab94b SHA512 e0c3dc0a6554ab3105ac32f3f01519f56064500213aa743816235d83250abc1db9a9ca38a2ba93a938d562b4af135a013017ce96346d6742bca0c812b842ceef
 DIST krb5-1.17.tar.gz 8761763 BLAKE2B 76f636836c67e9eefca91c9417118efdcf4437c1220691f43f3d246daf3eabd53b40a30956f0e57703c3fde5d7193b1d86b68becf3ae1c0c803d2462e79d3014 SHA512 7462a578b936bd17f155a362dbb5d388e157a80a096549028be6c55400b11361c7f8a28e424fd5674801873651df4e694d536cae66728b7ae5e840e532358c52
-EBUILD mit-krb5-1.17-r1.ebuild 4314 BLAKE2B af2f612070a0f35fe9f521df6726216e6728bea42d5de1e8d312632565201a4878c13faf20f0617c8a03a02cf55ac58b57d9c2fb7286af2a947fa9d88cb834e8 SHA512 7f7a8cc3558241faaff863c2a9fb9f398667f1997c579792f4d8550880b04f2ef9ed89d71ed56d344cd0722baecf2292473d842fee7da90d95831da0b9efd228
+EBUILD mit-krb5-1.17-r1.ebuild 4315 BLAKE2B fa6f1affce66e5927d3a6307397d18c9d8e3cc79763715949ad4038de3c1dc1e264fae078defe3cce640b77ba00c4c02a69b810c2cd2d16880c79ffa38eeab09 SHA512 dd48612e5fbf22338260aa87e822107e91475cfa51cdc2727cf27becac7becc8ee1c3ae533294294c416f1a01d3029e1891500ba11b6a698e723bdfe5a80400c
 EBUILD mit-krb5-1.17.1.ebuild 4352 BLAKE2B 65e6ddbc25974f57f3784d8df09aa98e2de165451517eb1ebe93fdd2ef745fbef909f846af8fc32eeaaad3c3917b07b635f366f5882ffc38dcad9273d5daf6e6 SHA512 e7c330e5d490a59d7ba933cc8cbd030b41bc1e47f19f65d686b3ddac919ac1d180986030ee61c9da6ca13b190c32b4d97532a2715a085d116cf15d2c32c03345
 MISC metadata.xml 903 BLAKE2B 57a48ed1fb3f046b8a4a6a80ae6223bc923f30ddf350b8ee0f5769c78b28c0bd14c35539d9552bfca02901e054332a4dc22f88c48d4eb4db4d143a7f0b938d74 SHA512 44909c99698b78ad01f72cd1d74ad6807f12154c8675b7fe31f4bd95744d8e7dca53446875c57408a294e5f87fc5aa038e6f869d3ff957cab870cd75f8e45464
diff --git a/app-crypt/mit-krb5/mit-krb5-1.17-r1.ebuild b/app-crypt/mit-krb5/mit-krb5-1.17-r1.ebuild
index a7d0539680a6..4a24d39e1ed4 100644
--- a/app-crypt/mit-krb5/mit-krb5-1.17-r1.ebuild
+++ b/app-crypt/mit-krb5/mit-krb5-1.17-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://web.mit.edu/kerberos/dist/krb5/${P_DIR}/${MY_P}.tar.gz"
 
 LICENSE="openafs-krb5-a BSD MIT OPENLDAP BSD-2 HPND BSD-4 ISC RSA CC-BY-SA-3.0 || ( BSD-2 GPL-2+ )"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86"
 IUSE="cpu_flags_x86_aes doc +keyutils libressl lmdb nls openldap +pkinit selinux +threads test xinetd"
 
 # Test suite requires network access
diff --git a/app-crypt/openpgp-keys-gentoo-release/Manifest b/app-crypt/openpgp-keys-gentoo-release/Manifest
index 2d44cf39eade..c51d6b608f19 100644
--- a/app-crypt/openpgp-keys-gentoo-release/Manifest
+++ b/app-crypt/openpgp-keys-gentoo-release/Manifest
@@ -1,4 +1,4 @@
 DIST gentoo-release-test-sigs-20190224.tar.gz 3235 BLAKE2B 924c69a62d5321716f536144f0607bd3ec4a65d76be492adc729864fd9bef82df0086541ae13034a83152ea0c8dc3cbd168be6cff111a3484128a22cbc8ef1d4 SHA512 f8cc2e84bedbdf14ace6abe4aacf8f0c9810c77ff6ae0fac301829d9d4d5cf0c128a76516c773ac993879215bcdb0aab097e1e7e747d8e1a7c4cfc815bd4d3e6
 DIST gentoo-release.asc.20191030.gz 23981 BLAKE2B 307ceab69e309a53c2db191cf9d7a484318e852af648d93d9ad4bb2422737ab8de9257b457e5f201d86d226b348447acfbe57d259ce436150f75ccfb9f6ed60e SHA512 f3fbe0198f80f37784613c2a390c29f55e5b6291c44ee64d676806a26745017f8a9168573e13f6fc2fe93910927846c584b9f5cd017c4eac1cc875d7ed30cb8c
-EBUILD openpgp-keys-gentoo-release-20191030.ebuild 1157 BLAKE2B f2d31c39be50ac26d3cd7144d5d1b558e3fbeb0f2cea13d8130da3e125ae2e480cf7ba85b88a1a706a50d8f612e83838b403bbe7c3fccf427f1930e2911b59ad SHA512 5014fb5bc50c2e5d151545490aeebeccf4e860f40971fc5c54e220326bf4dd341f4f660284f2904e6c415b5af9256e68c60469d71769cd735ff7446d40cc4096
+EBUILD openpgp-keys-gentoo-release-20191030.ebuild 1158 BLAKE2B 686c914e8c52f68d42f8043dec06a07eb51dc9ad83ab03403076851a89c859b4c6f51be1ead307b3641696966dd5ba6006d9a735741da3f30f2ed7da680381bf SHA512 c39f14ee54a230c27410755ce56ad280dfed24ba473f11b272482f679f4fa409197e14f5aa2e01028439333d305150f61857aba5c136e66718856ebe0e516511
 MISC metadata.xml 247 BLAKE2B 1750cec57189e711ca5eba89a78e1d317f0839fa53564fbd39b4e955c28d98f4ae04caf9069afc20a18536cdc92b30fe7b15eb086767c742bad07d9980cfd24b SHA512 d6e2ea8a9d74791bcbf3d6311a66bafc20b8f4db3a576d9a8d54b86d7afb231122b8d87f71f3f46360980adf8d815c633b6d5041f9a30fc8656e8fb66057a282
diff --git a/app-crypt/openpgp-keys-gentoo-release/openpgp-keys-gentoo-release-20191030.ebuild b/app-crypt/openpgp-keys-gentoo-release/openpgp-keys-gentoo-release-20191030.ebuild
index ccfb39bbd1f4..a1a2967262eb 100644
--- a/app-crypt/openpgp-keys-gentoo-release/openpgp-keys-gentoo-release-20191030.ebuild
+++ b/app-crypt/openpgp-keys-gentoo-release/openpgp-keys-gentoo-release-20191030.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://dev.gentoo.org/~mgorny/dist/openpgp-keys/gentoo-release.asc.${P
 
 LICENSE="public-domain"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/app-crypt/p11-kit/Manifest b/app-crypt/p11-kit/Manifest
index ebe8d474370f..e5643f002d61 100644
--- a/app-crypt/p11-kit/Manifest
+++ b/app-crypt/p11-kit/Manifest
@@ -1,8 +1,10 @@
 AUX p11-kit-0.23.12-mktime.patch 683 BLAKE2B 16d25f2634dea248659ee9790555afaf0e3af14a05d7f186a23f321044f319f9302ef893d5f196855de7e4c04283bceb482c6e4986bd8ac10c0ec43c56bdf748 SHA512 d4f381e27271583a8a4fbf44e4b10eb9a5a3a700e8b1c820182c87dbc5bbfe963e4bd2ff0389b58e765a8810018bae5f18dfa2ed3b967dc5275087609a95e366
-DIST p11-kit-0.23.12.tar.gz 1257028 BLAKE2B 8add003ad298b7c4548c40f863835e9aae4234a66a4b216149be7c473f2b3b7ffb633b95883d58e5b039c974dd8571e56e23f6dcc77e484672605e6178d75ad2 SHA512 ae43b1f6ba5400cf5ae7b64b8c93aa47e5c7ee927196828600fd88beb6fdf6bcb6a63bc822d356757255638f9fbf10896e0604e32a1332a9a833836fa0468726
 DIST p11-kit-0.23.16.1.tar.gz 1292783 BLAKE2B 60be56656156c86d6f0f3285bd691ed85ec1a992e8a789f0f21f9ada172a8cab0581cc42f89c3079a1bd7b3493f0d38cd952711fda50c2e80bf96e94fcd9ff87 SHA512 7d0bbd793b43dba081054b4d022a8dbd1d477a3bd6aced72a641087023cf020f1d898899a08e737880e6c810f924814c62497c5ecb19f8322cde42667426a9a7
 DIST p11-kit-0.23.18.1.tar.gz 1305755 BLAKE2B 6d453fad0f4b42e3ae583e76bd206377fd30dd32d98dda94ba3b2fe505cde4c3e05410e685ebe9e8e2f6cae7da3cbd2b78203cae64b8c000b1a2f2ec2a902c4c SHA512 941996aea75025dad5dfc6f9b4609bc92bc0888d5b2b58de0d498d6cf75d059421405d9c3bad51122108b6ad1e41e434609ead23404efe635cdb806836ccadbd
-EBUILD p11-kit-0.23.12-r1.ebuild 1990 BLAKE2B dfdc292cd95b2d304d5dca5c151ad0db84e3b619523d864017809b729da4c62055aa921dc2a33ffedf2e91dacb53ca786f2ccdeb8e29aa9feec0db8fcb9f11a6 SHA512 5bfcbbd8d47494d8e27321181604972fff4e15f0124ff71e3a747e0e32594a05fe6638d1c76a5a332115f83ca37bd7e8f32aeb0c1a1d02f8fb7fea06a0cd2b5f
-EBUILD p11-kit-0.23.16.1-r1.ebuild 2010 BLAKE2B bd2f0d0bffe1b804c4db57e20eb58ea010b03b300ec98d98a8b2a6a49e5e0cfe5b397ce7dc5a14a47176a07384b7562ba603bad532c9db414531e6baef1fd992 SHA512 35607daf3a38f4432df4792e24b6b26fa54977ff00962c6367821ddcb75f1f4527930395fe92b1658ad39d948fb2530fd009b8fcc1cb343e198e43d902b8a5fe
+DIST p11-kit-0.23.19.tar.xz 822652 BLAKE2B c1750e2d0b8ebdfcf70695259401a029b2d5739d8222c37f128f94f8a4313321956e120dcba5c7cb882d16e1a6b12398f9dfa88ef601e826f0dfec5acbf438c8 SHA512 1a7feb2c14381f2ca87386b6a81f46cfb27ccce70ad87a2fc86726e2827b49971958e40c4fc54df01df7570d82058afe82d21c5b3c59fb8310aa641d3b370da2
+DIST p11-kit-0.23.20.tar.xz 822588 BLAKE2B adda58acc121d38d3520d20daf8f59c3c46f81afe807d9277fae70e836d194d08cfea0405d2186d548ea91be56eee63d576a318c330fa844a0cf1889960db384 SHA512 1eb88773fdd49dd48c7e089744e9dbbf6c1033a4863f3bfe75a68d842804baa3c373cb1b28ee625dd69a6e16c89df4ac755e0928495dccf38c007c530f6cfa57
+EBUILD p11-kit-0.23.16.1-r1.ebuild 2000 BLAKE2B 941d96d1ef86dbaf54ef8a58929db1527347539e1cb30034c1cca0d91abbdbc7aecb5c541537e0e89ece154475e4e4b6e7c77cd4aa9d67970f44692a3481ee3e SHA512 33748e18cd48c50c69eb4641a6faff8d1fc535b914d1fed4105f5eaeb0bc34fa4f77e73315fcb5ba6713d9f285ad1a24507c318c717f07590d67543148d6259d
 EBUILD p11-kit-0.23.18.1.ebuild 1955 BLAKE2B d49489e85d05b6c4f4be571032a7203a7142a31a0378ab6d67c04d003dbffccb25e15fc71fbb1a71c081117d9aee9859c30d1ecf7608a4536e00ccc483c864e5 SHA512 f3b0fd9f48e8989f6ab8cdafd44790356a2793bbd562bb10f11d6961baec1f078bcee4807b679fd9a8c727b80eb9cc1b75eeb64f108c232f45baddbee6915c16
+EBUILD p11-kit-0.23.19.ebuild 1957 BLAKE2B 8a8d2dee1652a9b35e6a252cf9f6929d80168cf94581f57de67779fde70eec56e38965acb5650678ef87b1287acfa908552d74f5d5faccb6e63bfbd6477f0956 SHA512 81b6206c1d1bfdccc6cca14cb9ddf398d194d598dcf4a16659acbbf5e3dc2f92dea7bddddb7bf130a695972182452466543e09e18fb7a89a8aa8a10e1daf033d
+EBUILD p11-kit-0.23.20.ebuild 1957 BLAKE2B 8a8d2dee1652a9b35e6a252cf9f6929d80168cf94581f57de67779fde70eec56e38965acb5650678ef87b1287acfa908552d74f5d5faccb6e63bfbd6477f0956 SHA512 81b6206c1d1bfdccc6cca14cb9ddf398d194d598dcf4a16659acbbf5e3dc2f92dea7bddddb7bf130a695972182452466543e09e18fb7a89a8aa8a10e1daf033d
 MISC metadata.xml 461 BLAKE2B 4e2b3a011845a7f8c6e4afc0f176615b5badbb64f73a6f83854c4b40babc1b2cafafd0dc26ea65a16d2b96a314600218271e63aeb58f5fb1a3dec3fbffd4973c SHA512 947edc1be15e91e32b12b75b95ba95ea3db9528c2e6bbaf3006f9d9c842bf63256614b1da3129b5a8dd9f2c57771523a79d02febdc17ce9214cbe91276eee82a
diff --git a/app-crypt/p11-kit/p11-kit-0.23.16.1-r1.ebuild b/app-crypt/p11-kit/p11-kit-0.23.16.1-r1.ebuild
index a2e85c735e73..3b3fbdb534df 100644
--- a/app-crypt/p11-kit/p11-kit-0.23.16.1-r1.ebuild
+++ b/app-crypt/p11-kit/p11-kit-0.23.16.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/p11-glue/${PN}/releases/download/${PV}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~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 ~m68k ~mips ppc ppc64 ~riscv s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="+asn1 debug +libffi +trust"
 REQUIRED_USE="trust? ( asn1 )"
 
diff --git a/app-crypt/p11-kit/p11-kit-0.23.12-r1.ebuild b/app-crypt/p11-kit/p11-kit-0.23.19.ebuild
index 2e92e56dfa8d..4a9b986476e8 100644
--- a/app-crypt/p11-kit/p11-kit-0.23.12-r1.ebuild
+++ b/app-crypt/p11-kit/p11-kit-0.23.19.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -7,11 +7,11 @@ inherit multilib-minimal
 
 DESCRIPTION="Provides a standard configuration setup for installing PKCS#11"
 HOMEPAGE="https://p11-glue.github.io/p11-glue/p11-kit.html"
-SRC_URI="https://github.com/p11-glue/${PN}/releases/download/${PV}/${P}.tar.gz"
+SRC_URI="https://github.com/p11-glue/p11-kit/releases/download/${PV}/${P}.tar.xz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~riscv s390 ~sh sparc x86 ~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 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="+asn1 debug +libffi +trust"
 REQUIRED_USE="trust? ( asn1 )"
 
@@ -21,10 +21,6 @@ RDEPEND="asn1? ( >=dev-libs/libtasn1-3.4:=[${MULTILIB_USEDEP}] )
 DEPEND="${RDEPEND}"
 BDEPEND="virtual/pkgconfig"
 
-PATCHES=(
-	"${FILESDIR}/${P}-mktime.patch"
-)
-
 pkg_setup() {
 	# disable unsafe tests, bug#502088
 	export FAKED_MODE=1
diff --git a/app-crypt/p11-kit/p11-kit-0.23.20.ebuild b/app-crypt/p11-kit/p11-kit-0.23.20.ebuild
new file mode 100644
index 000000000000..4a9b986476e8
--- /dev/null
+++ b/app-crypt/p11-kit/p11-kit-0.23.20.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit multilib-minimal
+
+DESCRIPTION="Provides a standard configuration setup for installing PKCS#11"
+HOMEPAGE="https://p11-glue.github.io/p11-glue/p11-kit.html"
+SRC_URI="https://github.com/p11-glue/p11-kit/releases/download/${PV}/${P}.tar.xz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="+asn1 debug +libffi +trust"
+REQUIRED_USE="trust? ( asn1 )"
+
+RDEPEND="asn1? ( >=dev-libs/libtasn1-3.4:=[${MULTILIB_USEDEP}] )
+	libffi? ( >=virtual/libffi-3.0.0:=[${MULTILIB_USEDEP}] )
+	trust? ( app-misc/ca-certificates )"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+pkg_setup() {
+	# disable unsafe tests, bug#502088
+	export FAKED_MODE=1
+}
+
+src_prepare() {
+	if [[ ${CHOST} == *-solaris2.* && ${CHOST##*-solaris2.} -lt 11 ]] ; then
+		# Solaris 10 and before doesn't know about XPG7 (XOPEN_SOURCE=700)
+		# drop to XPG6 to make feature_tests.h happy
+		sed -i -e '/define _XOPEN_SOURCE/s/700/600/' common/compat.c || die
+		# paths.h isn't available, oddly enough also not used albeit included
+		sed -i -e '/#include <paths.h>/d' trust/test-trust.c || die
+		# we don't have SUN_LEN here
+		sed -i -e 's/SUN_LEN \(([^)]\+)\)/strlen (\1->sun_path)/' \
+			p11-kit/server.c || die
+	fi
+	default
+}
+
+multilib_src_configure() {
+	ECONF_SOURCE="${S}" econf \
+		$(use_enable trust trust-module) \
+		$(use_with trust trust-paths ${EPREFIX}/etc/ssl/certs/ca-certificates.crt) \
+		$(use_enable debug) \
+		$(use_with libffi) \
+		$(use_with asn1 libtasn1)
+
+	if multilib_is_native_abi; then
+		# re-use provided documentation
+		ln -s "${S}"/doc/manual/html doc/manual/html || die
+	fi
+}
+
+multilib_src_install_all() {
+	einstalldocs
+	find "${D}" -name '*.la' -delete || die
+}
diff --git a/app-crypt/pinentry/Manifest b/app-crypt/pinentry/Manifest
index 49a556cdeaad..cb5a781baa3e 100644
--- a/app-crypt/pinentry/Manifest
+++ b/app-crypt/pinentry/Manifest
@@ -5,9 +5,9 @@ AUX pinentry-1.0.0-gtk2-Fix-a-problem-with-fvwm.patch 1900 BLAKE2B b9e7aa8f87615
 AUX pinentry-1.0.0-make-icon-work-under-Plasma-Wayland.patch 1606 BLAKE2B bebea23f44a0512dad873f693a8343a47684c983ca37faba908bee62a7f87d1eaf2a097672df45fcfabb28911b55bc3b02177f910137f50d9c97a6939a1f7047 SHA512 15e6b86015bbf9f199bfa9e68f2a1b9f3fc14105313e1dbfb303d76b1949092ec2671b8d2a90fa8b05e0196da81e9f20875656dc11fdd96b48a14d79e4becdf7
 DIST pinentry-1.0.0.tar.bz2 436930 BLAKE2B 949be8de8504a42cd5bd6ffebe331a825db7ff3c2ccc5fc554155b7621fddf9df957aa92063eb1a06c6964826a296bf60a4cc46cf2886552e37703a62042f35a SHA512 f109236707c51871b5020ef807a551366461fafcfbe09bf8cda19d4b163a42cf622562b905ceb41429f1d648b3f3d27807538709da6a135b67f9888709eccd62
 DIST pinentry-1.1.0.tar.bz2 467702 BLAKE2B cf43555848ab0dc60756fca123aba7599ebb1bfe0458b973ed9d84479f8de9ee69ef309b518b40aa340434d64d37793cf97c94f78f99820bc5c71ecd2aac7a49 SHA512 5012672925bcb5f683358c259e55e4b87c67cf063ad52c759308933733025c33f7ce08e5b8019ffc101cbf7ef30499040ef2fd34a7611698e65e1593f80948cd
-EBUILD pinentry-1.0.0-r2.ebuild 2852 BLAKE2B 2e876149648a603da035b69c948137fe419d70d83c791209dc82b082aa061c0fdaf2495197c8a0187db151f4aab2c948c62aa5011b0de40e5028e0b4e5bd6d44 SHA512 c8a0f21147f9ffaa6c6576d90f66808ad1b850bb2bca5507e39f641f27d8e1fb184679036f5ea6cfe4cc61f7fadd8ff61a884aa7fcddeff3f96f338675b985cc
+EBUILD pinentry-1.0.0-r2.ebuild 2853 BLAKE2B acc433e7e359a3d187277800307c6b797be25fa82502918fc5d5d0b213c0c16e5e069509dcfad5f41bc564896e933e7b3b1e29507cce5e5fe15ac534a1006537 SHA512 e42f443f11cc1ba135f0a2dfef2de5b2713e2e3989ec487dec3b334a7c62f5916e125b92a18e3c57b5b61b45ec40754655559f1fb0a8316641dc754512b81bb2
 EBUILD pinentry-1.0.0-r3.ebuild 2925 BLAKE2B 6395fd2629b3756dd29cd2cb73d8465481f09cd4a46f123bc5fdd447a0d107f4a594e173ea816ae5a38d0048cbc394cf15f713ecce9932ba4627db8f2e0fd209 SHA512 dbe1b6ea9fc43c622bc821bba895b4a42c3777c351a237b4280711ccf0e7ab71e7a49c61cb6ce70f3c7ea1ffd9c2c0d6e71152c0ab2d85dec4a11f6e49c88d65
 EBUILD pinentry-1.1.0-r1.ebuild 2776 BLAKE2B 8c2a58060317dbc497e396598c9abdaba565c8b94bd35db14e85663c25db88335cdc3a31b5619673fc309ee8aa38811e79e0ebb5408a4b5eb53bc25711530874 SHA512 903a3f232db86c47cef9b3bab8efcbd9a9fa636e6f59af02c6c31ce84d263c445188d470acc47e43709e39492128a20182b496c3f863521291d887495ad26890
-EBUILD pinentry-1.1.0-r2.ebuild 2829 BLAKE2B 5dfc9d3f3d0d8aee4f5b617d2dc0fdd460efcf9a2370f39986ca58578180ac8efaa29e830c2ef68f6b9bf4d4a0591b91f562c7a872a5c542632853efd65f172b SHA512 57fd3f4568770db7bbbfbbd8fb1fa6f9ff25c5ae69516736c83611f16c1c5f04add265a6947e7df280cc4a2950e159d041eda901627c643b18fafa05293b3b1c
+EBUILD pinentry-1.1.0-r2.ebuild 2830 BLAKE2B ad1ee872216d51c40b7680d7705c4c7cb158423ac60f274892be7a30390d64afa100f749dedb1cdf62d11eafd5729e355b3feb0ec863ab1ec06c209c752e958a SHA512 bbfdd422aa8c8be5deb0a275ddd95864ba4092edf3b384c1942609d3f38924dc042e05e905604c217bf58b1a3bea5ef2363d2cc49e9038c7e981d808dedd5021
 EBUILD pinentry-1.1.0-r3.ebuild 3096 BLAKE2B afaad64b37b29a769630c65db7fe84c402cdeae104282634452426a884a8be84a64c9c3515ba4b12280edf58d6708627ff2958eaf0e4d78f75ba30f544a74caf SHA512 e2fd6f68e03f566a4ad9ef35f9893b92fb3191cb669d8175df27cab7a0d068223270907db623727dce9c4e821418dff900bbb9589e014c9bcd84f2148d201b1a
 MISC metadata.xml 251 BLAKE2B 958e5ce6ef310471d4c88ef4cfd054eb9476b56abe4e8b82b003632bae4d56a800530601a7fd4b0129fdf22fe5124e8642f60835c6792cdfe38e09afb2d701ec SHA512 10bbd614739518c3b33fc05f34caa511ad71c599e2df0cb58514f05186b9c4ef73e00e3c78018c38581376a90a7968a01c35620fca32fdc5a91a762233a8c5fd
diff --git a/app-crypt/pinentry/pinentry-1.0.0-r2.ebuild b/app-crypt/pinentry/pinentry-1.0.0-r2.ebuild
index 9301a981d1df..46333e1bdcef 100644
--- a/app-crypt/pinentry/pinentry-1.0.0-r2.ebuild
+++ b/app-crypt/pinentry/pinentry-1.0.0-r2.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 ~mips ppc ppc64 s390 ~sh sparc x86 ~ppc-aix ~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 s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="caps emacs gnome-keyring gtk ncurses qt5 static"
 
 CDEPEND="
diff --git a/app-crypt/pinentry/pinentry-1.1.0-r2.ebuild b/app-crypt/pinentry/pinentry-1.1.0-r2.ebuild
index 363006f73c91..a9d3d5c14ee0 100644
--- a/app-crypt/pinentry/pinentry-1.1.0-r2.ebuild
+++ b/app-crypt/pinentry/pinentry-1.1.0-r2.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 ~mips ppc ppc64 s390 ~sh sparc x86 ~ppc-aix ~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 s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="caps emacs gnome-keyring fltk gtk ncurses qt5 static"
 
 CDEPEND="
diff --git a/app-crypt/quickcrypt/Manifest b/app-crypt/quickcrypt/Manifest
index 8df722edee83..987391e92f55 100644
--- a/app-crypt/quickcrypt/Manifest
+++ b/app-crypt/quickcrypt/Manifest
@@ -1,3 +1,3 @@
 DIST quickcrypt_0.9.2b.tar.gz 2927 BLAKE2B ee5593ef6ee4f2b48b08713f98616220ab9170cf36ad8664fd9fadcbcdcb64ba9cc33689e9b5e79ec67493a5728de24a6cc9b86a2ff1e579b9a4c77f0ad177e7 SHA512 7b0efbe5aaf9f878233885470ed053124dd3c14fe2630902517388f3ecefda1bc89f3ec9a7edd6d7582f4108bfebf421d593f4b37ed66a7692e955c65003523e
-EBUILD quickcrypt-0.9.2b-r1.ebuild 560 BLAKE2B a887cdde4c0ea41b9c820848530d44be10d13ca31b2b3f3a590ea977717bf0b3759435a120bd80a0b78b038aab608df9e3b7aaec8ad1fd81611c0fbf3923ee26 SHA512 ed4685d84a4172e5d8803d9aa8b1e70e8aa473937c2f500fd7da884321506b3f5f5ce3d9d59a5de761238cbd8ebeb8d6a7969a6d882f42ef7364c3da0f40595a
+EBUILD quickcrypt-0.9.2b-r1.ebuild 561 BLAKE2B 860431d2e36b7e89d4450a2d9aaab17bbe1dd99d1a3ba2e5f617965de7819406c877291f126ad25a52c40a8ab354594e06924e4ba9124c09012b9e62b32cd8b2 SHA512 b7ff8e69cd08097e2c0f192c8ec5d474e4d5c940952486a8237f372aa18216a9ed7fe149c5a8a81921894ba50fdd02ef9dfc2ac35034edec2fe700a58f7ca693
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-crypt/quickcrypt/quickcrypt-0.9.2b-r1.ebuild b/app-crypt/quickcrypt/quickcrypt-0.9.2b-r1.ebuild
index 0d8edb759c19..7aff236b5655 100644
--- a/app-crypt/quickcrypt/quickcrypt-0.9.2b-r1.ebuild
+++ b/app-crypt/quickcrypt/quickcrypt-0.9.2b-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://linux.netpimpz.com/quickcrypt/download/${MY_P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 hppa ia64 ~mips ppc sparc x86"
+KEYWORDS="~alpha amd64 hppa ia64 ~mips ppc sparc x86"
 
 DEPEND=">=dev-lang/perl-5.6
 	virtual/perl-Digest-MD5"
diff --git a/app-crypt/rhash/Manifest b/app-crypt/rhash/Manifest
index b1692cf08231..1873d9b1a65c 100644
--- a/app-crypt/rhash/Manifest
+++ b/app-crypt/rhash/Manifest
@@ -7,7 +7,7 @@ AUX unquote-cc.patch 791 BLAKE2B a872b7a8e8d2e04f5cf3dda0b4f4aa5e0177878942f9836
 DIST rhash-1.3.6-src.tar.gz 328097 BLAKE2B c74993d183f0f2e479f0bd5831a9f653b9bd17bbed4d1ba896f6e33db98b7141175cd3c688dc41dfd8ec4b98acb51255ae5b795435cbc9dfb5ab77573cb25543 SHA512 54f7f238ed1fdc01c29cc1338fa86be90b69beff0df8f20d24ce9cb3c48c7f4668b84a3fe0d4d8b04b54bc8145485d493435edf3219de3a637af0f9c007c85c6
 DIST rhash-1.3.8-src.tar.gz 393544 BLAKE2B c326b3fa6dbc5ea2cce40105dc319456fdcc58140a05e8002bf1d92be921d8bbd27bf670370ba7cf2ff2001ff70ddbeb8efc9712869a7b215c5f51a5e493b5c9 SHA512 9dba4fa4dd49d323f2e440c5b93eac1ef62eb4046ec4ef611f0978c12c1739002f1ac1f1ec5e61bd359dc89e9ed612db71be91a795184ac5d5433280d27fa4c1
 DIST rhash-1.3.9-src.tar.gz 403415 BLAKE2B 49f3b9348485b83521f58fa1de30517b05a8265547cbec3276d89c42b46baccc4ea22d41638764600c76669308a5f7d9d3995b7cec51676c9f8492ba740e473c SHA512 6fae0587cdeb42df59d542c58bad734259d1ff39fba92531c10a469b51310644669ffbe0453e72d85c2cf38b176962f6dca9062a121ac019f1b30f207a176e60
-EBUILD rhash-1.3.6-r1.ebuild 1904 BLAKE2B 0e9ba826c6931509a9ee7364d3f3e26b8b0ba633557c4ef3514315fec36942565189ac714c01376803c46de20a5d27b4182c66e65c8ce3b0d327f9f4f5819c2a SHA512 ce0b57549dfeb09cb3608e167fcc7cb8c07c9cbfc2f69a69bb5d0678a78cf94ca1bb66302f60818aa28f5892397e7ba92a3293944c5f73cffd4d803f18ddd31f
+EBUILD rhash-1.3.6-r1.ebuild 1905 BLAKE2B 58c1e173d2f6e8acb03690a945722cd6649a15158ea39588c08d07b73b97c9625630ec6219b57de0648839420a45d75f8432e67f23ac32c17a34008811005cd4 SHA512 5e240f4761d8a78379a1b268bf25917d1c2a78cfbd1bad5bb0e75a8ab944322e88881b869cddc34873c58197b1d64d6ff5a23b114e78729da3ec3cc5759fe174
 EBUILD rhash-1.3.8.ebuild 2061 BLAKE2B f793d773cda3f0ae8274fd5864786a97c5aa2c9e8428d87b9d74e5015b5bcfcb2a548549320c7925cae7766de369f756e065d6fb5395dd9f1a92042235697bcd SHA512 be49c11d4201b92b33ee9c386bedac0378ef5298fc4d0165f30ac3cd088949171bfcfdf09bb28bee6807010896f012f54c0f674b1785df560f373f06d8eedc19
 EBUILD rhash-1.3.9-r2.ebuild 1955 BLAKE2B 7c0920958260b317476dc8a7bf147f38bf1467510dab0d556f8dd6e77bceed51d135b1c4f46dd7989373b938ffb8b1b7142da221dd8ac7051b2e2b82c9a966c1 SHA512 45e23ec2abbe36f4355721259c91c03f1eda855e9e9766197d79eb836cda61be4f81593bbe1b938e75cd7615beb6805cdb746f7b7278efdddccdf20cabe0c996
 MISC metadata.xml 753 BLAKE2B 09d65c4222a77b9cdab0e82e8b3a38a63762c9e691285f712e09e99ecf28937d70436ac0dc56a890ea1f6ca9981c7f02383ce92a0da6a0c5ca11af2b3598e77e SHA512 d9a8480839af7651eb09b1210b2b0f736d01018cd1863eb17f24f0f51024c234f6f5036745f2034e89bcbd85f396b194184fc987adba43d9d0bebfa0b65d635a
diff --git a/app-crypt/rhash/rhash-1.3.6-r1.ebuild b/app-crypt/rhash/rhash-1.3.6-r1.ebuild
index 8b2b12e1ae59..eae26f887c94 100644
--- a/app-crypt/rhash/rhash-1.3.6-r1.ebuild
+++ b/app-crypt/rhash/rhash-1.3.6-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}-src.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
 IUSE="debug nls libressl ssl static-libs"
 
 RDEPEND="
diff --git a/app-crypt/seahorse-sharing/Manifest b/app-crypt/seahorse-sharing/Manifest
index 6148cbf50b3d..aa9ec1bbb517 100644
--- a/app-crypt/seahorse-sharing/Manifest
+++ b/app-crypt/seahorse-sharing/Manifest
@@ -1,5 +1,3 @@
-DIST seahorse-sharing-3.8.0_p20151117.tar.gz 496497 BLAKE2B 5107eb37c57d8311390399fda59d8df76f59afc6b21f107dfb1cb38dd6c68ea25bda619b1898637ff009c0e9f7617b0557b86f0194ee2c8704d804aa9f8827f9 SHA512 aa43240040f637e3c79c08f07620a92e5e76e81b758c939a8eee5bf43cdd32657f85d4b9d7440401e092ef4d556849ba0a64dc9d5a83e708bc84d9a2d7baf01c
 DIST seahorse-sharing-58db1e5b8615d74afaa5d888237ef6556368147b.tar.gz 101549 BLAKE2B c0ac487e826426c5f0a7fcfdc1078bd9b96442751821ac6597da3ffae3f5ab06b3fa4c4cf514536f9b8375f2a36529768942e6b15d6f4ea57ada543e7d95586c SHA512 6b91a8498f6065a0ddfcc53edf96dbf7720f82a73bc904ce6af18b1f52b559459e21ad9c3d550fc24730e3200c2ff9acaa9bdfe64b5bd83939b55db97ea116d9
-EBUILD seahorse-sharing-3.8.0_p20151117.ebuild 1574 BLAKE2B 6ac878db3280b82d833c40fc4f3f8009ec1b607b3dac020e0ae0e560c8762d76cd560f2e04a7ae914eaee3035283fc8abbe38e5a8c4e6cc34d590055d63a368b SHA512 809c041826a217365d5872f710bf51d0f8f99e3704e10916b5a70d56f50a0c282adbae120d51d9baaac0103363de54d95c3cbfb17617c3716185c44825a4d31c
-EBUILD seahorse-sharing-3.8.0_p20181216.ebuild 1505 BLAKE2B fd622edb1ade606341ae6a28950804a0bcbe09f4f7442655d9d344a2d09a3740f6a9ebb29a4a74e6389697bdb49b63f7e57295bab01b6b13caeca30189854178 SHA512 893298589e9f0355098d00f03d7929bf5eb2fd83e7cbd019734cbd5d81800a7651b34377270a051e447727e4f75b93c0aee51c193278472a9165df88fc4e1f95
+EBUILD seahorse-sharing-3.8.0_p20181216.ebuild 1503 BLAKE2B 6c8752123be3acbe723bf3eba65fad5c2abd5a5d60a56736d80f716b6239bd54788e1875276e32e832752ee11c92e2fa837b297f2cdf2bb709532a569e4f3e00 SHA512 812e385faf7d855355c137f266497b89e87bbf9560d2de1da823057f84b290c549f24337462d5459be85a79ef67afbb3f74fd36f4e9f5dd095f5da93406257df
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/app-crypt/seahorse-sharing/seahorse-sharing-3.8.0_p20151117.ebuild b/app-crypt/seahorse-sharing/seahorse-sharing-3.8.0_p20151117.ebuild
deleted file mode 100644
index 3abf12384403..000000000000
--- a/app-crypt/seahorse-sharing/seahorse-sharing-3.8.0_p20151117.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-GCONF_DEBUG="yes" # disable asserts
-
-inherit gnome2
-
-DESCRIPTION="Daemon for PGP public key sharing using DNS-SD and HKP"
-HOMEPAGE="https://projects.gnome.org/seahorse/"
-SRC_URI="https://dev.gentoo.org/~eva/distfiles/${PN}/${P//_p*}-19-g61de83c.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-COMMON_DEPEND="
-	app-crypt/seahorse
-	dev-libs/glib:2
-	>=net-dns/avahi-0.6:=[dbus]
-	net-libs/libsoup:2.4
-	>=x11-libs/gtk+-3:3
-
-	>=app-crypt/gpgme-1
-	>=app-crypt/gnupg-1.4
-"
-RDEPEND="${COMMON_DEPEND}
-	!<app-crypt/seahorse-3.2
-"
-# ${PN} was part of seahorse before 3.2
-DEPEND="${COMMON_DEPEND}
-	>=dev-util/intltool-0.35
-	sys-devel/gettext
-	virtual/pkgconfig
-"
-
-S="${WORKDIR}/${PN}-3.8.0"
-
-src_prepare() {
-	DOCS="AUTHORS MAINTAINERS NEWS" # ChangeLog has nothing useful
-	# Do not pass --enable-tests to configure - package has no tests
-
-	gnome2_src_prepare
-
-	# Drop stupid CFLAGS
-	# FIXME: doing configure.ac triggers maintainer mode rebuild
-	sed -e 's:$CFLAGS -g -O0:$CFLAGS:' \
-		-i configure || die "sed failed"
-}
-
-pkg_postinst() {
-	gnome2_pkg_postinst
-
-	if ! has_version net-dns/avahi && \
-		! rc-config list default | grep -q "avahi-daemon" ; then
-		elog "To use ${PN}, the Avahi daemon must be running. On an OpenRC"
-		elog "system, you can start the Avahi daemon by"
-		elog "# /etc/init.d/avahi-daemon start"
-		elog "To start Avahi automatically, add it to the default runlevel:"
-		elog "# rc-update add avahi-daemon default"
-	fi
-}
diff --git a/app-crypt/seahorse-sharing/seahorse-sharing-3.8.0_p20181216.ebuild b/app-crypt/seahorse-sharing/seahorse-sharing-3.8.0_p20181216.ebuild
index 6aea8f21d54c..2fb2f6507630 100644
--- a/app-crypt/seahorse-sharing/seahorse-sharing-3.8.0_p20181216.ebuild
+++ b/app-crypt/seahorse-sharing/seahorse-sharing-3.8.0_p20181216.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -13,7 +13,7 @@ SRC_URI="https://gitlab.gnome.org/GNOME/${PN}/-/archive/master/${PN}-58db1e5b861
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 COMMON_DEPEND="
diff --git a/app-crypt/shash/Manifest b/app-crypt/shash/Manifest
index 74891958c30e..a081271249f1 100644
--- a/app-crypt/shash/Manifest
+++ b/app-crypt/shash/Manifest
@@ -3,6 +3,6 @@ AUX shash-0.2.6-binary-files.patch 898 BLAKE2B 892a6bed771a8906b5b00a47b1b13df37
 AUX shash-0.2.6-format-security.patch 413 BLAKE2B 4bcb4a803b8a69c7568d89dfbb900687627f1f51ddefd60b814aa1195daeb6c8026ad1dd55f17fa78ef54fc592b94e9704440f66a47a1c7a70fea0172167e0d7 SHA512 295e5d147c6b66814fb5b863ceab39bec87cdca0d3f1ff3e9d10e59b090a171d96efba080447f1520358ccc4daf8e926c3403e69f966cabdb33722d030ba1b04
 AUX shash.bash-completion 856 BLAKE2B 259204c4579326baa2b68d32e87bb8d6bcb4bd25646d851a68efe28927dc4c61e409092581036a777cddcf4941c12ff51e53f97c30b361cde05f4e89b65abda8 SHA512 1d6f57c5d1d75a576bb2536dc9a7518263e2c34da127f0450e1c7900038a8c9e4a379533ff34ddccf0c62cb53284f0fdab41510f71a05a337e39bcab578ed2b8
 DIST shash-0.2.6.tar.gz 105641 BLAKE2B f7421aa9ed7b242e14a585461e96f44e35f1acf38cba358807ec06e6678c82f7f3b070a218de71cccde9f18a1e7e13f8dd4cf66b48e9d6626f16b2e1fc33757d SHA512 340a59bd16b3e5069a076b56f8fe24d2306a6ddd5e6ad564c5e17a992d8e279a7109ba39bd5caa8438a0e85b4f94cb0878228f7aefe38221ff6efa80df64086b
-EBUILD shash-0.2.6-r2.ebuild 873 BLAKE2B 37254681e1b9df38407b1c3eadb30e0bc338272d3d086142f8b365790386461874a5de93e34d7483f99c1b064a92ce5236047cce90eb63f68725cc02c7f98e72 SHA512 b26f43698cc8950fe25a121fc7cafabd17486a2e9dff99b28c3fc917d11bd0455c53d81132bdb9cb8d282e66f831568d5cbdaa8d38736a91aa85d6fd282c24b5
-EBUILD shash-0.2.6-r3.ebuild 939 BLAKE2B 0663a2820c9f47387c9910abc7e27ee0404e754b72982a27f12058744c7a1d826bb4389c8019f08361fc4f1285a81ef24a6758966ed1bda2b31b1746fcbb08e6 SHA512 c679753ea30abe10d2a99f8fe620fb5583d2669f5848067419a779143502686e5bfaf3442411f8d2766d26355989f26bd392875f1cc7cea81753e2e0390d256b
+EBUILD shash-0.2.6-r2.ebuild 874 BLAKE2B d896e5071e8f98e8fdf98dfb307fa0d287f66469a32635c896357edbcb2c16e08ab8c0a5c4782ea8accf49f38232076e9780ac8c5eced003cf70655c76a84621 SHA512 388a7a041d444c071e40af5ee84053524e70d6a5acffad317ddfb440ca76969df7f6f7360491bf59889c63e6c6798bde920cf1961ebb5911db4720c78be66040
+EBUILD shash-0.2.6-r3.ebuild 940 BLAKE2B 2ebd8ffee15cf814ba6d6eba81fa1f114301f2b219513b6322b8560a0d694ae685da45307564714c1be8b3e7c10c724b97e9cb0f7f50af62aab8d57e1e80b461 SHA512 a145399e70351861a4032eb73a493322c4e8749a500965e060f0496994f13bc1087026278f0691cdffccc916a500c7d3bdd3a6cafa60c326a301b962889f0dbb
 MISC metadata.xml 389 BLAKE2B 0f19c78e6c95b99b0de3da4896ded3dbfcd482650294efb1a7b0961a6ea884e30241bfe431fe9c85ced61c45cc0e123f52847953b4e4a2bd86e4a14894190d2e SHA512 dfecd29a48ac51dfbb2d4ab6bc71d4538da61541b7ca3beb34edc4d321a97d881044e4f5815d8cb1a4715dc18dc5a9b58520e3d8697b8cbf35a6f795c13c87d6
diff --git a/app-crypt/shash/shash-0.2.6-r2.ebuild b/app-crypt/shash/shash-0.2.6-r2.ebuild
index 160b453433fb..c00189dfb004 100644
--- a/app-crypt/shash/shash-0.2.6-r2.ebuild
+++ b/app-crypt/shash/shash-0.2.6-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="ftp://mcrypt.hellug.gr/pub/mcrypt/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE="static"
 
 DEPEND=">=app-crypt/mhash-0.8.18-r1"
diff --git a/app-crypt/shash/shash-0.2.6-r3.ebuild b/app-crypt/shash/shash-0.2.6-r3.ebuild
index 269cc956ceeb..48a74e0bef75 100644
--- a/app-crypt/shash/shash-0.2.6-r3.ebuild
+++ b/app-crypt/shash/shash-0.2.6-r3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="ftp://mcrypt.hellug.gr/pub/mcrypt/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~riscv s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~riscv s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE="static"
 
 DEPEND=">=app-crypt/mhash-0.8.18-r1
diff --git a/app-crypt/yubikey-manager/Manifest b/app-crypt/yubikey-manager/Manifest
index 01aab7a180fa..73adcc5c0743 100644
--- a/app-crypt/yubikey-manager/Manifest
+++ b/app-crypt/yubikey-manager/Manifest
@@ -1,3 +1,3 @@
 DIST yubikey-manager-3.1.0.tar.gz 115010 BLAKE2B 1b27b9af7f3adac87a1bca58929bffef2ae397b359f70580a07193d2bd2f8cd4d2d867053f6494f1e262668443388d79dfe3775f2c3d0a5528840df8826cdf91 SHA512 518eedb52cfcf725c13114c433f848b97f711e94fa9c71685916fb8cb20e5bfc431f648b0ec710ef9ebed2bc8ddd8722ca1c9865d7a1b29537b719e167ed5f60
-EBUILD yubikey-manager-3.1.0-r1.ebuild 1605 BLAKE2B 3bb21dfe6726689f5dc676175a3551c821eda6ab4ab67553d955ddad09789c5e736aa130a9f70ede9a0b65edfeb6df9c26b1c7adb0157986dfb1ccfbb5ac7592 SHA512 5eeb28cbb6d2dee877aa149ba9f55cb8ba14fa62617ea7b3b978988c58f6412c7c7f6c430c0c8e428fe607a23166760e3c4d5cd22cce1d5fcf949249e0c885bf
+EBUILD yubikey-manager-3.1.0-r1.ebuild 1599 BLAKE2B 0a737c8dcffadb01fa75041b4341fafbd4e82615a04841def05ea42c0ff275e2aca6b23adbf17c8c5f839ecfe0d4f6383e1e90b7a60f79bb89252c89ecf4c44d SHA512 fcd0fbe3d09128a9e7360371171407bf732a22eccb8216077052f5184820bb4badfe6f0682fd9259257fda5b0f455f34c5c129c18073cce713ad2f094cc9e855
 MISC metadata.xml 466 BLAKE2B 258688bf55e0d7d5d13a45996c2177d2154626a75ffd0c5b39cbc5c3f83979a00ec1d9a993870c00785d0e1d02cdeb1dadfa38f39d91b5992c5b495f644c6253 SHA512 6355c94235c5a7a9dbe37fb954d7de5807bbd48d62921f819da7ac1c56f0214820cbf74b2f91311573f8a1726b05960d944b536fbf0e0f27fe49a5aa0a827e1b
diff --git a/app-crypt/yubikey-manager/yubikey-manager-3.1.0-r1.ebuild b/app-crypt/yubikey-manager/yubikey-manager-3.1.0-r1.ebuild
index dec0828aa805..b471c2587921 100644
--- a/app-crypt/yubikey-manager/yubikey-manager-3.1.0-r1.ebuild
+++ b/app-crypt/yubikey-manager/yubikey-manager-3.1.0-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python{2_7,3_6} )
+PYTHON_COMPAT=( python3_6 )
 inherit readme.gentoo-r1 distutils-r1
 
 DESCRIPTION="Python library and command line tool for configuring a YubiKey"
author	V3n3RiX <venerix@redcorelinux.org>	2020-02-05 18:44:56 +0000
committer	V3n3RiX <venerix@redcorelinux.org>	2020-02-05 18:44:56 +0000
commit	29aabba0ea759c6a2864ff5631735b67ee38e5e0 (patch)
tree	ab466b4dfa7abecb401b2f8039d08af4689306bb /app-crypt
parent	d42200bec37eef2a7478d88988ff00addd0a9202 (diff)