gentoo resync : 15.01.2020

author: V3n3RiX <venerix@redcorelinux.org> 2020-01-15 15:51:32 +0000
committer: V3n3RiX <venerix@redcorelinux.org> 2020-01-15 15:51:32 +0000
commit: 21435953e16cda318a82334ddbadb3b5c36d9ea7 (patch)
tree: e1810a4b135afce04b34862ef0fab2bfaeb8aeca /app-crypt
parent: 7bc9c63c9da678a7e6fceb095d56c634afd22c56 (diff)
231 files changed, 1244 insertions, 1235 deletions
diff --git a/app-crypt/Manifest.gz b/app-crypt/Manifest.gz
index fec87c9fdcc5..274d2bb3f235 100644
--- a/app-crypt/Manifest.gz
+++ b/app-crypt/Manifest.gz
diff --git a/app-crypt/acme-tiny/Manifest b/app-crypt/acme-tiny/Manifest
index c994fb6503ac..81a843093ee2 100644
--- a/app-crypt/acme-tiny/Manifest
+++ b/app-crypt/acme-tiny/Manifest
@@ -1,6 +1,6 @@
 DIST acme-tiny-4.0.3.tar.gz 12662 BLAKE2B 6a17d0597731a5c8c1b260fa47396cb5bf8a223f44c8e498532b6e90a2ded35c5fcae058a8682e59ab060c1eeb27e09c8db8588e1d72cfd75b65f867d3e94f9a SHA512 bd37d4f878f2851c8e88acb78699b855cfd306928e2d70ef1d35dc9883d44dae3c7622e2114b1d5c4e0c5865b61ad3958a776467ab45eaedb0cf612530ca5dc7
 DIST acme-tiny-4.0.4.tar.gz 12667 BLAKE2B 6177d639a2d65080f84ca93400405c01ef18cb3c8d18ef5e7e57af1eede9d6f1e105ca7f6f89014e79c5cb1d865d3c81f590abdb37e8caa6b9699ea20064f698 SHA512 e66befe8262b3396e5e55ea01fc47c668c527868832d2ccdc2786156ec52e698fd20cb6fa4fe861d97947d64f4b6c751be9c79bf546eaac34978c53b9e6f85e4
-EBUILD acme-tiny-4.0.3.ebuild 1133 BLAKE2B 55cc688ae27fae88bf34852ec824350d749ca9c84ae25d796aa4557a9497c6e276f5fdad2d0c245572b279940416c54b8cfb7afce1a04a007c1a5425da452d8d SHA512 06696e621482759d87705c9f4dbc67d52358519fae9888f1071e9dd01318c9feaf9495d3ac46bf785975123e611e3975c5a88a8dbf5509cfad3b408b1ffd604f
-EBUILD acme-tiny-4.0.4.ebuild 1131 BLAKE2B e9a4666685882c6ce0fce651105dde93582bf1a8d81a1b4bcc4804bdd13d453f1662b4f3369c7439bd2c3cba88754c05e7083ec437bb0d413481370f7310b2e9 SHA512 15eaa831e05bbfa9fef167815ec2646917b5dc737424d07e68cd52cdc60a2cf79ff37a069dc69cdfdbb765da9c5bb696d34d071816a9e54c3408cce3383f4f14
-EBUILD acme-tiny-9999.ebuild 1127 BLAKE2B 87adcc8df8293ee8746e5b4e16355f1fbc77520ef1bd43d8880377c630ec7b5e85b69e8b0f7d5f948bd44a287ba61383c827523e4e8bb86c0e5a7e1f71b3cab2 SHA512 c91a264afc6f115d27830179fb10d322365a65afeed1970d3b377e55deb033a8fef72b3c1e3a3f2fdec535c84b0d09ae511cfca3c88d28461da4b93bb744ff98
+EBUILD acme-tiny-4.0.3.ebuild 1129 BLAKE2B a90e88b0d9aa256dd435ff6619c3336dba1e7c1ee6f4e68234c3ccee93da61f72dd92883c834054a1a2b785e76f77c9a489a82d35bba88d31ac3199627924a85 SHA512 55d9f05c54468dd556be7d56735a581a0d9facf5ddc6a94cb105c5c99bb14af989d929c0347da4a09099f5fb77f9c9ffdec10f710885b41f541d1a24d7eb876c
+EBUILD acme-tiny-4.0.4.ebuild 1127 BLAKE2B f80651dd7e9e0ff02623275796cc1f2ac83296e92d7d3339e0e9bf2b35c38de312c81f6ac62f96914fedce077ead1e0bfe6bf3593c8e1efa182821bf2b19ee1d SHA512 cdc2c7887e6a3c48aea39aaffefcbdd76859376bcc72ad6f6dac5a3a4142386c815bd8d6d08144ebc874770bc451d413dd33b2eb7eb4fa05fc48711d50153737
+EBUILD acme-tiny-9999.ebuild 1123 BLAKE2B 1de921f8dfb96218434c6f8fb9cf0534dd2d98333a84e422af27e2b31deead44ceae42173f4b10496c35207471e7ce9336c840777ec7dcf086b6d4856bb3db3f SHA512 b902e95fbcbd85994682033cc86e9998332f256ef8c7f0a7c949e9d92f08e602c9e867cc47093005eaafc9c5cd4140d251ccca40888f5393b1a235ea468b13ea
 MISC metadata.xml 429 BLAKE2B 101ebd6c130b6955951254d1c7e759dbf7d5dc08d899c2bf1793e3e73ad2aec4761782d9bcbd708a42a0217cda22255fb645cc6f88792aa0a5445c6b2df79289 SHA512 7c0ff5126424ad18a75bd73fdab208397aedf79df6c6a3fc776efe1000ac9f41e3cd056e65da68fbba507940328c0308074ce9335c4be38a8197f7545728d9da
diff --git a/app-crypt/acme-tiny/acme-tiny-4.0.3.ebuild b/app-crypt/acme-tiny/acme-tiny-4.0.3.ebuild
index d9ed230cc73a..678610b6a6a6 100644
--- a/app-crypt/acme-tiny/acme-tiny-4.0.3.ebuild
+++ b/app-crypt/acme-tiny/acme-tiny-4.0.3.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python{2_7,3_5,3_6} )
+PYTHON_COMPAT=( python{2_7,3_6} )
 inherit distutils-r1 eapi7-ver
 
 if [[ ${PV} == 9999 ]]; then
diff --git a/app-crypt/acme-tiny/acme-tiny-4.0.4.ebuild b/app-crypt/acme-tiny/acme-tiny-4.0.4.ebuild
index 859b43707cdd..560940108678 100644
--- a/app-crypt/acme-tiny/acme-tiny-4.0.4.ebuild
+++ b/app-crypt/acme-tiny/acme-tiny-4.0.4.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7} )
+PYTHON_COMPAT=( python{2_7,3_6,3_7} )
 inherit distutils-r1
 
 if [[ ${PV} == 9999 ]]; then
diff --git a/app-crypt/acme-tiny/acme-tiny-9999.ebuild b/app-crypt/acme-tiny/acme-tiny-9999.ebuild
index 2a5c2179177d..8a95c21a2a9f 100644
--- a/app-crypt/acme-tiny/acme-tiny-9999.ebuild
+++ b/app-crypt/acme-tiny/acme-tiny-9999.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7} )
+PYTHON_COMPAT=( python{2_7,3_6,3_7} )
 inherit distutils-r1
 
 if [[ ${PV} == 9999 ]]; then
diff --git a/app-crypt/acme/Manifest b/app-crypt/acme/Manifest
index 1b9318dc4373..f34bdd23a0d3 100644
--- a/app-crypt/acme/Manifest
+++ b/app-crypt/acme/Manifest
@@ -1,8 +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
-EBUILD acme-0.39.0.ebuild 1748 BLAKE2B 5b7e165bd8bfd93fc26043da5c5b9786b07e5209455a3a2ddb2fa7598d885dc5996a4ba0497d4dde1adfe5b9cce2b94208d7dc05b9415157984fd66951f38036 SHA512 139af0225c89eb0b35a26dd20e4099ea0c3960defa2592cb48796d9a5cce50b62d43cb42af3ef79b00b68784e19673c9f1963f9d61df4c587544000ded15faac
-EBUILD acme-0.40.1.ebuild 1748 BLAKE2B 5b7e165bd8bfd93fc26043da5c5b9786b07e5209455a3a2ddb2fa7598d885dc5996a4ba0497d4dde1adfe5b9cce2b94208d7dc05b9415157984fd66951f38036 SHA512 139af0225c89eb0b35a26dd20e4099ea0c3960defa2592cb48796d9a5cce50b62d43cb42af3ef79b00b68784e19673c9f1963f9d61df4c587544000ded15faac
-EBUILD acme-1.0.0.ebuild 1750 BLAKE2B ccf351cdc02809191fd1b2f9bec0ab79e5e710b685a7e2c8ad9555096b109b27c8db327681b4c3bee8e11dc48c627b194d56eb292f0fbe530834ddf932714f8a SHA512 b3eb0461905002ecc5cb7c53a1c43a01fe5c121200749a02a6c783bc9d91f77e65e7dcaf8a299663e3c0820578c57d98830a3cfeef309168f6941e63bc9b0702
-EBUILD acme-9999.ebuild 1750 BLAKE2B ccf351cdc02809191fd1b2f9bec0ab79e5e710b685a7e2c8ad9555096b109b27c8db327681b4c3bee8e11dc48c627b194d56eb292f0fbe530834ddf932714f8a SHA512 b3eb0461905002ecc5cb7c53a1c43a01fe5c121200749a02a6c783bc9d91f77e65e7dcaf8a299663e3c0820578c57d98830a3cfeef309168f6941e63bc9b0702
+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-9999.ebuild 1750 BLAKE2B 93dd49e3c1329e7377544581c53aaf2a949a6d8f3f9d09a121e50c52fe618714b6173cb82b3a7179591bcff12051389e35705bac79bd1e6eacf45e3a67bcb59c SHA512 80cdd3fc105bd094a3c78066b4913112871a150e4797db5469450cbb709c17a63c1b39c0b2932d819c9f47242872801fba31b16b7b0072a1f15de8a42939a849
 MISC metadata.xml 384 BLAKE2B 55780995cb61c11ca859c9f1de17b1c22c9c92902f551ccd1ee6f030df9d513bb5519a2c62bf33bc6a5872790d033ba966e5ed137d84a4f66ab4ba7636a88887 SHA512 cf8393b25aa363bc1db4ebd23274affd1eaf999a4c2ab8d359730f421961dafd5c96fcf14c247f3f5419616116e2351d72fbf0e29301ea44ac522e865c7b0fa1
diff --git a/app-crypt/acme/acme-0.39.0.ebuild b/app-crypt/acme/acme-0.39.0.ebuild
index f0658af138c4..f045a98c0861 100644
--- a/app-crypt/acme/acme-0.39.0.ebuild
+++ b/app-crypt/acme/acme-0.39.0.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=(python{2_7,3_5,3_6,3_7})
+PYTHON_COMPAT=(python{2_7,3_6,3_7})
 
 if [[ ${PV} == 9999* ]]; then
 	EGIT_REPO_URI="https://github.com/certbot/certbot.git"
diff --git a/app-crypt/acme/acme-0.40.1.ebuild b/app-crypt/acme/acme-0.40.1.ebuild
index f0658af138c4..f045a98c0861 100644
--- a/app-crypt/acme/acme-0.40.1.ebuild
+++ b/app-crypt/acme/acme-0.40.1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=(python{2_7,3_5,3_6,3_7})
+PYTHON_COMPAT=(python{2_7,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.0.0.ebuild b/app-crypt/acme/acme-1.0.0.ebuild
index acacc42fc78b..f045a98c0861 100644
--- a/app-crypt/acme/acme-1.0.0.ebuild
+++ b/app-crypt/acme/acme-1.0.0.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=(python{2_7,3_5,3_6,3_7})
+PYTHON_COMPAT=(python{2_7,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/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 acacc42fc78b..da68660fa26a 100644
--- a/app-crypt/acme/acme-9999.ebuild
+++ b/app-crypt/acme/acme-9999.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=(python{2_7,3_5,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"
diff --git a/app-crypt/acmebot/Manifest b/app-crypt/acmebot/Manifest
index 8ea94e3e4738..1eb0a0579c7e 100644
--- a/app-crypt/acmebot/Manifest
+++ b/app-crypt/acmebot/Manifest
@@ -1,4 +1,4 @@
 DIST acmebot-2.3.0.tar.gz 64841 BLAKE2B 92bfb9a58722b9955fe908e2fcb1a3ee593bf87e3fdf3dc9564bcbe291b13c553ad426673c337a59344287da64c4ee5cffc734f8dfb60447f96d6234814f0167 SHA512 3951cc7138eb0b83bd802a2e0a221fa985209ba276028606d887b7d2eff84c35db034f4a3d8a6836b3ac149c6dbfa27b1ea47e864f549f8d88b758b40407c4f4
-EBUILD acmebot-2.3.0-r1.ebuild 1208 BLAKE2B 792893c9e3293bfad5aaef34d5866a6f2c01c829d479cb0916834409776f6e8c51757752c6902ed7c5af26c40ba8961ca12d3878e0a5d5af66c5ddeabf4dcb8c SHA512 0c69ff9b2c6180cdceffbefa02afffa7364e400074fc8402c72e65ab63332334a81af2115c6d04459821abeaba53edc98fcd49032fe372696de7010dae99fe5b
-EBUILD acmebot-9999.ebuild 1208 BLAKE2B 792893c9e3293bfad5aaef34d5866a6f2c01c829d479cb0916834409776f6e8c51757752c6902ed7c5af26c40ba8961ca12d3878e0a5d5af66c5ddeabf4dcb8c SHA512 0c69ff9b2c6180cdceffbefa02afffa7364e400074fc8402c72e65ab63332334a81af2115c6d04459821abeaba53edc98fcd49032fe372696de7010dae99fe5b
+EBUILD acmebot-2.3.0-r1.ebuild 1204 BLAKE2B 3e8c2819fbfcf03532e9d3a4e27bab49d1c71b731ed57e1b9670feeb2976e87b9ba996d4d86f44b5e64d83ec6150cdf86ad4797365558875fec738eeb3e85150 SHA512 f55d679599a23d555e295b4ff5d6618c0b6ba8412da22d139bf9502a78509984fda7654eed2c69781e37c02e13482be723469468297697820df68ad221d1467f
+EBUILD acmebot-9999.ebuild 1204 BLAKE2B 3e8c2819fbfcf03532e9d3a4e27bab49d1c71b731ed57e1b9670feeb2976e87b9ba996d4d86f44b5e64d83ec6150cdf86ad4797365558875fec738eeb3e85150 SHA512 f55d679599a23d555e295b4ff5d6618c0b6ba8412da22d139bf9502a78509984fda7654eed2c69781e37c02e13482be723469468297697820df68ad221d1467f
 MISC metadata.xml 216 BLAKE2B 20531789dc11e43feee7ec315a0c1c7249fdf73764e29cb7d6db439826e9ff72f24a5cdb8eb7f1ab99bbb41fb6e4226874a1d1fa4185de52598602bb3b0479a3 SHA512 e881b59fe49746eb25ad66c258b41aba501e4eb563129093a3898ea970a20506e7898f7c355cfcf99605234962bf2c77c1309c258b9a2b84ee4302ccb71c9dbd
diff --git a/app-crypt/acmebot/acmebot-2.3.0-r1.ebuild b/app-crypt/acmebot/acmebot-2.3.0-r1.ebuild
index a179ed4c74a8..d200063e3eb7 100644
--- a/app-crypt/acmebot/acmebot-2.3.0-r1.ebuild
+++ b/app-crypt/acmebot/acmebot-2.3.0-r1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=(python3_{5,6})
+PYTHON_COMPAT=(python3_6)
 EGIT_REPO_URI="https://github.com/plinss/${PN}.git"
 [[ $PV == 9999 ]] && _scm=git-r3
 
diff --git a/app-crypt/acmebot/acmebot-9999.ebuild b/app-crypt/acmebot/acmebot-9999.ebuild
index a179ed4c74a8..d200063e3eb7 100644
--- a/app-crypt/acmebot/acmebot-9999.ebuild
+++ b/app-crypt/acmebot/acmebot-9999.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=(python3_{5,6})
+PYTHON_COMPAT=(python3_6)
 EGIT_REPO_URI="https://github.com/plinss/${PN}.git"
 [[ $PV == 9999 ]] && _scm=git-r3
 
diff --git a/app-crypt/acr38u/Manifest b/app-crypt/acr38u/Manifest
index 2e6c636cde5e..2fce15df7112 100644
--- a/app-crypt/acr38u/Manifest
+++ b/app-crypt/acr38u/Manifest
@@ -2,4 +2,4 @@ AUX 1.7.11-bis.rules 590 BLAKE2B 8604b9d067bac53501127f7d6ed8b6ef226e6faee64cd89
 AUX acr38u-1.7.11-build.patch 6299 BLAKE2B 4c18a2c36f980d1ab381373b0312b0049b94d7a8568827f44bde3381018998ef4ad059e3cb8e355da55ec539ce9c303569c1fb29364b0fe06a730c326c4871c7 SHA512 9979ca060a4dc4da526e0a0fbbe45a09e5e261cfde4f928f0dbc514af7d799796a2edf2f81d4015f512d9a374aeab57e971ce34f62cd7b0ac024ec2662c4a029
 DIST ACR38_LINUX_100711_P.tar.bz2 274137 BLAKE2B 0087cc63ee3af898824fd7cfe31f8b1f922ca4dded22215196b2bdaf1296cd50319d4923735fd2ecdb3cc329dee0df7f288a70e875417b02eb0803d19b1613af SHA512 c5d0e71ae383de515718d24110b825efa84cf1a150ec7249f80070446331fb4df4d157f5f4e96d45588346e51ab8e2012530edae92575b66891c7ee596d8d3f7
 EBUILD acr38u-1.7.11-r3.ebuild 1359 BLAKE2B cf9aba09624788656de556e54fb893d1a2642ba77ad74f73f605a83f510cbb2a06bd312310cb59768939d3f1677da17f8b8b45cb8646f0990f242b030b16f6eb SHA512 f269e951002756ab3bd10c21f70388e55f89a9934676cd486a0d83dbc4ce1eda13a7f4fa3b3f995b37a846ab369f0a1a9a955340ef486f5e02fcf0b806081981
-MISC metadata.xml 460 BLAKE2B 67621bd05f882e269bd7d756f61412917070d57b3a328676bdb3e725b0b1bb55f3723f2ead4f8f1e84a83779ea8c8c0ef4c59c49f4dcd80874aaea15e08df6f8 SHA512 ee27e065eecd06d74c8c44d29214ccf96bf1ed980701734f8a7fe0e1a427b486ef554368e74ce3ee1ecb5d86afbf3adb13d08b3e5162ef5c17cc378cbcd19afe
+MISC metadata.xml 353 BLAKE2B 4aef7e7e65d23cecbedd5c4d52f225650925963fba206f9cb114bf286c73bd1c500ac101d87699ec23f5e7c3c4145ee564f082d355e9885077262753d5796884 SHA512 7af033f383bfc83c36c8699eae0aae7fd0b46047dc01ef3e7a75bef9020e985adb3bbc6c232f37a4c77e8c971855c47c387efa5987aaa86b32b849605d4258c3
diff --git a/app-crypt/acr38u/metadata.xml b/app-crypt/acr38u/metadata.xml
index b7f98870cc26..98b6f5367fc0 100644
--- a/app-crypt/acr38u/metadata.xml
+++ b/app-crypt/acr38u/metadata.xml
@@ -5,10 +5,6 @@
     <email>vincent.hardy.be@gmail.com</email>
   </maintainer>
   <maintainer type="project">
-    <email>crypto@gentoo.org</email>
-    <name>Crypto</name>
-  </maintainer>
-  <maintainer type="project">
     <email>proxy-maint@gentoo.org</email>
     <name>Proxy Maintainers</name>
   </maintainer>
diff --git a/app-crypt/aescrypt/Manifest b/app-crypt/aescrypt/Manifest
index 0fb9221b2353..59cc5ba3fdd5 100644
--- a/app-crypt/aescrypt/Manifest
+++ b/app-crypt/aescrypt/Manifest
@@ -2,4 +2,4 @@ AUX aescrypt-3.0.6b-build.patch 1711 BLAKE2B df5eccdc516e0314a137b1c51e5ae05fe5e
 AUX aescrypt-3.0.6b-iconv.patch 1096 BLAKE2B 91d6e74ea8b760e81887a799ee5e8709ea7afc7f499842879091dcffdca76f24cc9191ac438c03b9f7f4970f55beca1586d56f3262e5d0f1de53366464141c2e SHA512 bf8d564493ae9396f024c1e33a775a53833da9d984ff059f714362a2cc112c3e6bd575c5d64fc0f7118fd578af645f386d649483ab56c2a0cb8d9b0795161409
 DIST aescrypt-3.0.6b.tar.gz 28272 BLAKE2B ce5347b77d974c76dadaa820b5b90a56015019f846bbc61560c33032adad08576d5e5ddd7d9e1020878e35b40173a2c5e29578e2f6e98631725442beac6f19ac SHA512 4c88abc9bff50ae5d310be7dad8f29843941843f9b484d9846b08dc76c605940adbb375f7e8ffefd6e8236f35ff860a745f89226e9c171bfa70c28c16aa6626a
 EBUILD aescrypt-3.0.6b.ebuild 607 BLAKE2B 1a411ecfc29f0de364a6d16ff86c8e9ad486cdb42d1a8137c3391bb14549a76df170140eea42d317b1d16301bbcd38a5076f8447c403a4f01d149debc3641fe4 SHA512 0fdc84b108ec79790601d14444543b5e3821e64fb02dc8bac46ef4e763d11c09f2f2181a38b2da255935ad068b86206a0e0214db98f836a48c1b999bae2201ea
-MISC metadata.xml 236 BLAKE2B a7bb92e6d53f7252ee56a885bf098930e228a76a75bca119358ca860901ceeecccc43efe5279c54250ebda58f77ae9c97d2ae540d8b399283cb3aa348111fcd2 SHA512 5f6cd6a85527534d5de7118de5af212ee3044c8c5530a7f7087a28074a2d4ab7be1728325bd985adc063dc795d3cf2b1c4e58a4c4c4ec02d739bd4bbc544ef08
+MISC metadata.xml 167 BLAKE2B e4dadf27fd344484f2bccb5b904909c89aac568c32e5b3c44bdf139eacefd4b4fae74419f503d2b7da0dccc1b68ba05d777d11292c0f89270d1ac5c9c703e8ca SHA512 7c8decb24ee3a850e38186cf3c7f8933a28017426806870ad6ef9ceb2533be147a2681fc789b535a81cb528af8c29d90d3006e4f250aee23bd7dea4561294e33
diff --git a/app-crypt/aescrypt/metadata.xml b/app-crypt/aescrypt/metadata.xml
index f1c3d59fb213..7a38bb900964 100644
--- a/app-crypt/aescrypt/metadata.xml
+++ b/app-crypt/aescrypt/metadata.xml
@@ -1,8 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-	<email>crypto@gentoo.org</email>
-	<name>Crypto</name>
-</maintainer>
+	<!-- maintainer-needed -->
 </pkgmetadata>
diff --git a/app-crypt/aespipe/Manifest b/app-crypt/aespipe/Manifest
index 2ced5785cb26..fcfda96aa83f 100644
--- a/app-crypt/aespipe/Manifest
+++ b/app-crypt/aespipe/Manifest
@@ -1,3 +1,3 @@
 DIST aespipe-v2.4e.tar.bz2 107741 BLAKE2B 9331441214b495f042f8ac41b57203057e762156aa7b6bd9fcb8d55b3e149fb79dd0d7c06358599fefd6662d797baf4cf9ba84fc4425e637c9fef0abf1b254c7 SHA512 e038f710ac971e5ba740648c0f255e8bc9fcea9be1a6b76208a453f21f013e1662c006d4f4495fa2b2560fd9b0c236947462a9b337a120073c6a5335b29f077e
 EBUILD aespipe-2.4e.ebuild 749 BLAKE2B f0af3d47dcf8d381891a0711a968a9d75a72136a4b52a8548b6e49d5445b2d49e1a3da595fa6ce18a3cc132ca3c90917a1fdb9440a0508f0c6f7608e6b53c222 SHA512 42d563aeb28a957534b0205aa47df96440cde79baad55b2848f9d1d7aa2fccece4d3abb06e070322016def375c8f9b3ddcb23eda7a75a1e93704d534007e6b25
-MISC metadata.xml 524 BLAKE2B fa8c7f3af8af1e270a415b22b8d79ba56968a4796f8aadb6891bde03dfb1bd00f970bcd6625f44d0d85af033c5e70cdd89be85aec0fdea953d455009d9c2bf1e SHA512 f4f83f8a2e74c242163be7fc553e522b0fc6c910718658d1ffce1767193a042c5a4e86bd7ccbf8bc6cd37d68f71ee763dd02bf4df2a73845e83eee0dac6db8b5
+MISC metadata.xml 451 BLAKE2B c23c4255b9480af40363c626a009f59e331a7382c48ddcd54be624998076c4da02f77105acfa6b9ba590d04f9bc338ae9d2ab70a98ff8ec7597dc75b4a83ea1e SHA512 a95dcbd4c3e796d7a9fc2b5d1f4ba17e5a0be6a24318b970cdc4498a44c279fc05ef20097477bd44fcd4eefe03be2545d439966ecb88d6be4cb9c824bda19a1b
diff --git a/app-crypt/aespipe/metadata.xml b/app-crypt/aespipe/metadata.xml
index f7a9049e7d05..cc185eaa435c 100644
--- a/app-crypt/aespipe/metadata.xml
+++ b/app-crypt/aespipe/metadata.xml
@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="project">
-		<email>crypto@gentoo.org</email>
-		<name>Crypto</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<use>
 		<flag name="asm">Enable assembly modules</flag>
 		<flag name="cpu_flags_x86_padlock">Use VIA padlock instructions,
diff --git a/app-crypt/argon2/Manifest b/app-crypt/argon2/Manifest
index ae68c4d3952d..3dec2782b3c8 100644
--- a/app-crypt/argon2/Manifest
+++ b/app-crypt/argon2/Manifest
@@ -1,5 +1,3 @@
-DIST argon2-20171227.tar.gz 1503745 BLAKE2B 70171ce1b446974e18e6f7077f436c6b78f29fd3eb075314014219280fd984e51b00137d901175da5fcb8a8472df0cbb16ff0333a2f2f098e52d3e0ea496e2cc SHA512 9c9e1a3905e61ac6913d1e073c104477e419ddd0506adc4487e88e98d19165ed8901fe8bb11246ed0cc71b3523c190da9692d5926642f86be09c3e67510afe4d
 DIST argon2-20190702.tar.gz 1505307 BLAKE2B fa9c3dde7b39c8d797a3d6b52992ebfe35f5eba1c7d7b3aa02c440edc36a3f5186cacee2e39e27ed7c6356dc1970dac0e8198d6f2065eb63ff77f9dfb2937cf8 SHA512 0a4cb89e8e63399f7df069e2862ccd05308b7652bf4ab74372842f66bcc60776399e0eaf979a7b7e31436b5e6913fe5b0a6949549d8c82ebd06e0629b106e85f
-EBUILD argon2-20171227-r1.ebuild 1186 BLAKE2B de0c9acbbf3986e142d2e03b0d6e2d17e21b2ecc72fe1c8f43c668be1cff4b181c68a3fada4edda6e4baf7ed08aa36577ecebd23785ef68e290bc5ba9f1c309b SHA512 78ee07656fd711ff23ba7e7bd141f4d2a07101d43430df57aecb9a040df1c74b86389280b215d5aef54e83412f87a5ff67184c2746849b9499647828fcd429f0
-EBUILD argon2-20190702.ebuild 1154 BLAKE2B 342493283673d2556387288087d4e47406043449ed87896270e2544dfd9f1b84f519aef8782307b646a52161ccaf29d42d42acc027f9ab6819bfe741c0181ea1 SHA512 9f6c675c16982fdaab76cdf4c15de7c029bfad070651c069d51cf50c352b5dc5e607c97f0d2234099d56af17ccf32c06fa6b0248a9d25d21d5e39ef909a2c2f9
+EBUILD argon2-20190702.ebuild 1301 BLAKE2B 2426652416d6a061400d0aae1a1479093b9b6ba9d02f8b7d91b4dad07a3172253c3460f575c15189002bb14fce34f9252fd9471b1f83b350114081bd07e89385 SHA512 2190db0ef257ae81ccbe380b75cfed763fa7112ea1a30f95cbbf09d055662d00aafc928570c580666c046c54da70ce0678c4c14302bd0d88ebe2836cc48439cd
 MISC metadata.xml 768 BLAKE2B 294ef62768a6e09f38479670b9ee12f056822d43fa7de681e7243d676a037c77e1724777c20a13d564ad364dba84f55089734b3546d593bb4f362f7a0cba3475 SHA512 bd066d4ad7d717ec6316a9ce307b38fd35be60149619c82ab4d636d4ae7e17c3dd22c328f9a5b6e9b3e54f15bfb5d11fd57b4e73e3f5399f3042a08611500553
diff --git a/app-crypt/argon2/argon2-20171227-r1.ebuild b/app-crypt/argon2/argon2-20171227-r1.ebuild
deleted file mode 100644
index e8a9219e21b1..000000000000
--- a/app-crypt/argon2/argon2-20171227-r1.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit toolchain-funcs
-
-DESCRIPTION="Password hashing software that won the Password Hashing Competition (PHC)"
-HOMEPAGE="https://github.com/P-H-C/phc-winner-argon2"
-SRC_URI="https://github.com/P-H-C/phc-winner-argon2/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="|| ( Apache-2.0 CC0-1.0 )"
-SLOT="0/1"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86"
-IUSE="static-libs"
-
-S="${WORKDIR}/phc-winner-${P}"
-
-DOCS=( argon2-specs.pdf CHANGELOG.md README.md )
-
-src_prepare() {
-	default
-	if ! use static-libs; then
-		sed -i -e 's/LIBRARIES = \$(LIB_SH) \$(LIB_ST)/LIBRARIES = \$(LIB_SH)/' Makefile || die "sed failed!"
-	fi
-	sed -i -e 's/-O3 //' -e 's/-g //' -e "s/-march=\$(OPTTARGET) /${CFLAGS} /" -e 's/CFLAGS += -march=\$(OPTTARGET)//' Makefile || die "sed failed"
-
-	sed -i -e "s/lib\/@HOST_MULTIARCH@/$(get_libdir)/" -e "s/@UPSTREAM_VER@/${PV}/" lib${PN}.pc || die
-
-	tc-export CC
-}
-
-src_install() {
-	emake DESTDIR="${ED}" LIBRARY_REL="$(get_libdir)" install
-	einstalldocs
-	doman man/${PN}.1
-
-	insinto /usr/$(get_libdir)/pkgconfig
-	doins lib${PN}.pc
-}
diff --git a/app-crypt/argon2/argon2-20190702.ebuild b/app-crypt/argon2/argon2-20190702.ebuild
index b3827b006351..f3cc9e2302f4 100644
--- a/app-crypt/argon2/argon2-20190702.ebuild
+++ b/app-crypt/argon2/argon2-20190702.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/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}"
@@ -31,15 +31,21 @@ src_prepare() {
 
 	tc-export CC
 
+	OPTTEST=1
 	if use amd64 || use x86; then
-		OPTTEST=0
-	else
-		OPTTEST=1
+		$(tc-getCPP) ${CFLAGS} ${CPPFLAGS} -P - <<-EOF &>/dev/null && OPTTEST=0
+			#if defined(__SSE2__)
+			true
+			#else
+			#error false
+			#endif
+		EOF
 	fi
 }
 
 src_compile() {
-	emake OPTTEST="${OPTTEST}" LIBRARY_REL="$(get_libdir)"
+	emake OPTTEST="${OPTTEST}" LIBRARY_REL="$(get_libdir)" \
+		ARGON2_VERSION="0~${PV}"
 }
 
 src_test() {
diff --git a/app-crypt/asedriveiiie-serial/Manifest b/app-crypt/asedriveiiie-serial/Manifest
index 9d28a49c5ba4..c0ef93d31b23 100644
--- a/app-crypt/asedriveiiie-serial/Manifest
+++ b/app-crypt/asedriveiiie-serial/Manifest
@@ -1,3 +1,3 @@
 DIST asedriveiiie-serial-3.5.tar.bz2 32461 BLAKE2B e63162ab6f0a03e8b48e6a2d7e653f52d1cdb5b6564ea2fe8b10cee51b9769133a6f16c4176ac208c35c78600b6a636c0e0d97d7458c912caf1052ba78829b0d SHA512 b74ea2225990c36e86d106fa7e9e844e1f99d87f9869416faf3dfaa1ecaca34b4bdd4e5887746c6b039de325e03ede3ee78aadeaf20d0fabc8deba48a72a93b3
 EBUILD asedriveiiie-serial-3.5.ebuild 1034 BLAKE2B 53a19a147bacba99f3f7e774f68b234b5163b58383ba18f6662a756be82e5d9dacc8a8c8ef48c092ba3a9e9e338b867cf993eb24c29ad29ce136dc1703088581 SHA512 477b8d5996a8ed01d71e06dca4fa1d1927ffc40fb80cb89f77c5b4ea191fb0fe099fe2f71adb453c92d0fa0382c751680c8f9f751dcd1bcd2632f6afe05abd07
-MISC metadata.xml 236 BLAKE2B a7bb92e6d53f7252ee56a885bf098930e228a76a75bca119358ca860901ceeecccc43efe5279c54250ebda58f77ae9c97d2ae540d8b399283cb3aa348111fcd2 SHA512 5f6cd6a85527534d5de7118de5af212ee3044c8c5530a7f7087a28074a2d4ab7be1728325bd985adc063dc795d3cf2b1c4e58a4c4c4ec02d739bd4bbc544ef08
+MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-crypt/asedriveiiie-serial/metadata.xml b/app-crypt/asedriveiiie-serial/metadata.xml
index f1c3d59fb213..6f49eba8f496 100644
--- a/app-crypt/asedriveiiie-serial/metadata.xml
+++ b/app-crypt/asedriveiiie-serial/metadata.xml
@@ -1,8 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-	<email>crypto@gentoo.org</email>
-	<name>Crypto</name>
-</maintainer>
+<!-- maintainer-needed -->
 </pkgmetadata>
diff --git a/app-crypt/asedriveiiie-usb/Manifest b/app-crypt/asedriveiiie-usb/Manifest
index a856c0bbf1d4..d0a48e22bc7f 100644
--- a/app-crypt/asedriveiiie-usb/Manifest
+++ b/app-crypt/asedriveiiie-usb/Manifest
@@ -1,3 +1,3 @@
 DIST asedriveiiie-usb-3.5.tar.bz2 32595 BLAKE2B 6532957e1d778a697185c08f8b1852bed53fc6c6141e4bc84f000cedbf6779c691dc92b643c619c0b6f67c39cac72f4e5dc57edf9285d3cfc4ce1b3240c4809e SHA512 aa718a1f4b28c9186e120bb8e2216389a8a9f54ac3f299a9cd72c398594fcf23229ac4a14e5358cc02e6fcd2ce3abe0e1e4125e4dac8d302bdc325a3f410744f
 EBUILD asedriveiiie-usb-3.5.ebuild 482 BLAKE2B cf346b4a5093becdc2867bf1cdd4cbb36494226b25dfc308d6eb68ea008d632f7e9c35503e50ea8df9b5b1685cba2541b2e8e8f8a7efa1f6146dd4e3e0c5a093 SHA512 e158814bb3b55883b2da86ab580685a0bdcd29596fad03097432dfbeee63f2a57da6aa45d43177b692f54ada823bc0e7604b4f1cbebf43e673519de0dde20283
-MISC metadata.xml 236 BLAKE2B a7bb92e6d53f7252ee56a885bf098930e228a76a75bca119358ca860901ceeecccc43efe5279c54250ebda58f77ae9c97d2ae540d8b399283cb3aa348111fcd2 SHA512 5f6cd6a85527534d5de7118de5af212ee3044c8c5530a7f7087a28074a2d4ab7be1728325bd985adc063dc795d3cf2b1c4e58a4c4c4ec02d739bd4bbc544ef08
+MISC metadata.xml 167 BLAKE2B e4dadf27fd344484f2bccb5b904909c89aac568c32e5b3c44bdf139eacefd4b4fae74419f503d2b7da0dccc1b68ba05d777d11292c0f89270d1ac5c9c703e8ca SHA512 7c8decb24ee3a850e38186cf3c7f8933a28017426806870ad6ef9ceb2533be147a2681fc789b535a81cb528af8c29d90d3006e4f250aee23bd7dea4561294e33
diff --git a/app-crypt/asedriveiiie-usb/metadata.xml b/app-crypt/asedriveiiie-usb/metadata.xml
index f1c3d59fb213..7a38bb900964 100644
--- a/app-crypt/asedriveiiie-usb/metadata.xml
+++ b/app-crypt/asedriveiiie-usb/metadata.xml
@@ -1,8 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-	<email>crypto@gentoo.org</email>
-	<name>Crypto</name>
-</maintainer>
+	<!-- maintainer-needed -->
 </pkgmetadata>
diff --git a/app-crypt/asekey/Manifest b/app-crypt/asekey/Manifest
index c18c8f7fdc3c..ba12c0eb29bc 100644
--- a/app-crypt/asekey/Manifest
+++ b/app-crypt/asekey/Manifest
@@ -1,4 +1,4 @@
 AUX asekey-3.7-bundle.patch 727 BLAKE2B 0758992095369eadb49e4daec62a0786e790acf7e39f980f74627440b53a4eae8ac57be07cb0cabbb898e207adda3e543631e9b398770e72cc4e38fd1e153a16 SHA512 4cc556687f59371d0f1919f8649b705801da4427cdc011a40b9627601e90cd27f3a06684a721cb25f1c51b10ec28f6ae728e33fbc30217716250d42c6c15efe2
 DIST asekey-3.7.tar.bz2 33304 BLAKE2B 95bba8ded9557105dba50a587665ee638162ae6eefe1017a4ed272364eec1da7154b21833ed2f08fa7f4c3d570971795a0a6f65efebe517124da572d0b9b7d91 SHA512 29a01f8250d5fb26a4ba2aca562211cadf403c9e986f9fa6930faf477c374e13095c025b2917e6e837cbe8d83f3a3e023a527598b151ef1c704247c7e7c40647
 EBUILD asekey-3.7.ebuild 684 BLAKE2B 94d5413cdb5b32f5bb41e6ac4bb7660cbccf50fff573428268639add9ea7b82943ab0d09aba999a01bcc9f1d0c2c29b077e6bd8917d2d9a76f799f13348c71d7 SHA512 47068530f671a9f56f09efd2ebfc1ed36c99f29357e622e52c0f23c909dbc118bd4416b5c63da18f24f4a7edcdb3e1adeb86578bb8159393431f00bc8faf0e63
-MISC metadata.xml 240 BLAKE2B 019d24354f525c2754c3fa8a9dfc0a35fbdf5ea285db4cbc20535f6123679544c06acae8c5ced17ae7c299318b6a0b9115b645188fccd5945ff47b6bf9cd1f1d SHA512 e94cdc08f1a8aafc0ec72615a476ed63dbacd22b48413a938f5bfbe9c2bda2cab2347465df3035b53031e0a4f935b47d22fad8c89a67e5780a5370ec9564d99d
+MISC metadata.xml 167 BLAKE2B e4dadf27fd344484f2bccb5b904909c89aac568c32e5b3c44bdf139eacefd4b4fae74419f503d2b7da0dccc1b68ba05d777d11292c0f89270d1ac5c9c703e8ca SHA512 7c8decb24ee3a850e38186cf3c7f8933a28017426806870ad6ef9ceb2533be147a2681fc789b535a81cb528af8c29d90d3006e4f250aee23bd7dea4561294e33
diff --git a/app-crypt/asekey/metadata.xml b/app-crypt/asekey/metadata.xml
index 040cba5f7c5b..7a38bb900964 100644
--- a/app-crypt/asekey/metadata.xml
+++ b/app-crypt/asekey/metadata.xml
@@ -1,8 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="project">
-		<email>crypto@gentoo.org</email>
-		<name>Crypto</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 </pkgmetadata>
diff --git a/app-crypt/bcwipe/Manifest b/app-crypt/bcwipe/Manifest
index 8aa7e51da045..56e46a1b11ff 100644
--- a/app-crypt/bcwipe/Manifest
+++ b/app-crypt/bcwipe/Manifest
@@ -2,4 +2,4 @@ AUX bcwipe-1.9.7-fix_warnings.patch 415 BLAKE2B ae41040cbc9343e06eaee372b8bdb656
 AUX bcwipe-1.9.8-fix-flags.patch 603 BLAKE2B 094af104ff114c4fce3907215ab06db51af2fad2f000f9bfc391dd056432a2c6c5a988561d7c462f6fc99411fc26c9445f81a250db29899f76ee1c0672b9e602 SHA512 9141f81dd722bfe59466bab3d547869aca9178d27912edc61f9ab95044d0e57151870400a1550fe59e0f3c252878b6971486d0b38e2fb24da3241b0dca00ca87
 DIST BCWipe-1.9-13.tar.gz 147634 BLAKE2B b6fd6e166c5a97d5b453f4f263384b5b76b273b8e98651d993b83d97c1a97d8adf1fda9acc9d2dcae5ef46bf7c15d517b81384959f62ee938d94546411f05d0b SHA512 3044423b291a6802bb1cab75b9d2b2b74ebe01a1318fad0360c9d6fe8f5afc6e446112fd323f02d56275f6595eb6afb7ad09c02fdc25e74d217a5a687a663275
 EBUILD bcwipe-1.9.13.ebuild 800 BLAKE2B f4f43e93f1bfb9f7f5c7a6773f7871901ac4428f5c8ecf2e7bf331260bfdd2c168cec8e1cc0d7cf500d45049395042d5d7f53b14bf4612236ad61f517f0095e4 SHA512 82f3d22c5492cf10aa8f5d20226cf5c05bfb4e606898232890c2fbfe48aef9025af1035139d1298f6ff825e3620c7e854a94d5fe562b6e1365c8459af5ef1c7f
-MISC metadata.xml 240 BLAKE2B 019d24354f525c2754c3fa8a9dfc0a35fbdf5ea285db4cbc20535f6123679544c06acae8c5ced17ae7c299318b6a0b9115b645188fccd5945ff47b6bf9cd1f1d SHA512 e94cdc08f1a8aafc0ec72615a476ed63dbacd22b48413a938f5bfbe9c2bda2cab2347465df3035b53031e0a4f935b47d22fad8c89a67e5780a5370ec9564d99d
+MISC metadata.xml 167 BLAKE2B e4dadf27fd344484f2bccb5b904909c89aac568c32e5b3c44bdf139eacefd4b4fae74419f503d2b7da0dccc1b68ba05d777d11292c0f89270d1ac5c9c703e8ca SHA512 7c8decb24ee3a850e38186cf3c7f8933a28017426806870ad6ef9ceb2533be147a2681fc789b535a81cb528af8c29d90d3006e4f250aee23bd7dea4561294e33
diff --git a/app-crypt/bcwipe/metadata.xml b/app-crypt/bcwipe/metadata.xml
index 040cba5f7c5b..7a38bb900964 100644
--- a/app-crypt/bcwipe/metadata.xml
+++ b/app-crypt/bcwipe/metadata.xml
@@ -1,8 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="project">
-		<email>crypto@gentoo.org</email>
-		<name>Crypto</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 </pkgmetadata>
diff --git a/app-crypt/bsign/Manifest b/app-crypt/bsign/Manifest
index 6b637f840797..938cd8e7e452 100644
--- a/app-crypt/bsign/Manifest
+++ b/app-crypt/bsign/Manifest
@@ -3,4 +3,4 @@ AUX bsign-0.4.5-non-gnu.patch 1409 BLAKE2B 3975f1d0e6d70c30f1fa01444ff6dd547f5d0
 AUX bsign-0.4.5-scripts.patch 2172 BLAKE2B e39883e0f89bcf28ce9f0b7b5c65d2756bf9f6c1a98b7ce50097724e93d92661b65a5fd7b6bd889d0f3bffa44152a22869b4fecd5477b5a6e18c20c98c955b55 SHA512 fbf7e3fadbbcc82b6647f77232715d7baaef5d0ead5065e27e10f038e9cf5734808d29e8814762014d3d26ec4473a86ab9da139dc7f2d1b16770db3e7ddfb494
 DIST bsign_0.4.5.tar.gz 77471 BLAKE2B 6d9a386d608a75443e7ccd5c8d284f773ac7568754b4bdc96c6a6de0f77aad53a9bdaa6a3cec4701668d1de902a226f1e193599545c96abc21abb2b598e4d74b SHA512 a4dba37d648f683bb5b14bc9aafeb72fb0bd06e21cedb1a4bbd73dfc0a5f7bb22b5b33ef8727b5070d727afb2d97489ed4b9be28bf1025c9e618ccf47f1ef634
 EBUILD bsign-0.4.5-r1.ebuild 877 BLAKE2B 7ac51538b1e1512b8cd928f9c5491c8618758b11c8e08bd8dd6b810641a357669fdd598aa8ce449ccfba518de377a8da3adcc269c303b615cf30b2a13ef25c9c SHA512 6a1905fb2ab8ea1ee75afe27c06c2153f3e4ddde5706e265798fdfc704061119dd303dbf5bbabe6785fe245402967faf0174e87a3d2a53997501009d7540c771
-MISC metadata.xml 645 BLAKE2B 96fd50b4433323b224ceea3389b8dcb5e9b4cf88efe559198dc49477b18ec7b639dac61ee951ff9ba0b0c334adb078563d3507270cddfff6225ad5cd246e28d5 SHA512 2201dd583881aa72a4cff33b4a6d226dab5e1fbf49d9ea52dd85ad9437fd2bc54858824aa361ea9b473df43d211bddc96830c83fb8275c4db7a91cb3735d4919
+MISC metadata.xml 572 BLAKE2B 6c87dd54b8ed908942fb8cbf9f1c90df75d9a000d981e82fb2b5e01bbeb1eef3245120f35a3e19e7a3bc0cd130b412cb6c27fb3a92431f054a44ae6204c458b6 SHA512 a8193892f427ebc4cb12843abeacf58a62df812c783be4c1b312e58fdb758ac6a58ef6ce17e383acbe3cbbce4dad87afb463b4b1c290302ea2291931801747c5
diff --git a/app-crypt/bsign/metadata.xml b/app-crypt/bsign/metadata.xml
index a79daae298c8..66261211d66f 100644
--- a/app-crypt/bsign/metadata.xml
+++ b/app-crypt/bsign/metadata.xml
@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="project">
-		<email>crypto@gentoo.org</email>
-		<name>Crypto</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<longdescription>
 		This package embeds secure hashes (SHA1) and digital signatures (GNU 
 		Privacy Guard) into files for verification and authentication. 
diff --git a/app-crypt/cardpeek/Manifest b/app-crypt/cardpeek/Manifest
index 542ceb8a31eb..69e37d79c9e6 100644
--- a/app-crypt/cardpeek/Manifest
+++ b/app-crypt/cardpeek/Manifest
@@ -2,4 +2,4 @@ DIST cardpeek-0.7.2.tar.gz 1130295 BLAKE2B c2aec139c8834947dd2e04fe384719bccdbce
 DIST cardpeek-0.8.4.tar.gz 1520613 BLAKE2B f31a0298ab8423b384b0ad62abb0599da75fd968385e9e6c9a5982e6fbaf7bec8a6098e3e7a5c30ce6634c65e05db084772f4a33c7ef5d6fdcdee0022cc56b86 SHA512 f6eebc7a17f270dd56529ee36815fee72b2f9d62b24d6cc90060f20c7604b9b99ab76858d9c04c60aaec838b02b8db76476a91ee22a4e10f01f852cd1f536efb
 EBUILD cardpeek-0.7.2.ebuild 518 BLAKE2B 39ba3d1835492494fb2644ad91f950ab330f179682e50d1cc3f949460cabef53cddfb2761794fb1b8a476a60ad76dbb3229cb93ca86a5485b5f4bfc92f23131a SHA512 0d688d4251c0f7b12b070431a952d9186e6481b8cc2bd8a5d7a7a1bdc83207b6e86337b322496e20e37e97d59363cdb081f27c731e129d7b67c82e32e7fb70b2
 EBUILD cardpeek-0.8.4.ebuild 526 BLAKE2B fb59f54fadab35ee57c5f38870506d289ea04995b4dc8df9a641c178f45ca6aa9c4339c3634382473856248636c736e16796c0471e0280c3078676cdc8cc6e20 SHA512 6e7758473939e558ea1983434244fbdb0817eae243b714305eeef6e77b4a8c6ecf8d369b7e38865dbe97dfb82809e4ef16ea2942097d200e381f6bb82247b0b4
-MISC metadata.xml 246 BLAKE2B 569d634cc821d4a537880a58ca96bf709155b0af827d8153b9521d5ca29f174ec29629d11b9eb91ee1cbba5f1a823d5c621521105a00e9fbd6d9a27bc3740bde SHA512 8ac20e3524a896e77d186b34b589ffe4287593c43fca1d50bcc06cd27e8cb8f5c0da2087622413a748a1738177d5939a50bda7a1e5d0ba36fbf4fb6d7b9bb015
+MISC metadata.xml 167 BLAKE2B e4dadf27fd344484f2bccb5b904909c89aac568c32e5b3c44bdf139eacefd4b4fae74419f503d2b7da0dccc1b68ba05d777d11292c0f89270d1ac5c9c703e8ca SHA512 7c8decb24ee3a850e38186cf3c7f8933a28017426806870ad6ef9ceb2533be147a2681fc789b535a81cb528af8c29d90d3006e4f250aee23bd7dea4561294e33
diff --git a/app-crypt/cardpeek/metadata.xml b/app-crypt/cardpeek/metadata.xml
index 4f6e28828f65..7a38bb900964 100644
--- a/app-crypt/cardpeek/metadata.xml
+++ b/app-crypt/cardpeek/metadata.xml
@@ -1,8 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="project">
-    <email>crypto@gentoo.org</email>
-    <name>Crypto</name>
-  </maintainer>
+	<!-- maintainer-needed -->
 </pkgmetadata>
diff --git a/app-crypt/ccid/Manifest b/app-crypt/ccid/Manifest
index f93de60cb757..833904ccdc12 100644
--- a/app-crypt/ccid/Manifest
+++ b/app-crypt/ccid/Manifest
@@ -1,6 +1,6 @@
 AUX 92_pcscd_ccid-2.rules 2275 BLAKE2B a72b8d2bb8cf56f621a0762dac95500f93afa224228f403395c9590758c8fa986b3e8d0d1b12353ec7fed5a40f6af900fcd57eaaa7b339018fe42c2b509c0c5d SHA512 f327eee35ca6009069389f935ca89feea4e693e8f0c73f8f218d2639faee4ce35df85832a71e3fe98ce24aae31861aa8bd290833e59ada75c1e1a2df9ff0a477
 DIST ccid-1.4.30.tar.bz2 642342 BLAKE2B fd43aa2a4c8840abb0545760f6ceb31bb9d7dc22d7283888c9a142e0c3b34310ec4530d18986451b21c6b1a3975b1212ab653a4c8d58466b28713f0f72ce1cdb SHA512 1761a4053a99eb28184d0ffece951aec5d4b646080597b4ae36b18a31fb7a76c55fabfa57ee8e5d7f2db1a6e13d209f7fa995fe6ed067f44558bea34a26d46da
 DIST ccid-1.4.31.tar.bz2 644039 BLAKE2B bd8e9c69e122348ffbeddc4f85f939d7d4c93dbfe5f712bc16f671af144570ce2c3bc6da04503851f4ce0f95f0c89bbbe6bbf0852be97cf5574993875d865870 SHA512 51d102c6be5b234ed568522d51b97bdb27c4c22d9610874abd7a18314f4e8ebe81fcb18a16a1edbdc814ee652a037d50202673a50de2fdeb0eac74063b149ed3
-EBUILD ccid-1.4.30.ebuild 1498 BLAKE2B 1e75dbc1b0915b33eb6ac0d5e59f6ccfbf9764c40650019f733dbd22349e49c162ce122aa82899e6c5ece831a2244fb5cad69f5878d3a033a85a870a711c0a70 SHA512 cf9e017e901bb007a883f31fc509c32d8bd1a0d55d60d191840a1023c30bf92918f73982cc725538b67f973e0c296127c5ad783b28ad2435b4d02fdf29889bca
-EBUILD ccid-1.4.31.ebuild 1506 BLAKE2B c9f59215cc58436a6eca45c9b0717f2154304c682c467681e4d5d91492fcec30dbfe3f877a073fc933a0357a02984f17db4589f32cee9b5dce809460b31ea53f SHA512 b461008f4539566e941bd81abd1f7303b35f33cbb62987ea037f558480ca1d8ebf308c8f9182b2eca2c428d6e5dd4ec39f0f676d02c0826c939571bbc3791986
-MISC metadata.xml 397 BLAKE2B 0b62fc531114bb9221d17ee3524db0858f4ff373b71a1b7beda520035eaf5679a63a420381dc52e40942a519bf15f95fae97b531267df133cf68687c49dad565 SHA512 8e8643f46728232ffffe25fe9906948c6a8bb94733dbdeaf2700afd0cf4a7567a27698c1832edf858c2a433187cac9d847dc7ad709d6398133b40b639e37cb4b
+EBUILD ccid-1.4.30.ebuild 1537 BLAKE2B 40302bc90b107dc00e626678b0b575d5a8f3b6a6844d4058826a0d7875429ac32eda12785f77275fece433eabb265d001490a0745841bdf0568666e24359f073 SHA512 559a21ea87990de3d17158ccc24fd666929826c8de604f19dca8e41921d2f3d5ebcefb90e02c4c1acda08dd4cdbca3e3aabdd43ee447a87f6dc15ec470c84f31
+EBUILD ccid-1.4.31.ebuild 1545 BLAKE2B 5627cd4bdb7e5d743fe0f4a176ee60dfbeb6f59d702aff09ea3537859f134696d84750ef926d2451fcc6e8e3980fa18c0a21b0fae58cc45ca511006bf0da7f1a SHA512 08c9b5ca0996e28865c109da5d289b45f2dd55e5773a6b96dd59d68e66152466ac87b35a3f5cd032b68c7ff75d8d22ac27910644c3923c27911d31820ffbbaa9
+MISC metadata.xml 404 BLAKE2B e9f39e817f575a3412bcf79c42aa58c22547d4abe41272151ea3147cf08d2ba413b2840281115ff1f84bbb90ab8f5e5731d7b2daa2c0887dc3b07466680e0dcc SHA512 5710a9f296257aa374fdabf1745b11e351eb1f92cf635918d73a5293afcba490d3eea9785587e4212922d94aa2e079496ced99853f0ff2ad891e41c6e1c816f8
diff --git a/app-crypt/ccid/ccid-1.4.30.ebuild b/app-crypt/ccid/ccid-1.4.30.ebuild
index 16f55069016c..2440d2933a00 100644
--- a/app-crypt/ccid/ccid-1.4.30.ebuild
+++ b/app-crypt/ccid/ccid-1.4.30.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
@@ -6,7 +6,7 @@ EAPI=7
 inherit toolchain-funcs udev
 
 DESCRIPTION="CCID free software driver"
-HOMEPAGE="https://ccid.apdu.fr/"
+HOMEPAGE="https://ccid.apdu.fr https://github.com/LudovicRousseau/CCID"
 SRC_URI="https://ccid.apdu.fr/files/${P}.tar.bz2"
 
 LICENSE="GPL-2"
diff --git a/app-crypt/ccid/ccid-1.4.31.ebuild b/app-crypt/ccid/ccid-1.4.31.ebuild
index 12813fa63a2e..a47b8bea185c 100644
--- a/app-crypt/ccid/ccid-1.4.31.ebuild
+++ b/app-crypt/ccid/ccid-1.4.31.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
@@ -6,7 +6,7 @@ EAPI=7
 inherit toolchain-funcs udev
 
 DESCRIPTION="CCID free software driver"
-HOMEPAGE="https://ccid.apdu.fr/"
+HOMEPAGE="https://ccid.apdu.fr https://github.com/LudovicRousseau/CCID"
 SRC_URI="https://ccid.apdu.fr/files/${P}.tar.bz2"
 
 LICENSE="GPL-2"
diff --git a/app-crypt/ccid/metadata.xml b/app-crypt/ccid/metadata.xml
index 6a1239505f77..8f61a344a5c9 100644
--- a/app-crypt/ccid/metadata.xml
+++ b/app-crypt/ccid/metadata.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="project">
-		<email>crypto@gentoo.org</email>
-		<name>Crypto</name>
+	<maintainer type="person">
+		<email>zlogene@gentoo.org</email>
+		<name>Mikle Kolyada</name>
 	</maintainer>
 	<use>
 		<flag name="kobil-midentity">Build and install Kobil_mIDentity_switch tool</flag>
diff --git a/app-crypt/ccrypt/Manifest b/app-crypt/ccrypt/Manifest
index 83d902b675fb..8619f0b9a20e 100644
--- a/app-crypt/ccrypt/Manifest
+++ b/app-crypt/ccrypt/Manifest
@@ -1,4 +1,4 @@
 DIST ccrypt-1.11.tar.gz 834575 BLAKE2B 6b3441f6b1c58ed63db43ddc999ee64e67afc3ce02222de2a41562bc066aad0f076e75ab496d94e7f3f1a9554b1382c083f3af04074904c1110f610cb5ac19b3 SHA512 75c2b93e855d36e717d3b7cabee7ce43ce372a21c8291beb43f24fd69e11114bb0e19e6dd03ec5d901e7e60eac9351afab65c346b7304b16054b91d392050313
-EBUILD ccrypt-1.11-r1.ebuild 461 BLAKE2B 70784d346fb069be2d331075718412e07a1dd5aec128ab6c842de92b5a1d512bac6dbc5bbe9263fd146678a7855f2e58fef5793b1565d0fe0cb1cae74a4ec5d9 SHA512 3662236b6012dd66816e0f587d72ddb9fc5f836f7407622d3684be5f2749f59602a3ab7fecd410e10c03d969c6a1af65167d52fa711b160edffce768b0de239e
+EBUILD ccrypt-1.11-r1.ebuild 474 BLAKE2B 351f77d6f8010a0f901ea6751a7dd27aa95b6ee10467f9fd33d2dcb15ff7a6c67b83e2dc9570aa1c13356f2179a4b7d5e8d95ee1a67bf6e90155e9532f8b6803 SHA512 ee1661252dbe07df8eada9cbee0e7e76b9055c27177e1454becdad227ad6b1c6204a1e560d002b1a9b43f7bb4a132f5a7f3380f9e31a095743813fa2fc33b14d
 EBUILD ccrypt-1.11.ebuild 358 BLAKE2B fc4735bb7aa9d73e3be45d96e95f1bf7008399d7ca2131210f35866c666860f0ca688b6119fb2ad3daa31eb2280fcc3698d519e95224889efeece5e280121b7c SHA512 ae6c14e585992e53f2087783d8479ea7ecb2d905276c157814cdb5378e8d0c7b911c1da0dc238ae40dd600478602b10627d48272b67fcfef2325db0a293117a2
-MISC metadata.xml 316 BLAKE2B b3ea9516824d2d6abce5b52bff59ef3935be62158f4b5f35c4946ac46ad6cbce01637f82979c0c7bc0d881b385dbef860b4ee1aaa28cba9121d388640ced2f11 SHA512 fd88aee15282c7205e31caa296006cb6e6d887843b5757676c00d7a0ed054046d9285c9d01ddf120131463eb03cef1ad7e9835a01f4fd71d9483bae2ecde296b
+MISC metadata.xml 243 BLAKE2B e3a1fc2bc4765aa2137c932351c877495ebd1c2f61e3228f866e2573362ff990930d8e54b2365dd1fa943d3fd185c10e9616be14de8bcda8f72384834620ed40 SHA512 0f0e44291b0da4bded3871068dcde7ce0e49ecfddb26f8215fe2df0977434b3b78d9b7c8920b48c86e5518f8912c9e340890a5e92ac8dd659157ac7109afaf11
diff --git a/app-crypt/ccrypt/ccrypt-1.11-r1.ebuild b/app-crypt/ccrypt/ccrypt-1.11-r1.ebuild
index c3c7458e6a6a..79fb9bc88d71 100644
--- a/app-crypt/ccrypt/ccrypt-1.11-r1.ebuild
+++ b/app-crypt/ccrypt/ccrypt-1.11-r1.ebuild
@@ -11,7 +11,7 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
 
-BEPEND="emacs? ( virtual/emacs )"
+BEPEND="emacs? ( >=app-editors/emacs-23.1:* )"
 
 src_configure() {
 	econf \
diff --git a/app-crypt/ccrypt/metadata.xml b/app-crypt/ccrypt/metadata.xml
index 05b829a9bab6..0edb7210b8c1 100644
--- a/app-crypt/ccrypt/metadata.xml
+++ b/app-crypt/ccrypt/metadata.xml
@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="project">
-		<email>crypto@gentoo.org</email>
-		<name>Crypto</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<upstream>
 		<remote-id type="sourceforge">ccrypt</remote-id>
 	</upstream>
diff --git a/app-crypt/certbot-apache/Manifest b/app-crypt/certbot-apache/Manifest
index 6a447e20271a..fdc7eb71346a 100644
--- a/app-crypt/certbot-apache/Manifest
+++ b/app-crypt/certbot-apache/Manifest
@@ -1,8 +1,6 @@
-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
-EBUILD certbot-apache-0.39.0.ebuild 1105 BLAKE2B 4b4ea8187891be94a40a1cd6da4a23a5c1729eef07570db9f134103f40fca4059eb6441b0002cc576b078189a04183a96bad0223135279ce1a1cb10b470387f3 SHA512 c0059f92f82015b641ed9ca61f9242ca625b71e4d519127bcc4067d063b625c64526e41bedaa36fd2afdc4ab8d346a4c3f0f54b6c0519c4d96f1de4d682e2490
-EBUILD certbot-apache-0.40.1.ebuild 1105 BLAKE2B 4b4ea8187891be94a40a1cd6da4a23a5c1729eef07570db9f134103f40fca4059eb6441b0002cc576b078189a04183a96bad0223135279ce1a1cb10b470387f3 SHA512 c0059f92f82015b641ed9ca61f9242ca625b71e4d519127bcc4067d063b625c64526e41bedaa36fd2afdc4ab8d346a4c3f0f54b6c0519c4d96f1de4d682e2490
-EBUILD certbot-apache-1.0.0.ebuild 1107 BLAKE2B a39d85dca0cbb41c08809eb5e46eb40fb467f03826fb1aaa95bf215df68b47253205726827847af7c5e2b301aee114fc0531327921b57d7e240962e74579634a SHA512 75feff35df4c64a6cede42fb6f398f81bf441e9549674ea2cfb278b0d9d3006e4c4f7a350a322961eb1d17a19d4c9bc31064b39a7e51a070496e0a5b8a80886f
-EBUILD certbot-apache-9999.ebuild 1107 BLAKE2B a39d85dca0cbb41c08809eb5e46eb40fb467f03826fb1aaa95bf215df68b47253205726827847af7c5e2b301aee114fc0531327921b57d7e240962e74579634a SHA512 75feff35df4c64a6cede42fb6f398f81bf441e9549674ea2cfb278b0d9d3006e4c4f7a350a322961eb1d17a19d4c9bc31064b39a7e51a070496e0a5b8a80886f
+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-9999.ebuild 1103 BLAKE2B 84acaedaf61419da63f51b28aa28d987a93da73f69bfb1be06aff403abbc7f1f08cd31a71d08ca2b563f3872b13b1220024ef93085fdb3c9ea00f21b07a21ebe SHA512 e07bafd8f6f4a3308c1fecd01f1a62dfc761c27b26f34b022fe4a447e476b3cf16dfbe7afbb6de9c701d44a1df4d3f95cb5b4bb122c41ef8c9662b52690b31d1
 MISC metadata.xml 334 BLAKE2B 4adbd04c0edcc84925da47b32fee63d4652bf2a1bf5222a56e0e1c7cfe8aaa34275a2652c4416f8a80de11fd88217d8626d610fa857f0615f18bfd773a279e55 SHA512 e3d6dda6c44557523fd48b464b6d39fc45b90ba2ecbe03fb300a655973c1b2e654a24d8d381b769eba00d0d80fb5881e1dfec1694e223cd83047abba9f01a44f
diff --git a/app-crypt/certbot-apache/certbot-apache-0.39.0.ebuild b/app-crypt/certbot-apache/certbot-apache-0.39.0.ebuild
deleted file mode 100644
index c45e7e40dd95..000000000000
--- a/app-crypt/certbot-apache/certbot-apache-0.39.0.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=(python{2_7,3_5,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/${PN%-apache}/${PN%-apache}/archive/v${PV}.tar.gz -> ${PN%-apache}-${PV}.tar.gz"
-	KEYWORDS="amd64 ~arm64 x86"
-	S=${WORKDIR}/${PN%-apache}-${PV}/${PN}
-fi
-
-inherit distutils-r1
-
-DESCRIPTION="Apache plugin for certbot (Let's Encrypt Client)"
-HOMEPAGE="https://github.com/certbot/certbot https://letsencrypt.org/"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND=">=app-crypt/acme-0.29.0[${PYTHON_USEDEP}]
-	>=app-crypt/certbot-0.39.0[${PYTHON_USEDEP}]
-	dev-python/mock[${PYTHON_USEDEP}]
-	dev-python/python-augeas[${PYTHON_USEDEP}]
-	dev-python/zope-component[${PYTHON_USEDEP}]
-	dev-python/zope-interface[${PYTHON_USEDEP}]"
-DEPEND="test? ( ${RDEPEND}
-	dev-python/nose[${PYTHON_USEDEP}] )
-	dev-python/setuptools[${PYTHON_USEDEP}]"
-
-python_test() {
-	nosetests || die
-}
diff --git a/app-crypt/certbot-apache/certbot-apache-0.40.1.ebuild b/app-crypt/certbot-apache/certbot-apache-0.40.1.ebuild
index c45e7e40dd95..c926083fd0ac 100644
--- a/app-crypt/certbot-apache/certbot-apache-0.40.1.ebuild
+++ b/app-crypt/certbot-apache/certbot-apache-0.40.1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=(python{2_7,3_5,3_6,3_7})
+PYTHON_COMPAT=(python{2_7,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.0.0.ebuild b/app-crypt/certbot-apache/certbot-apache-1.0.0.ebuild
index b14f7a5ac825..c926083fd0ac 100644
--- a/app-crypt/certbot-apache/certbot-apache-1.0.0.ebuild
+++ b/app-crypt/certbot-apache/certbot-apache-1.0.0.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=(python{2_7,3_5,3_6,3_7})
+PYTHON_COMPAT=(python{2_7,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
 
diff --git a/app-crypt/certbot-apache/certbot-apache-9999.ebuild b/app-crypt/certbot-apache/certbot-apache-9999.ebuild
index b14f7a5ac825..718afbc37025 100644
--- a/app-crypt/certbot-apache/certbot-apache-9999.ebuild
+++ b/app-crypt/certbot-apache/certbot-apache-9999.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=(python{2_7,3_5,3_6,3_7})
+PYTHON_COMPAT=(python{2_7,3_6,3_7})
 
 if [[ ${PV} == 9999* ]]; then
 	EGIT_REPO_URI="https://github.com/certbot/certbot.git"
diff --git a/app-crypt/certbot-dns-nsone/Manifest b/app-crypt/certbot-dns-nsone/Manifest
index b6ea1b7793b1..bd259fd57d94 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 953 BLAKE2B 8b18e76a64e80647e5ec82307a6681cad3b476659b6dda4a82999472391cb2872437324dd5e72a45d01d686bbbd67165ee0b487af1e3f6c1b2dda35d7fd2d7a2 SHA512 190db40706f1363db8a91da68a69895c3f51f8b74c895e69071ba6d1b9e9cb03d72e27a60b6c51eb4799eabbc7d3047ae442cf0f05bd297219794946f7e74298
+EBUILD certbot-dns-nsone-0.39.0.ebuild 945 BLAKE2B 2dc4d5aa0936653a549f3f40d9283111f392fe4ed810cc6117c32dca41d220b04638a3fdc606eddffca84bf15130514d22689a636e4a26615c7d7a97544b509f SHA512 60520729dcc2a7e2133b5ac91ea87c61625f1f3d8065948e5e3e05d60f8c2f79144a190ef57d44b95727712db88fa6b0f7b2529258e3c6d43e76aa4e8a6c2aee
 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 20526acadae5..8278a0a87d4c 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
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=(python{2_7,3_4,3_5,3_6})
+PYTHON_COMPAT=(python{2_7,3_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 9c2a2f46e83e..23e9c28d7383 100644
--- a/app-crypt/certbot-nginx/Manifest
+++ b/app-crypt/certbot-nginx/Manifest
@@ -1,8 +1,6 @@
-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
-EBUILD certbot-nginx-0.39.0.ebuild 1012 BLAKE2B 8864a6365c3f686de1965966f66b96adf3b23cef9020f52e5b207e70b25c54e966cab2175904143a353788d1cddd875b9d4bdf53f2b0e599283a6dad1e4bfafa SHA512 44b9b9b2786e8d3aef042961130897d6d18b20d0975e65ae8f4e765ba52dbc3fe9045cf4c8dfe52a807e2932794862593e94c35e1e5c6e18b377bad3727c5756
-EBUILD certbot-nginx-0.40.1.ebuild 1012 BLAKE2B 8864a6365c3f686de1965966f66b96adf3b23cef9020f52e5b207e70b25c54e966cab2175904143a353788d1cddd875b9d4bdf53f2b0e599283a6dad1e4bfafa SHA512 44b9b9b2786e8d3aef042961130897d6d18b20d0975e65ae8f4e765ba52dbc3fe9045cf4c8dfe52a807e2932794862593e94c35e1e5c6e18b377bad3727c5756
-EBUILD certbot-nginx-1.0.0.ebuild 1012 BLAKE2B 927625b9f13a84ae5829a68bc2dbe1606ac3dc543429e804f28e4eabef8b54bf27edd9cfa6f65496e2daae152e384fa61ae1927fa24fae35421a2c1031582b64 SHA512 9c99b8da1d6934e0a6d160fa735389262db7d8d3c057d0a99f5fb58ee1a88a7d84409acefd40673cfc7d81e1aa15ffa0e28be9f1b00030a6d80add9143b8305a
-EBUILD certbot-nginx-9999.ebuild 1012 BLAKE2B 927625b9f13a84ae5829a68bc2dbe1606ac3dc543429e804f28e4eabef8b54bf27edd9cfa6f65496e2daae152e384fa61ae1927fa24fae35421a2c1031582b64 SHA512 9c99b8da1d6934e0a6d160fa735389262db7d8d3c057d0a99f5fb58ee1a88a7d84409acefd40673cfc7d81e1aa15ffa0e28be9f1b00030a6d80add9143b8305a
+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-9999.ebuild 1008 BLAKE2B 931887bf14479cb91c2963642a1302fb07f032a9aa57f97953f485db16a176511bc7b0cea39f319d9e1da0db2fa5e771406b524350813c6d7108c7f91c8ef038 SHA512 bb58e74009c0051fabd22f2d5384de642fdfcfdf259eff6fe91b33d58506c19fd24c8abc72bf602ac02a4403f879740e400de5ff732f8e34b967a2bc874d021a
 MISC metadata.xml 334 BLAKE2B 4adbd04c0edcc84925da47b32fee63d4652bf2a1bf5222a56e0e1c7cfe8aaa34275a2652c4416f8a80de11fd88217d8626d610fa857f0615f18bfd773a279e55 SHA512 e3d6dda6c44557523fd48b464b6d39fc45b90ba2ecbe03fb300a655973c1b2e654a24d8d381b769eba00d0d80fb5881e1dfec1694e223cd83047abba9f01a44f
diff --git a/app-crypt/certbot-nginx/certbot-nginx-0.39.0.ebuild b/app-crypt/certbot-nginx/certbot-nginx-0.39.0.ebuild
deleted file mode 100644
index 73497ec2cbd3..000000000000
--- a/app-crypt/certbot-nginx/certbot-nginx-0.39.0.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=(python{2_7,3_5,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/${PN%-nginx}/${PN%-nginx}/archive/v${PV}.tar.gz -> ${PN%-nginx}-${PV}.tar.gz"
-	KEYWORDS="amd64 ~arm ~arm64 x86"
-	S=${WORKDIR}/${PN%-nginx}-${PV}/${PN}
-fi
-
-inherit distutils-r1
-
-DESCRIPTION="Nginx plugin for certbot (Let's Encrypt Client)"
-HOMEPAGE="https://github.com/certbot/certbot https://letsencrypt.org/"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE=""
-
-CDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-RDEPEND="${CDEPEND}
-	>=app-crypt/acme-0.29.0[${PYTHON_USEDEP}]
-	>=app-crypt/certbot-0.35.0[${PYTHON_USEDEP}]
-	dev-python/mock[${PYTHON_USEDEP}]
-	dev-python/pyopenssl[${PYTHON_USEDEP}]
-	>=dev-python/pyparsing-1.5.5[${PYTHON_USEDEP}]
-	dev-python/zope-interface[${PYTHON_USEDEP}]"
-DEPEND="${CDEPEND}"
diff --git a/app-crypt/certbot-nginx/certbot-nginx-0.40.1.ebuild b/app-crypt/certbot-nginx/certbot-nginx-0.40.1.ebuild
index 73497ec2cbd3..460957ae7e95 100644
--- a/app-crypt/certbot-nginx/certbot-nginx-0.40.1.ebuild
+++ b/app-crypt/certbot-nginx/certbot-nginx-0.40.1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=(python{2_7,3_5,3_6,3_7})
+PYTHON_COMPAT=(python{2_7,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.0.0.ebuild b/app-crypt/certbot-nginx/certbot-nginx-1.0.0.ebuild
index 145d96dcb8f9..1ae5cc3ffcf0 100644
--- a/app-crypt/certbot-nginx/certbot-nginx-1.0.0.ebuild
+++ b/app-crypt/certbot-nginx/certbot-nginx-1.0.0.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=(python{2_7,3_5,3_6,3_7})
+PYTHON_COMPAT=(python{2_7,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
 
diff --git a/app-crypt/certbot-nginx/certbot-nginx-9999.ebuild b/app-crypt/certbot-nginx/certbot-nginx-9999.ebuild
index 145d96dcb8f9..b7c737e19b3c 100644
--- a/app-crypt/certbot-nginx/certbot-nginx-9999.ebuild
+++ b/app-crypt/certbot-nginx/certbot-nginx-9999.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=(python{2_7,3_5,3_6,3_7})
+PYTHON_COMPAT=(python{2_7,3_6,3_7})
 
 if [[ ${PV} == 9999* ]]; then
 	EGIT_REPO_URI="https://github.com/certbot/certbot.git"
diff --git a/app-crypt/certbot/Manifest b/app-crypt/certbot/Manifest
index 6282ef969346..fed5e018bf9e 100644
--- a/app-crypt/certbot/Manifest
+++ b/app-crypt/certbot/Manifest
@@ -1,9 +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
-EBUILD certbot-0.39.0.ebuild 1436 BLAKE2B ab2270b182cddde0f711b62f12c4615ce7847e32364dcc1efe5ce4dbbea989e24e2ff3ad2cfbfab354d835b1da57c319c470276ce6d6427756494fb7107b7f8a SHA512 79bf323f59b3f6109def173277617b91b8548910f4822b4577f4f0bde1fe6568ea20381433096b5ce96036a86d4b620fd0921dcedf24f7d650c814af02f7f658
-EBUILD certbot-0.40.1.ebuild 1436 BLAKE2B b550a22df071d4ecd5c66bbb57bc72be2f47c21917512903c58084c65e75447ada4308e7703f667335d981fa438902244ea78c8510707861bf99656474762d8a SHA512 879b6e7cffb40eca653e2830e402b02ce4b25e5b9aa03ee9d32d09bd5e1109d98229340e4b8f048a2a4cbd46bf3098bf309575f095579a3a5159b0054e66a408
-EBUILD certbot-1.0.0-r1.ebuild 1499 BLAKE2B 4e247309ed6cb2b75c76612a0ea223307a1ec0de10f795cdf8c484231eb8dffbb8ed4208bcee19b879f9772d72686ea9637897e6918901634b1f0c25195e37fe SHA512 3563bf9bd484c0d1f5f4effb23a8aab7a4a0f7ccb94d48d5a60edee41964c4a63bd59d1d1185b9e0b14b9876f95ff679062382dd40abb2453f43e83057bb80b5
-EBUILD certbot-1.0.0.ebuild 1499 BLAKE2B 4e247309ed6cb2b75c76612a0ea223307a1ec0de10f795cdf8c484231eb8dffbb8ed4208bcee19b879f9772d72686ea9637897e6918901634b1f0c25195e37fe SHA512 3563bf9bd484c0d1f5f4effb23a8aab7a4a0f7ccb94d48d5a60edee41964c4a63bd59d1d1185b9e0b14b9876f95ff679062382dd40abb2453f43e83057bb80b5
-EBUILD certbot-9999.ebuild 1438 BLAKE2B a1d6c6e1c9e43263c06bb16c2b1095253a63e25863337963452790b8809f2f488f0caece08df387b01f9fba531e2051bf265c1df7e83e169fd6cea6c1adb5fcd SHA512 a910e3f910b6b42a4995d2e0f69f446844e58a22b8d75b5a12585595e98976b9958d061197b5c139c43d1d9f083aebe057190e50b43a9cdf2e9bedb40d435286
+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-9999.ebuild 1459 BLAKE2B 8786bdd75cf34ba205d6df9eaab74946dc3253bb1aa087183181e440f9a79dee26ce35c9a61fbe6ffc8581d08fe30c33a376a3189cab8e8146326574ed5b37cf SHA512 49c5da10cc52f8ffa40f71ef4bd33ebade098dd9692e99ed669a9a49e1c5602bd171d3ab3a5a48b5e37e1ba79967d14a55aad30c56fe1da6d50c664a5719cabb
 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
index 33e7e1409f34..186da7592eca 100644
--- a/app-crypt/certbot/certbot-0.39.0.ebuild
+++ b/app-crypt/certbot/certbot-0.39.0.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=(python{2_7,3_5,3_6,3_7})
+PYTHON_COMPAT=(python{2_7,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-0.40.1.ebuild
index bf95047b3dfa..308bd367bff6 100644
--- a/app-crypt/certbot/certbot-0.40.1.ebuild
+++ b/app-crypt/certbot/certbot-0.40.1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=(python{2_7,3_5,3_6,3_7})
+PYTHON_COMPAT=(python{2_7,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.0.0-r1.ebuild b/app-crypt/certbot/certbot-1.0.0-r1.ebuild
index 37c17aa225d3..23177e8bb65c 100644
--- a/app-crypt/certbot/certbot-1.0.0-r1.ebuild
+++ b/app-crypt/certbot/certbot-1.0.0-r1.ebuild
@@ -1,18 +1,17 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=(python{2_7,3_5,3_6,3_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/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
-	S=${WORKDIR}/certbot-${PV}/certbot
+	KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
 fi
+S=${WORKDIR}/${P}/${PN}
 
 inherit distutils-r1
 
@@ -47,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-1.0.0.ebuild b/app-crypt/certbot/certbot-1.0.0.ebuild
deleted file mode 100644
index 37c17aa225d3..000000000000
--- a/app-crypt/certbot/certbot-1.0.0.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=(python{2_7,3_5,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/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
-	S=${WORKDIR}/certbot-${PV}/certbot
-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.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/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-9999.ebuild b/app-crypt/certbot/certbot-9999.ebuild
index e59b628d2009..e3c2f890315a 100644
--- a/app-crypt/certbot/certbot-9999.ebuild
+++ b/app-crypt/certbot/certbot-9999.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=(python{2_7,3_5,3_6,3_7})
+PYTHON_COMPAT=(python{2_7,3_6,3_7})
 
 if [[ ${PV} == 9999* ]]; then
 	EGIT_REPO_URI="https://github.com/certbot/certbot.git"
@@ -11,6 +11,7 @@ else
 	SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
 fi
+S=${WORKDIR}/${P}/${PN}
 
 inherit distutils-r1
 
@@ -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/chntpw/Manifest b/app-crypt/chntpw/Manifest
index 5dcbe5a5eee9..4cd47396ba30 100644
--- a/app-crypt/chntpw/Manifest
+++ b/app-crypt/chntpw/Manifest
@@ -1,3 +1,3 @@
 DIST chntpw-source-140201.zip 1404098 BLAKE2B 86c93861983613496fcd82879a5b000537d4a7ee2add466aa26c67feabefdb5363f610234f99615139997a04aedb448468ef8b29cc6c4bf49b2e295f41308644 SHA512 a26d747f6e077d1bb3e9b8077781f8c37dd978e07b7426495862f15c9004572b706c34736fc4d1ed8856b1a43335d726b4d87c688f7f9a11fd6cc3a74d71a7fa
 EBUILD chntpw-140201.ebuild 1046 BLAKE2B a5f3ad57b70b8c53dc2a4c1bb055a1fe7ad8528252d3775c91c483842be83e0115feddcb1b97ad496b696b076e4bf05f8f2411a5958363856d3f6c113e92fa74 SHA512 1405df86cacb7b7069cdd832641ffcba633497aad5177ea5bf6bc854a44331bfbcf03b82f8c6984245e473afe404aed3de354c77129ae6f8f3129d0757058071
-MISC metadata.xml 240 BLAKE2B 019d24354f525c2754c3fa8a9dfc0a35fbdf5ea285db4cbc20535f6123679544c06acae8c5ced17ae7c299318b6a0b9115b645188fccd5945ff47b6bf9cd1f1d SHA512 e94cdc08f1a8aafc0ec72615a476ed63dbacd22b48413a938f5bfbe9c2bda2cab2347465df3035b53031e0a4f935b47d22fad8c89a67e5780a5370ec9564d99d
+MISC metadata.xml 245 BLAKE2B 1564b4d8e674e807191dcc857c12585eaf336e3418e110853e311b2851b382ca8931b46a96230677251bf3784004879d8498cae2dae11c9289f4a8606dfa5d7f SHA512 bd2ae86e550344a79551fe0383e4625d28ca6fad675d84c66fc5b22ed7fe3afbfc2b4d6a7b1a5d02f6efbc56950b8295270a3dba8a1e7e51fde80a370d0c868a
diff --git a/app-crypt/chntpw/metadata.xml b/app-crypt/chntpw/metadata.xml
index 040cba5f7c5b..3e5026ee3754 100644
--- a/app-crypt/chntpw/metadata.xml
+++ b/app-crypt/chntpw/metadata.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="project">
-		<email>crypto@gentoo.org</email>
-		<name>Crypto</name>
+	<maintainer type="person">
+		<email>marecki@gentoo.org</email>
+		<name>Marek Szuba</name>
 	</maintainer>
 </pkgmetadata>
diff --git a/app-crypt/codecrypt/Manifest b/app-crypt/codecrypt/Manifest
index d79a2bdc513b..f155aedc4b23 100644
--- a/app-crypt/codecrypt/Manifest
+++ b/app-crypt/codecrypt/Manifest
@@ -2,4 +2,4 @@ DIST codecrypt-1.7.2.tar.gz 446975 BLAKE2B 40b7f97dae84a0fd621ee19c6bfeba47b781a
 DIST codecrypt-1.8.tar.gz 471273 BLAKE2B 30547c299689547b50e2742e12dbfd32f420217a81813446b36bf5ea52929ca1f3b1968d76937de17e0f003c82186abfa683a6e30dc1fa5dc2ffe89594827ae4 SHA512 0e452f4e93498faa671a5927a3dd93b6dc66cbda7eb71cb33a509f8608573eff5ac8fed0d5e09911e03c153b88c9cb1bb54f7b2aeeb7b6c31eec918ad9685102
 EBUILD codecrypt-1.7.2.ebuild 672 BLAKE2B 525178d3411173523afa24e0df3fd117095f34fab99ed4d8666e2be34b7408de6311b06088a8cdcdc4dfc43f179c86abc70ed769aa0dd978ae5e3ec60730d176 SHA512 a43435250a021b7418bf2e5eb1573237bfda0690bd65e6df597700dd9ef3bdf7ac316ae164bded683e8e7412fe1e57bf7428b0f629d6f614f1b2b7ef64d68f5e
 EBUILD codecrypt-1.8-r1.ebuild 713 BLAKE2B fbe2c5bcba08834f475dc9655fe6b8623f1d44a9cb2743e5762ea69f04832fcb7fbd02312ef200b628ad35e05bc3fdc5c3ea1436656943cac2ef08eab2e74030 SHA512 fcfe53551ce1fa4c5de259a162b6dc485a3efcd6a05bfe4deb66a437a4dba289d32f4de2608dbd01b2c70596a1cfba759b0326a70c785799789bc84ff9e5f811
-MISC metadata.xml 757 BLAKE2B 5346ca41ed3210ef96baa63fc22e5733d47d8998f7b0cca37cd0aed53b67a7adf5bd8cbedd68d4194476ec7ff0fe83196038766cdbb3580b185566abca76ad9e SHA512 f7e7f6a747c42a666bd0b5de69999fd377374da728c9c98f8e57fa4c7fd93e97a7a7a721c568ba920c4cbe5f5591f4174db99d89fd209df7aecbad06f59f75a3
+MISC metadata.xml 756 BLAKE2B 23c44085ef45f26b1ac4fa910594f7ccf47756ff2430e0d461d0ef86bdd92b14358f6041ce35979d3f6312da8cc3008c62691222ccdd05ff13ecae345dfec549 SHA512 b5edbcee8db2b2f57e9c8b3c2d36986e660aa9b1401e0a4dd130ee8ae43b7c899cc2652a046fe526fb58285ec45d7f022085423663b5dd37c89591bed0a6a702
diff --git a/app-crypt/codecrypt/metadata.xml b/app-crypt/codecrypt/metadata.xml
index ec617cd817af..be265ff6c7bb 100644
--- a/app-crypt/codecrypt/metadata.xml
+++ b/app-crypt/codecrypt/metadata.xml
@@ -7,7 +7,7 @@
 	</maintainer>
 	<maintainer type="person">
 		<email>amynka@gentoo.org</email>
-		<name>Amy Winston</name>
+		<name>Amy Liffey</name>
 	</maintainer>
 	<maintainer type="project">
 		<email>proxy-maint@gentoo.org</email>
diff --git a/app-crypt/coolkey/Manifest b/app-crypt/coolkey/Manifest
index aceddd262010..bc61216183e9 100644
--- a/app-crypt/coolkey/Manifest
+++ b/app-crypt/coolkey/Manifest
@@ -1,4 +1,4 @@
 DIST coolkey-1.1.0-patches-003.tar.gz 21263 BLAKE2B 27025b8aa24df45f8efa872122a1c3699db6d0d627861182c7eb1d61b921d026d7e3355d1b3d12608747ed1d214eee764b53dbbc5599c452b347e191e1516eca SHA512 25a5fac68ca041fcf9e927d134d0179fa286e6de75019e7bbf205edeaf73222d9fb9fd3861a8f6e0d933d1a09229e3e727278c3a9b3cc63390ef07774c46390d
 DIST coolkey-1.1.0.tar.gz 432808 BLAKE2B 7e443cdb0dedcec5de32cf5c7cc5eb2d81f1d51fbc2e580fda302153d3f8a919bc89d2308b8799cf395c89d16150e09bd33bc76eacb8af855c54b961bb5d082a SHA512 4b61de9b40abcf620fbb519d5e3cf1e93ebdd0470854cb63a597fc91e0182998217353014327f7bc4f255d22515d8ea2b08d36b3a831f5f09134fdcd418bc08b
 EBUILD coolkey-1.1.0-r7.ebuild 1955 BLAKE2B e0aaf94e3d6a1ebd97d0a65933b3ba88508282768f7ba6bd446da4e46d2fc7b7ad874bce2c67d8ddfb5de83da34a8dad78c43c01e423dd1b5a3af966abacd6ee SHA512 e82f42b46efe278f5ab74b5205f451e4759c8701564d6132672bcc41e140fd4ad8817f047c900b09c5bc26b35e32b8197cbf2b4648475f43d83483c24873b129
-MISC metadata.xml 236 BLAKE2B a7bb92e6d53f7252ee56a885bf098930e228a76a75bca119358ca860901ceeecccc43efe5279c54250ebda58f77ae9c97d2ae540d8b399283cb3aa348111fcd2 SHA512 5f6cd6a85527534d5de7118de5af212ee3044c8c5530a7f7087a28074a2d4ab7be1728325bd985adc063dc795d3cf2b1c4e58a4c4c4ec02d739bd4bbc544ef08
+MISC metadata.xml 167 BLAKE2B e4dadf27fd344484f2bccb5b904909c89aac568c32e5b3c44bdf139eacefd4b4fae74419f503d2b7da0dccc1b68ba05d777d11292c0f89270d1ac5c9c703e8ca SHA512 7c8decb24ee3a850e38186cf3c7f8933a28017426806870ad6ef9ceb2533be147a2681fc789b535a81cb528af8c29d90d3006e4f250aee23bd7dea4561294e33
diff --git a/app-crypt/coolkey/metadata.xml b/app-crypt/coolkey/metadata.xml
index f1c3d59fb213..7a38bb900964 100644
--- a/app-crypt/coolkey/metadata.xml
+++ b/app-crypt/coolkey/metadata.xml
@@ -1,8 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-	<email>crypto@gentoo.org</email>
-	<name>Crypto</name>
-</maintainer>
+	<!-- maintainer-needed -->
 </pkgmetadata>
diff --git a/app-crypt/debian-archive-keyring/Manifest b/app-crypt/debian-archive-keyring/Manifest
index 0df510d42d3e..815453d23029 100644
--- a/app-crypt/debian-archive-keyring/Manifest
+++ b/app-crypt/debian-archive-keyring/Manifest
@@ -1,5 +1,5 @@
 DIST debian-archive-keyring_2018.1_all.deb 57392 BLAKE2B 3262a1f49af9792ce378a0b6219287ac868d3483783218f55a0ab3d37b9fa0a857da2dcd4c83742d8b47ce4a2df5ecd985d2345d5367908f2f353e8cc0a6a5e3 SHA512 7bf98cda5b9639d68538a8d47e35d422e552bd8afa067e844f0e8e76a366f9d5e503e0f47dd646789fa0264a47b77d0bfcc22559ad09bdc95453e4a5c2169f0f
 DIST debian-archive-keyring_2019.1_all.deb 75088 BLAKE2B 54411c4bde02990670baba608e239f1630394f52e877b62b4683c85c5a45a618cece0f429a35472eedce3768dc8a097049b4cd9dd808cc167c5baafd1e8fe9d1 SHA512 051b8507c9deba0d13dc0137ff43ae9db27b20b78c3437ca680046ae9b1c81ac505dc0a4460d4a83c4b256a04a2e57d1280eb2e8a3afb2a58f150ca6c37d0d63
 EBUILD debian-archive-keyring-2018.1.ebuild 475 BLAKE2B f10d5d944aaaf7a76c60e56e82b469deece91b9c5756874890696bad485bb21f3a53d77d2ed6cde678a2c3ae0ce8e1d78317f189d3df6221cd41daae45d696d7 SHA512 f80c382c04eb60d953f8a3ad1e87211adbff5a2425b9e6be6ce4644c22fbefd0a63d044c429b6379903184ab7ee6045a8b0b790f7fc8c4287ff82fa1c1514655
-EBUILD debian-archive-keyring-2019.1.ebuild 475 BLAKE2B f10d5d944aaaf7a76c60e56e82b469deece91b9c5756874890696bad485bb21f3a53d77d2ed6cde678a2c3ae0ce8e1d78317f189d3df6221cd41daae45d696d7 SHA512 f80c382c04eb60d953f8a3ad1e87211adbff5a2425b9e6be6ce4644c22fbefd0a63d044c429b6379903184ab7ee6045a8b0b790f7fc8c4287ff82fa1c1514655
+EBUILD debian-archive-keyring-2019.1.ebuild 482 BLAKE2B 716ab76abb537b1b44543ae8056ed68be13dbf9c3bb31e293ae955477c534a253556f8a8d6d7399a2f18ef8ae1182ecd9e3d1dab05d4c94854360c9d427162ba SHA512 1643060e07bfa3938f9c20297e3c4eb1800e8d5a953b1c2d16d8fec35b47dff7eff552ed70432053fb03e8b577c75db1cf4a50966c8956c8a8428065a4fb38fe
 MISC metadata.xml 255 BLAKE2B 4c7bf34bcfa727317b7cc808eb50bbfd3d1aae64fa098b599480cc8ae6cfc527956a0d593db2ecc55b1b3cea48c5ce46642b64cda5b40753d6fe5e883129147b SHA512 92faa797311ee8b7bab9f5f5070d5fa6b75ca5f3a07643f8fc4d67a28d50d746e904009b7fb1a8214c4b0fc296b4b3ab3f695786103dc6c26479c5542165a587
diff --git a/app-crypt/debian-archive-keyring/debian-archive-keyring-2019.1.ebuild b/app-crypt/debian-archive-keyring/debian-archive-keyring-2019.1.ebuild
index f9d5bd12a13f..bbb643c8e5f3 100644
--- a/app-crypt/debian-archive-keyring/debian-archive-keyring-2019.1.ebuild
+++ b/app-crypt/debian-archive-keyring/debian-archive-keyring-2019.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://debian/pool/main/${PN:0:1}/${PN}/${PN}_${PV}_all.deb"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~ppc64 ~x86"
 IUSE=""
 
 S="${WORKDIR}"
diff --git a/app-crypt/dieharder/Manifest b/app-crypt/dieharder/Manifest
index ce48501ae0e7..6730fce1ba00 100644
--- a/app-crypt/dieharder/Manifest
+++ b/app-crypt/dieharder/Manifest
@@ -2,4 +2,4 @@ AUX dieharder-3.31.1-build.patch 4920 BLAKE2B 8d297ff8519d0e0b197c1975dc84b7f8d0
 AUX dieharder-3.31.1-urandom-64bit.patch 2689 BLAKE2B 9c7d27bdfdf53b5884d9fcb32331231ce034bd4342e73822e8f6b224de6b44fb2b49fd7a0e86d5f5334d61bf231ca0a6f8cd2254fd28a74db5dd580e495c81e2 SHA512 2c99ab9df82fca20123ec3950032b9c6b6e8cd919ef06e0a7ac72818474b5147d68e195db5334fd9689580cc1d669b9893f3784ad645a69598b707537ae63851
 DIST dieharder-3.31.1.tgz 1149780 BLAKE2B 12937b54e713ce87d6cb815b9b1e00989085b7661538316649caea4a514518528039441d0d42f377c363c62db179f362feb9d64612a75f724ac363744f884a47 SHA512 e01ed4266b4fe5d5fadde3c92c30e430d0ca5f7fedd26b26ed2ab98b7602aa9c35bb5c8fd9314ef2f5235b5087645ab13e5e6550156e26643baa5aeb77088dc5
 EBUILD dieharder-3.31.1-r3.ebuild 1047 BLAKE2B fb32577dca845314ae9acf62f2b71a2e3ea02979f7065803a7bc6fad634655500b42339af49b5ea26d60e9bc06cd83ef7ff46335d8fda45beb9c1ccc94e48e0d SHA512 8abf176b8dbfd1e883a247fc26851f09159817f96f740c54df34061959e8a1270da5f41c43729e758feca5edee0a7ae45583f93ea7792990916fea540d6fd6ec
-MISC metadata.xml 236 BLAKE2B a7bb92e6d53f7252ee56a885bf098930e228a76a75bca119358ca860901ceeecccc43efe5279c54250ebda58f77ae9c97d2ae540d8b399283cb3aa348111fcd2 SHA512 5f6cd6a85527534d5de7118de5af212ee3044c8c5530a7f7087a28074a2d4ab7be1728325bd985adc063dc795d3cf2b1c4e58a4c4c4ec02d739bd4bbc544ef08
+MISC metadata.xml 167 BLAKE2B e4dadf27fd344484f2bccb5b904909c89aac568c32e5b3c44bdf139eacefd4b4fae74419f503d2b7da0dccc1b68ba05d777d11292c0f89270d1ac5c9c703e8ca SHA512 7c8decb24ee3a850e38186cf3c7f8933a28017426806870ad6ef9ceb2533be147a2681fc789b535a81cb528af8c29d90d3006e4f250aee23bd7dea4561294e33
diff --git a/app-crypt/dieharder/metadata.xml b/app-crypt/dieharder/metadata.xml
index f1c3d59fb213..7a38bb900964 100644
--- a/app-crypt/dieharder/metadata.xml
+++ b/app-crypt/dieharder/metadata.xml
@@ -1,8 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-	<email>crypto@gentoo.org</email>
-	<name>Crypto</name>
-</maintainer>
+	<!-- maintainer-needed -->
 </pkgmetadata>
diff --git a/app-crypt/ekeyd/Manifest b/app-crypt/ekeyd/Manifest
index 70b59ca3dece..ce09fc8f2e93 100644
--- a/app-crypt/ekeyd/Manifest
+++ b/app-crypt/ekeyd/Manifest
@@ -10,5 +10,5 @@ AUX ekeyd-1.1.5-udev-rule.patch 2325 BLAKE2B 5617dd160c6f3617bb93dc97755f22c535e
 AUX ekeyd.init.2 699 BLAKE2B 4ce17a42ffc60b49232cc0bb5a19d36fecc55071df699a7ad7da6a49de352a599b8f0f11fc05fa4159d8975245e7b6181e96303182870519a7f57070a6b54da4 SHA512 3c1fe923e6f08d83d02b9559fa5b817e9abdbc97a50815ab01c7c17e3e953f54701eb1110340dc164bb67ef67905041054cd4fc98c11ea5932a539f4330c8b71
 AUX ekeyd.service 157 BLAKE2B d7976301d7eb0d9be05de574f3b25c13ed3767629dff7024e7621a2d29686045cfd7664e2127a87b92d32e719b470a2795159e45c310bfdcfffa75897341213f SHA512 1082a1dc58b820882015c4f09d5154691d9d8810bfe953049a6853ea5025ec7cff2377ee931ec8ceef295241083c162e582a75fd0b134f7e8789f6d470285445
 DIST ekeyd_1.1.5.orig.tar.gz 101366 BLAKE2B 7edd6d291f7553864c9aa96ee3d9533e33b6c94989b2c6b1a56eda42f61afe1633af5e7c3c8f5f57920ac0577f8567d1b09238eae35138ab2023600f01096466 SHA512 c30620d5e54a49929be72ed04448a4f08eb9658dbf7534586c49a3b43bdd5fc95a0659e09cc04b012c339ca20a1e914fa5a4b4d970171c46b64235f284516b9a
-EBUILD ekeyd-1.1.5-r1.ebuild 4877 BLAKE2B f7b49794d5c43cb8997e2074aa8ece5cf75a24baf6d2b49cf8626e2a96487b9689c887008f43cd9b3a577c8f07533b244abebd406da397baaa38242201fabea1 SHA512 5280b08daee08ee697de152a8db129c180e1d633096431a9511a03c9bfdd552411cf00e088daeef675c70621a30fac069de79ae89d63bd9f071ba134fb4dad55
+EBUILD ekeyd-1.1.5-r1.ebuild 4873 BLAKE2B dc8d7e9f7c66df2d5c9deeb86199cf7bb033de50ac8616f53351d9601eff49d6fa8b4eebcbfb22de9bf17119e3bce9da55bcea19d141f64b47b93abb144c9e16 SHA512 6fa70427d545a093f7316f06d61b7e7ebfb7a5b3e7c0735dfb59ef85a7bd2635f9a5065b244a40ba053419aa4baa4afbc9a0b99411a181b480321118edc6cb5e
 MISC metadata.xml 859 BLAKE2B f300afe133b92ef4d4dd1a6f7bffebdb9ff1b152fd08484d56b327c1eaaaa2a2c5c2bf98a8f98851bd427a1143c1d84537aed47ea6048fb10bd0695ee817a202 SHA512 0b7ac8a9894b69bcf0d16bcae83146ef00c05f1a1ecb41244a03cbb5ee8d64328647eceddcac36a5900e87dd07af81c79c7e62e94f70e67244b2c8dac73f57da
diff --git a/app-crypt/ekeyd/ekeyd-1.1.5-r1.ebuild b/app-crypt/ekeyd/ekeyd-1.1.5-r1.ebuild
index cd17249ebd07..4cdadc140840 100644
--- a/app-crypt/ekeyd/ekeyd-1.1.5-r1.ebuild
+++ b/app-crypt/ekeyd/ekeyd-1.1.5-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -146,7 +146,7 @@ pkg_postinst() {
 	elog "other hosts, you can enable the 'minimal' USE flag."
 	elog ""
 	elog "The service supports multiplexing if you wish to use multiple"
-	elog "keys, just symlink /etc/init.d/ekeyd → /etc/init.d/ekeyd.identifier"
+	elog "keys, just symlink /etc/init.d/ekeyd -> /etc/init.d/ekeyd.identifier"
 	elog "and it'll be looking for /etc/entropykey/identifier.conf"
 	elog ""
 
diff --git a/app-crypt/fcrackzip/Manifest b/app-crypt/fcrackzip/Manifest
index 11b2618e4201..725d09bce189 100644
--- a/app-crypt/fcrackzip/Manifest
+++ b/app-crypt/fcrackzip/Manifest
@@ -1,3 +1,3 @@
 DIST fcrackzip-1.0.tar.gz 114786 BLAKE2B b5eb3071e7c858949079c8df79502aeb744a46b06b18408ba8cdc3c5b980e3b740acb597ba12196cd0d4f737e2aa3fbeb10e9d81c5d78a8244af1d3cb6b8eaa6 SHA512 c18d45b5a4ec46411d455a0c10cb9faa7a1060a48936a820fff9b1f8af7f7158ac09da44d39673e4bdfaf0f370ee425e8df0a0dbe98a2a930049ecc2a1419048
 EBUILD fcrackzip-1.0.ebuild 492 BLAKE2B f75cbdf10931c0268a702c3d9ca3da8a6553e1ea9340781d2623074fc6437034dcd477b5014816b3ed2560b91a7d1671a3900ac6832d44faa737525ed91beb35 SHA512 d176591dcfce60c13a8efd77f58141a1da3cab580aaf5d48597d7149c63680bcddfa03ed4a1b299fa0f78de5257fb88a2b5bea11c878e86132bc0f1451d0d9fe
-MISC metadata.xml 244 BLAKE2B b58da0bab96619cd4e3c76252a9aa93cd62ec8daa7a1bbc4568f5c4f89ebd955d202698a8cd25489689abf0c7a2acbc2c987b05c0f5be1815484e02b7fa1a74c SHA512 369af9aeb291abf5f4ad1e75411ea1988671f116f7e44e8d5fc58fc2e2a8bde047783c23a71f2b2b5445b20873e5c38265714332dce289dec4e21d0b2cd76e44
+MISC metadata.xml 167 BLAKE2B e4dadf27fd344484f2bccb5b904909c89aac568c32e5b3c44bdf139eacefd4b4fae74419f503d2b7da0dccc1b68ba05d777d11292c0f89270d1ac5c9c703e8ca SHA512 7c8decb24ee3a850e38186cf3c7f8933a28017426806870ad6ef9ceb2533be147a2681fc789b535a81cb528af8c29d90d3006e4f250aee23bd7dea4561294e33
diff --git a/app-crypt/fcrackzip/metadata.xml b/app-crypt/fcrackzip/metadata.xml
index 84575d506dc9..7a38bb900964 100644
--- a/app-crypt/fcrackzip/metadata.xml
+++ b/app-crypt/fcrackzip/metadata.xml
@@ -1,8 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-    <email>crypto@gentoo.org</email>
-    <name>Crypto</name>
-  </maintainer>
+	<!-- maintainer-needed -->
 </pkgmetadata>
diff --git a/app-crypt/gcr/Manifest b/app-crypt/gcr/Manifest
index c0c4a455ba8c..0a046554d893 100644
--- a/app-crypt/gcr/Manifest
+++ b/app-crypt/gcr/Manifest
@@ -1,9 +1,8 @@
+AUX 3.34.0-fix-desktop-files.patch 2102 BLAKE2B a733e4c0c62d8d80229663efe81d5d563404c3dc428838ed5a1515fada5a1e4da92eee38f37918d80ffd3121603e4ce1e4dab82ebe433d838bf0949794a88fa2 SHA512 9967470ccaeea405ad55fc16f699ac5048bf803eb9043258c2f532ff36fbf252d683b45b6f0fd1a19d9f48f5f0ace60fff50881dd8ab1e13c5c1a9170d5eff6a
 DIST gcr-3.20.0.tar.xz 1324216 BLAKE2B dca283d1bde4994ee60666b2d5fdc4f0861df453355dcf20cea22a87808da0b9284506460ecdfe779ab9ecdf4ce17e231bd1d9426d677511684c35e43da19550 SHA512 0acd0fb085a38507b1cc895ac773f91c6f4e14d2ea7e27b8e74c85ef78426597b6ea08ebee696452b0651939ec4a0d8a4a2523c41b3a8a0bd1b0d7b338b1d9c7
-DIST gcr-3.28.0.tar.xz 1329044 BLAKE2B b35bca9b62605c4e0c3d71604ea5e6b7cdd97bb3257aabb26b8834622abdeec29798429b84f88254a1f8b04894f5cac2ef63c2a0bfd47ad32761d8d73cd0b189 SHA512 8d5e650cb369fa889b0adfdc1dc1cb5f8b184881256e6c0a2ed456074a54ceb61d64c0929c093bec66c0d5a15c1718f6e3736a1b25b6d7076081df93b49419e0
 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.0.ebuild 1870 BLAKE2B dc9b961d72d84d62909e0b5f6daeef8520dc988d809754e27d9fc647ad15df51201627251a8c5e8ad08084eef23e7491889c5c96d70a80679cc1cdb0496dfeaa SHA512 879eef0405ec069d112152c8a7c2b8c202e81a973869f6ea49589f0a7c51c9c058087b1c060575638485dd9361fdad2aebe5c7e5b71c05d82b39de5b673ca347
-EBUILD gcr-3.28.1.ebuild 1871 BLAKE2B 3e7aa573f3ae68dcb674a7c958b5c32ec1997f31e085e244e1c2ac884d1d4877ddbd652f9a9c961e559c82c7a4dc16e4d576bd20593bda9be08723e806e8a316 SHA512 a679c598da68adb6779040719baab11643acfb7b51b912a0bead6f75d1367c47e797903e502756952589fdef0b1a1361d80adce39dd7e6b2a35dbd0d658b2c0d
-EBUILD gcr-3.34.0.ebuild 1837 BLAKE2B c7c8e60e48caaa36a40622bcb8061f1764f6e0a5e8a8e59d48231599c8e1f5e931603c0fc8be07cd8713a2e5a8f6c5a8c59a32df07b763f296f4fa8871ce005b SHA512 4194a41ad61ba70924daa7951bf7be764d88350d557eac536718ea8562b36e170c26af7c972db242eacc513e410a2b1f953394677ae4fa35aef7d0ebf6702a25
+EBUILD gcr-3.28.1.ebuild 1870 BLAKE2B 6fa9610bebbeea98214a751bf7302a759c21d584dc0e9d7bda104bc1ffdbc8d9c9879af23a0eed3e8fbbb854cf4fae77845c101ca2e643425a1b9bc8c30bc925 SHA512 575baec3c6962b1df651d74895d105a9251878eb107637ed000350bfc216201a249eef098b5f77661db82ffb53a469cd12b18b09fe1931386ef2e1eaa2120906
+EBUILD gcr-3.34.0-r1.ebuild 1903 BLAKE2B 23288de8ea7ad89cf509ccd8f52a5c25d06706727c0a6b59210a5edb24d4f245bd2c91ae236fffe867282bc0bfc8406a4e6547a74f364bba6ac46bb7de31dc7d SHA512 812b9e273dada36303997dd7e097f98a8cb3e17e7a600f1f2c990ca32cd69e17c0f0c9e2a24ea7a71c57539bb544010cae80157dfcc0c36aa3459e22ea392431
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/app-crypt/gcr/files/3.34.0-fix-desktop-files.patch b/app-crypt/gcr/files/3.34.0-fix-desktop-files.patch
new file mode 100644
index 000000000000..0678937fcc0e
--- /dev/null
+++ b/app-crypt/gcr/files/3.34.0-fix-desktop-files.patch
@@ -0,0 +1,61 @@
+From a69dc44e11270ce092babfa57fe3aab31da9619c Mon Sep 17 00:00:00 2001
+From: Daiki Ueno <dueno@src.gnome.org>
+Date: Mon, 21 Oct 2019 12:02:05 +0200
+Subject: [PATCH] build: Use sed for .desktop variables substitution
+
+We can't do that with configure, as it leaves ${exec_prefix}.
+---
+ configure.ac   | 2 --
+ ui/Makefile.am | 6 ++++++
+ 2 files changed, 6 insertions(+), 2 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 1ba43d6..6286f16 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -423,8 +423,6 @@ gcr/gcr-version.h
+ po/Makefile.in
+ ui/gcr.pc
+ ui/gcr-ui.pc
+-ui/gcr-prompter.desktop.in
+-ui/gcr-viewer.desktop.in
+ ui/icons/16x16/Makefile
+ ui/icons/22x22/Makefile
+ ui/icons/24x24/Makefile
+diff --git a/ui/Makefile.am b/ui/Makefile.am
+index 29c33e7..7594621 100644
+--- a/ui/Makefile.am
++++ b/ui/Makefile.am
+@@ -209,6 +209,8 @@ gcr_viewer_LDADD = \
+ viewer_desktop_in_in = ui/gcr-viewer.desktop.in.in
+ viewer_desktop_in = $(viewer_desktop_in_in:.desktop.in.in=.desktop.in)
+ viewer_desktop = $(viewer_desktop_in:.desktop.in=.desktop)
++$(viewer_desktop_in): $(viewer_desktop_in_in)
++	$(AM_V_GEN) sed 's|@bindir[@]|$(bindir)|g' $< > $@
+ $(viewer_desktop): $(viewer_desktop_in)
+ 	$(AM_V_GEN) $(MSGFMT) --desktop --template $< -d $(top_srcdir)/po -o $@
+ 
+@@ -231,9 +233,12 @@ gcr_prompter_LDADD = \
+ prompter_desktop_in_in = ui/gcr-prompter.desktop.in.in
+ prompter_desktop_in = $(prompter_desktop_in_in:.desktop.in.in=.desktop.in)
+ prompter_desktop = $(prompter_desktop_in:.desktop.in=.desktop)
++$(prompter_desktop_in): $(prompter_desktop_in_in)
++	$(AM_V_GEN) sed 's|@libexecdir[@]|$(libexecdir)|g' $< > $@
+ $(prompter_desktop): $(prompter_desktop_in)
+ 	$(AM_V_GEN) $(MSGFMT) --desktop --template $< -d $(top_srcdir)/po -o $@
+ 
++desktop_in_in_files = $(viewer_desktop_in_in) $(prompter_desktop_in_in)
+ desktop_in_files = $(desktop_in_in_files:.desktop.in.in=.desktop.in)
+ desktopdir = $(datadir)/applications
+ desktop_DATA = \
+@@ -247,6 +252,7 @@ EXTRA_DIST += \
+ 	ui/gcr.gresource.xml \
+ 	$(ui_RESOURCES) \
+ 	$(mime_DATA) \
++	$(desktop_in_in_files) \
+ 	ui/fixtures
+ 
+ CLEANFILES += \
+-- 
+2.24.1
+
diff --git a/app-crypt/gcr/gcr-3.28.0.ebuild b/app-crypt/gcr/gcr-3.28.0.ebuild
deleted file mode 100644
index 87349d2c1600..000000000000
--- a/app-crypt/gcr/gcr-3.28.0.ebuild
+++ /dev/null
@@ -1,78 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-VALA_USE_DEPEND="vapigen"
-PYTHON_COMPAT=( python2_7 )
-
-inherit gnome2 python-any-r1 vala virtualx
-
-DESCRIPTION="Libraries for cryptographic UIs and accessing PKCS#11 modules"
-HOMEPAGE="https://git.gnome.org/browse/gcr"
-
-LICENSE="GPL-2+ LGPL-2+"
-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"
-
-COMMON_DEPEND="
-	>=app-crypt/p11-kit-0.19
-	>=dev-libs/glib-2.38:2
-	>=dev-libs/libgcrypt-1.2.2:0=
-	>=dev-libs/libtasn1-1:=
-	>=sys-apps/dbus-1
-	gtk? ( >=x11-libs/gtk+-3.12:3[X,introspection?] )
-	introspection? ( >=dev-libs/gobject-introspection-1.34:= )
-"
-RDEPEND="${COMMON_DEPEND}
-	!<gnome-base/gnome-keyring-3.3
-"
-# gcr was part of gnome-keyring until 3.3
-DEPEND="${COMMON_DEPEND}
-	${PYTHON_DEPS}
-	dev-libs/gobject-introspection-common
-	dev-libs/libxml2:2
-	dev-libs/libxslt
-	dev-libs/vala-common
-	dev-util/gdbus-codegen
-	dev-util/glib-utils
-	>=dev-util/gtk-doc-am-1.9
-	>=dev-util/intltool-0.35
-	sys-devel/gettext
-	virtual/pkgconfig
-	vala? ( $(vala_depend) )
-"
-# eautoreconf needs:
-#	dev-libs/gobject-introspection-common
-#	dev-libs/vala-common
-
-pkg_setup() {
-	python-any-r1_pkg_setup
-}
-
-src_prepare() {
-	# Disable stupid flag changes
-	sed -e 's/CFLAGS="$CFLAGS -g"//' \
-		-e 's/CFLAGS="$CFLAGS -O0"//' \
-		-i configure.ac configure || die
-
-	use vala && vala_src_prepare
-	gnome2_src_prepare
-}
-
-src_configure() {
-	gnome2_src_configure \
-		$(use_with gtk) \
-		$(use_enable introspection) \
-		$(use_enable vala) \
-		$(usex debug --enable-debug=yes --enable-debug=default) \
-		--disable-update-icon-cache \
-		--disable-update-mime
-}
-
-src_test() {
-	virtx emake check
-}
diff --git a/app-crypt/gcr/gcr-3.28.1.ebuild b/app-crypt/gcr/gcr-3.28.1.ebuild
index 425748137ff2..868f38cc2306 100644
--- a/app-crypt/gcr/gcr-3.28.1.ebuild
+++ b/app-crypt/gcr/gcr-3.28.1.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
@@ -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.ebuild b/app-crypt/gcr/gcr-3.34.0-r1.ebuild
index 8c1028f2f520..3c984e3e1e38 100644
--- a/app-crypt/gcr/gcr-3.34.0.ebuild
+++ b/app-crypt/gcr/gcr-3.34.0-r1.ebuild
@@ -4,6 +4,7 @@
 EAPI=6
 VALA_USE_DEPEND="vapigen"
 PYTHON_COMPAT=( python3_{6,7,8} )
+GNOME2_EAUTORECONF="yes"
 
 inherit gnome2 python-any-r1 vala virtualx
 
@@ -38,8 +39,7 @@ DEPEND="${COMMON_DEPEND}
 	dev-util/gdbus-codegen
 	dev-util/glib-utils
 	>=dev-util/gtk-doc-am-1.9
-	>=dev-util/intltool-0.35
-	sys-devel/gettext
+	>=sys-devel/gettext-0.19.8
 	virtual/pkgconfig
 	vala? ( $(vala_depend) )
 "
@@ -47,6 +47,10 @@ DEPEND="${COMMON_DEPEND}
 #	dev-libs/gobject-introspection-common
 #	dev-libs/vala-common
 
+PATCHES=(
+	"${FILESDIR}"/${PV}-fix-desktop-files.patch
+)
+
 pkg_setup() {
 	python-any-r1_pkg_setup
 }
diff --git a/app-crypt/gentoo-keys/Manifest b/app-crypt/gentoo-keys/Manifest
index e0940182e5b5..cb16e0735520 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 547 BLAKE2B 7e28f281231bcb12608fdc6dde5f71e3a674177862e8a48c21b78351c6927a252d05bde35b83c1575d200f7221f4e8e1b74b4c44a26c49f3bec2e8fc03a1693b SHA512 a9d1b6eba08cac0c7037406ee1b7d0a3273157505f2317907f5b261987af5b91f67a1b364a58f58291d5ea821b651fc74db54ddc31399763c41874c0acfe0829
+EBUILD gentoo-keys-201901130136.ebuild 550 BLAKE2B f9838e2ad76d15cc08cbc81162fcc43a2ac58021f3ae03a8489145468e993749358912560a698d104b6c3cb3ffa9e3fa934f8e8fbda8abdecc76d852a2b6cb80 SHA512 f018e23a0771d91b57b95f76071197aec76ae220613457fb7baf1bd0935a9b8f97cb0f3579c4bcdf89e4a70080eaed9e7ff4420b9919e4107045d94868ed9610
 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 2cf315439b75..3c104fab50d3 100644
--- a/app-crypt/gentoo-keys/gentoo-keys-201901130136.ebuild
+++ b/app-crypt/gentoo-keys/gentoo-keys-201901130136.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2014-2019 Gentoo Authors
+# Copyright 2014-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
@@ -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 6204d3163cc9..00558b443d89 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 1688 BLAKE2B b8ca501373ddd298bdab8b1f99b39acf2ab6e70445c20074fdf157fe1f2537471f6487d44d6462374a0af4f30b3e6ea95a5ff046b43acbecf3b58689ef675a52 SHA512 8cde0bbb4e0cb00493c8d1d84a86507be02f2c4843fa1ff34f02b5b9c9367ff2bf069f07a2c63a16915665f81ff57162ca9c3bdc320f040df938877dfc6abf18
-EBUILD gkeys-9999.ebuild 1609 BLAKE2B b50da830bc2fa02b179ef168442b5861c93227cca8ee2a538bebca6d4bf9754e3aa9f49d3937163214ecb96a69497abb8cdcf1d4fdbc399d37fa2ac2e3f6457f SHA512 9d5cc7592bb733c2af73d813a59f2f94095d16464a3e84644afcd4bf0368552234542dde3ad28baf217c2a557f6d2afe993b15c904318805ed999b0ba52979b6
+EBUILD gkeys-0.2.ebuild 1684 BLAKE2B 1f418301bae7a28231c2e81db9cf4528fe75c68e20dddb728f15e0158ba853c399665da545a738241c59b00c9b1e5d7bf4fdbc85e9aa013e7f57bddb5ffb7bb8 SHA512 917e58b5c69c3c0fba5f1806c4147268417943dba9fdc911f0f61126755b320c7b8b971a6091ecb609829423a7db9fdbc37ba7f90ce7113dc210dbae31803079
+EBUILD gkeys-9999.ebuild 1605 BLAKE2B 764541d0e17fddadf4a97e140a361f0c2a3794eef9cf2c61415fdf97bee20a877f49cd9627028fd03271e1ab737c70bfe8f372aa04eed19315155ea88c7060ed SHA512 51876445bb3785a3a0cf318ce2a9bdc7ccc6dc4b228cba031f3e81c64d63d25e5a48a4d7750bea113c13a8e3855d85728afd56ac3b87420438db26f785314e51
 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 33249e7a67a3..6c43acef19a1 100644
--- a/app-crypt/gkeys/gkeys-0.2.ebuild
+++ b/app-crypt/gkeys/gkeys-0.2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
 
-PYTHON_COMPAT=(python{2_7,3_5,3_6})
+PYTHON_COMPAT=(python{2_7,3_6})
 
 inherit distutils-r1
 
diff --git a/app-crypt/gkeys/gkeys-9999.ebuild b/app-crypt/gkeys/gkeys-9999.ebuild
index 85e85cd637a7..537c49af63af 100644
--- a/app-crypt/gkeys/gkeys-9999.ebuild
+++ b/app-crypt/gkeys/gkeys-9999.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
 
-PYTHON_COMPAT=(python{2_7,3_5,3_6})
+PYTHON_COMPAT=(python{2_7,3_6})
 
 #EGIT_PROJECT="gentoo-keys.git"
 EGIT_BRANCH="master"
diff --git a/app-crypt/glep63-check/Manifest b/app-crypt/glep63-check/Manifest
index 933bd71d863f..447324c8258c 100644
--- a/app-crypt/glep63-check/Manifest
+++ b/app-crypt/glep63-check/Manifest
@@ -1,3 +1,3 @@
 DIST glep63-check-9.tar.gz 73445 BLAKE2B cd229065da9a4663491a891787d2a9e719cd9d61ea5974393199ca418413e7e1c6b73a3146577b26029ceb3302f430ed1051c9d050278b098b18407e95c1cac3 SHA512 86c49ffe2b8dde3735b85ff4808862c460b1e832fa9c3fca4fc2ea776d314c29ed2442adef2e1dbca1cec81b6ea29bbb417b123306602dfaa611b5153dddb7ac
-EBUILD glep63-check-9.ebuild 658 BLAKE2B 3e742acbd0fdde1670de3348739b10f70b0ccee4b50615ddd3b49225847c5c2e2454652ca8748330e3adac7f9079ea7bb272b3160f4b8daa14a4113fd4793265 SHA512 470627606b86e27d4fb20e6f0281dc13db43e193ae4f3c2d71da21d949d91253afdbc5a375fd36f8505bfca210a86d733663c2ac4dd64785da63be75c73542de
+EBUILD glep63-check-9.ebuild 656 BLAKE2B 1066fcefbad0d38fd6038e9017f1565a5b4882ec21264dbe24f0029b4d7b4898c1d45ea8e233c624afc4f7a246d52d470cea6c990ed8a87ee70f8236f16ee06e SHA512 34ee34b8d6307718d66485ca0143a6fdee84fe2d07b924b0374fe5dd72c08b43bac52c0ed02392f5995d1ccc225ce87bffe42198f03c463739d3a7b8baf312db
 MISC metadata.xml 537 BLAKE2B cc05c3872c522fdcc2355da9d451f9ad102d23e2e5de657f447ce5c9441a4379fb5f6560cd22a8be325f322e901b65917b11630fc0229bd0e952c6f8b6b64bf0 SHA512 493bcb28f9144c49050445de98b54e19730e46cc24df02b15859f4114f4fa8775431aac9d8fcb4f50639609680656b108f6c4ca47f67b38680f926cf9610ccd9
diff --git a/app-crypt/glep63-check/glep63-check-9.ebuild b/app-crypt/glep63-check/glep63-check-9.ebuild
index 4f614942037d..3e013ca5ed36 100644
--- a/app-crypt/glep63-check/glep63-check-9.ebuild
+++ b/app-crypt/glep63-check/glep63-check-9.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python3_{5,6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 
 inherit distutils-r1
 
diff --git a/app-crypt/gnupg-pkcs11-scd/Manifest b/app-crypt/gnupg-pkcs11-scd/Manifest
index b08fc9f047e0..e46154c23017 100644
--- a/app-crypt/gnupg-pkcs11-scd/Manifest
+++ b/app-crypt/gnupg-pkcs11-scd/Manifest
@@ -2,4 +2,4 @@ AUX gnupg-pkcs11-scd-proxy.confd 38 BLAKE2B 56951cac6c364a75191cbcf5b074e537bf97
 AUX gnupg-pkcs11-scd-proxy.initd 716 BLAKE2B 05f2057b6a2bc1824eef62139a70b193152bdf9b92c97244d5574d81d010a19978b2905f952539f0eded8b64e045053c7b0995aa2594dbcbee3eb8e44b149cd5 SHA512 b1719720150d7380c96e987bfa0f7932bdd30aa9462f9c11d9ac06ed58efbb0ef8c60df27b50dceed812a238ee01007abccd99edf7dbea0efcf0de2d35d032bf
 DIST gnupg-pkcs11-scd-0.9.2.tar.bz2 147337 BLAKE2B 52784721bd91929c9d6efdae599893f5425d02e5621ded69d5bc2b5dfa5dd56ca6e0989d99879a2de245e53ba7add3fdacd58fb3b1200135b0a0e618163ade2d SHA512 6afb9f0c50976636df611a0204edb0ec75aa194ba332314e3c2d7228ecf798e5f79923202f8f189b1e4aefa236a46165a5e3f0e0d98320dc4fac2bd9ac38249e
 EBUILD gnupg-pkcs11-scd-0.9.2.ebuild 1102 BLAKE2B c7f17b024300a005205d45ef191127789b668b57583c3d07a6879d5bb76e7b859e0953de030720936812737dba72100945d0d0512481b74c31950ae27d109543 SHA512 6d66aa3080e6fb8bcbd337c690dedea8623f6cb2e8c4906519a38ed9520461be6ab13bf9126f4fc1468152f5fc4ba5646b31b39608f1effcf160e9d3e1fd15a8
-MISC metadata.xml 563 BLAKE2B 67baabaaddb15da69e52484964c335ace26f38e96cf539f7f959a9d34de52f52dd6a12890ca2ad2d181c61e4a958cefb97b8abda27d3b75c930bd1a01c0dd014 SHA512 6ba21eb5bd095961e91f699864f08d07ef78207d656ea6f89a3b7c49d0b2a6aedfe1b912315b9730c3f2615428ec4bedb0f03599c5a76739b8bfd51735ab8c20
+MISC metadata.xml 490 BLAKE2B 362c13b5432f38842cc57e006061562e5f8b7474a12d7e3bf714c357882e6bb015a51eafd2831530bb4d67b7ff07d9867fa737567c9f7c7e12c134019e3475a2 SHA512 b49b8534ee93f0369af72c8af3fbe8bbf16769ba7ca368afcdf36220ea3650dd8ab0b8fcfe7804a14ff7cfe5cffd3f3f830ce70b3712ad7e7493de9998f93e9e
diff --git a/app-crypt/gnupg-pkcs11-scd/metadata.xml b/app-crypt/gnupg-pkcs11-scd/metadata.xml
index c81bfe31ed58..93e9b6874c3d 100644
--- a/app-crypt/gnupg-pkcs11-scd/metadata.xml
+++ b/app-crypt/gnupg-pkcs11-scd/metadata.xml
@@ -1,10 +1,7 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="project">
-		<email>crypto@gentoo.org</email>
-		<name>Crypto</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<longdescription>
 		GnuPG scd replacement that enables the use of PKCS#11 tokens.
 	</longdescription>
diff --git a/app-crypt/gnupg/Manifest b/app-crypt/gnupg/Manifest
index 100c89ca41b2..f5674dce1a67 100644
--- a/app-crypt/gnupg/Manifest
+++ b/app-crypt/gnupg/Manifest
@@ -4,4 +4,4 @@ DIST gnupg-2.2.17.tar.bz2 6717554 BLAKE2B ad052a0d1e970fe7748563a0ffa105d427e3d9
 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.19.ebuild 4489 BLAKE2B bb208c75fd25593169ab9683837ae8e1eaf2b804bc5e9ef0603d8b1f4419ac004b2e98efcefb11bb06a8b36a9cb4d2d3117b9333c329a1c2dd2998fd6abe5a20 SHA512 773032d850e56b525332b5589f564b79b85c2cab7c8909f5fc945b0e4a5cd33364f56eec6b2655d34f5e8ca034bea1e484d218f609787c652bc3336012417f9f
-MISC metadata.xml 1313 BLAKE2B 3e9b3fbc3decac1676bda2b09c822ddd723d4e08fd9d63196a7f0c46fe4275a06cd8b87815e1781fc999747ff0da9eb1823db81a0b5dada5482519e2f4c925fb SHA512 d03cfc1b7b44948a594bc2df9c5f79d250dd7601f4579f832f0ac3814b640e399b3f428737a16e7098772b4ae2dee157b6958b612aae2b59c21397e99a5d9aaa
+MISC metadata.xml 1212 BLAKE2B 36bd1e7478abbb579b33292418dc621c65869151cfd0cbe9cb7b553adf92b606273f415db763ec5c3884e91f29929f79de1cbf15cc47626b1115b168d567790e SHA512 646ec87262b7069808976e17fae4b2101f9a8aae7ad5bbd10abce6077a5e4e741eb5692997af4383cf8cd3e6b03ded83f9dd5245ed112533c6a6e4c752b1060a
diff --git a/app-crypt/gnupg/metadata.xml b/app-crypt/gnupg/metadata.xml
index 6abd36d9b6a3..eac23b93ccd8 100644
--- a/app-crypt/gnupg/metadata.xml
+++ b/app-crypt/gnupg/metadata.xml
@@ -5,10 +5,6 @@
 		<email>k_f@gentoo.org</email>
 		<name>Kristian Fiskerstrand</name>
 	</maintainer>
-	<maintainer type="project">
-		<email>crypto@gentoo.org</email>
-		<name>Crypto</name>
-	</maintainer>
 	<longdescription>
 	GnuPG is a complete and free implementation of the OpenPGP standard as
 	defined by RFC4880.
diff --git a/app-crypt/gpa/Manifest b/app-crypt/gpa/Manifest
index 849f7d29e487..2eb06682bb4c 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
-MISC metadata.xml 236 BLAKE2B a7bb92e6d53f7252ee56a885bf098930e228a76a75bca119358ca860901ceeecccc43efe5279c54250ebda58f77ae9c97d2ae540d8b399283cb3aa348111fcd2 SHA512 5f6cd6a85527534d5de7118de5af212ee3044c8c5530a7f7087a28074a2d4ab7be1728325bd985adc063dc795d3cf2b1c4e58a4c4c4ec02d739bd4bbc544ef08
+MISC metadata.xml 251 BLAKE2B d75781c46bd2764ba6a64a2ba01f0098ac80664dff29e71d7804bf2687cb04d0255c6f0f33f29cec0aeb5507307be34d78de33f308a032990759bca2ce26108b SHA512 bd4fa9d3efc3d892de2b5912049b96e4c55bb081c85d032e1cb84f68e7e22acbca76b82b20c9dae524e9c7a7802dd0b7dfed9a8f7521e04bd8c0c115213f4346
diff --git a/app-crypt/gpa/metadata.xml b/app-crypt/gpa/metadata.xml
index f1c3d59fb213..21a735dbe5f3 100644
--- a/app-crypt/gpa/metadata.xml
+++ b/app-crypt/gpa/metadata.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-	<email>crypto@gentoo.org</email>
-	<name>Crypto</name>
-</maintainer>
+	<maintainer type="person">
+		<name>Lars Wendler</name>
+		<email>polynomial-c@gentoo.org</email>
+	</maintainer>
 </pkgmetadata>
diff --git a/app-crypt/gpgme/Manifest b/app-crypt/gpgme/Manifest
index 9b7ddb07fa89..90cd15a357d4 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 2889 BLAKE2B 5f09f5575c1f2cd4a8e56c7a72590b7694aa1b4e90e101ac6e043979607571b7821261340f07b88bb07aa04dd72acac546cef6e33afea758b996bbd990331444 SHA512 ae695ec9b0396ef526796e8117b59872773feaa8aa7804754fa507dcd35364b11c0907059cc8755b5b652ad74a0b9ab6adac453c4d801509e09cdcdb850e9b81
-EBUILD gpgme-1.13.0.ebuild 2880 BLAKE2B 1757af9addb2588bab4986aa25be384d39311a410847605271ad457baf5632588a27aab05a42f442bc7289eb7c0052e650279cc7ae05410866d76557f869c620 SHA512 3e27509a9f66dfbea7c4cd9ebccb93c3c69d815f9ef50853009bcef7b9378e2becfbd99b088e4cfa78e6d3e15ea45d02b44fc105bff7e5f9ca2e41092c8b8b89
-EBUILD gpgme-1.13.1.ebuild 2890 BLAKE2B b884b1d30050268c74aed3bebfd8776a2ae3c556348bbfd8ea320b42dfed31882599f84a2ce0259d228e18668568826adcba619d2611661ab805e49902d8505d SHA512 6b3094453a3bca6968e2b0c7a446de4e6ca8f13c87468fe362ab74226b1d19dfea865c773a2e36411cbb67d2072f96db3f32a2ff91b79590bf7392cf67c2f92c
-MISC metadata.xml 315 BLAKE2B 18ded955b84237e03c8d14dc65f6b869c12674d4a87906f8fbc7650d02b20418cc2d97e9be6ea32f1aa170a8763cad3b91f9ac9b821a825fea0583cc66bed728 SHA512 502b5daf04f1b706514aba7d18cd454e1e99f63462159d3f5baebd1617bfa4760c7ea6fae9b7624fae2bc5943f8950211c6f4b326b6b62c3cf7eba4fc1255334
+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.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 91216da902ff..365a5002510a 100644
--- a/app-crypt/gpgme/gpgme-1.13.0-r1.ebuild
+++ b/app-crypt/gpgme/gpgme-1.13.0-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+PYTHON_COMPAT=( python2_7 python3_{6,7} )
 DISTUTILS_OPTIONAL=1
 
 inherit distutils-r1 flag-o-matic libtool qmake-utils toolchain-funcs
diff --git a/app-crypt/gpgme/gpgme-1.13.0.ebuild b/app-crypt/gpgme/gpgme-1.13.0.ebuild
index 550f71b387cf..07c417535970 100644
--- a/app-crypt/gpgme/gpgme-1.13.0.ebuild
+++ b/app-crypt/gpgme/gpgme-1.13.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+PYTHON_COMPAT=( python2_7 python3_{6,7} )
 DISTUTILS_OPTIONAL=1
 
 inherit distutils-r1 flag-o-matic libtool qmake-utils toolchain-funcs
diff --git a/app-crypt/gpgme/gpgme-1.13.1.ebuild b/app-crypt/gpgme/gpgme-1.13.1.ebuild
index 79e06fd1e827..490dea035333 100644
--- a/app-crypt/gpgme/gpgme-1.13.1.ebuild
+++ b/app-crypt/gpgme/gpgme-1.13.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+PYTHON_COMPAT=( python2_7 python3_{6,7} )
 DISTUTILS_OPTIONAL=1
 
 inherit distutils-r1 flag-o-matic libtool qmake-utils toolchain-funcs
diff --git a/app-crypt/gpgme/metadata.xml b/app-crypt/gpgme/metadata.xml
index 89e984954f11..a07228517f22 100644
--- a/app-crypt/gpgme/metadata.xml
+++ b/app-crypt/gpgme/metadata.xml
@@ -1,9 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="project">
-		<email>crypto@gentoo.org</email>
-		<name>Crypto</name>
+	<maintainer type="person">
+		<name>Lars Wendler</name>
+		<email>polynomial-c@gentoo.org</email>
+	</maintainer>
+	<maintainer type="person">
+		<email>k_f@gentoo.org</email>
+		<name>Kristian Fiskerstrand</name>
 	</maintainer>
 	<use>
 		<flag name="common-lisp">Install common-lisp files</flag>
diff --git a/app-crypt/gpgstats/Manifest b/app-crypt/gpgstats/Manifest
index 33a113927b34..38ff0611d0e5 100644
--- a/app-crypt/gpgstats/Manifest
+++ b/app-crypt/gpgstats/Manifest
@@ -1,4 +1,4 @@
 AUX gpgstats-0.5-flags.patch 668 BLAKE2B 5436cbb050c6f52edf74182127f2fc5e50c22808f3f8b80600c362ba652fd3b0ce927d9ead7f4ca28425046021b3e477e56a719bc63ab4a45b6e0025b259a00a SHA512 8f54993f957d8d93da495530dea25734f9e5fedc1d5dc17aa4b517daabc88f8162ab2565159a51daa203ef2b039e80122e009bd23dab862be87ad5a75e072546
 DIST gpgstats-0.5.tgz 6691 BLAKE2B 681a4bb06b4ab7156c35d81510238420121d1854d3f8f678fce6017331e2f9c6db9ea413f45dcce1570f917fd636a586ee816f998dbd17347473e1da964bd617 SHA512 273f08af37089eb43cee65fa06ff8023e1951fa4649bf208e01d6bc453e4131c11128b511c6cbd8396a7bd93722904e8930168656994e3d4d055024c3d5fb649
 EBUILD gpgstats-0.5-r1.ebuild 573 BLAKE2B 01cb2a505f6baec4ac7e40b42bb4b98f4bdd45cca677764f5a68c2e8fb880615c41cbe66bc1bd47ddfd850227beb6e9f08b970b82480d9ab8cdc4ff3f7a9b213 SHA512 843c09ba4fa5ee2943fae404384141bb13608a77d7a8105416b40da5b3f362e7ff6ef9d8c1f6166e51e754e70c217efca2f8d3337202b62ca8915c4a7571315c
-MISC metadata.xml 315 BLAKE2B 9189293d4d9321f31a518c12d4ea70700ddc60d5fc1d89e5215cb2080c6ca2b9f2005b635a11dcfd3d75919f9d49f02f662e67cdb75d5addbc002502c3e0ceb9 SHA512 2b356b01e98ef77d3f356dbc758f08c0ea5438a0df80b2b2dc16c90cec34c437ec51b6f3b7f81ea321d9e42ac4016e7c9e83417e476c0ecb1b3741f709a469be
+MISC metadata.xml 216 BLAKE2B 20531789dc11e43feee7ec315a0c1c7249fdf73764e29cb7d6db439826e9ff72f24a5cdb8eb7f1ab99bbb41fb6e4226874a1d1fa4185de52598602bb3b0479a3 SHA512 e881b59fe49746eb25ad66c258b41aba501e4eb563129093a3898ea970a20506e7898f7c355cfcf99605234962bf2c77c1309c258b9a2b84ee4302ccb71c9dbd
diff --git a/app-crypt/gpgstats/metadata.xml b/app-crypt/gpgstats/metadata.xml
index 0106d597ab3c..79d462e85571 100644
--- a/app-crypt/gpgstats/metadata.xml
+++ b/app-crypt/gpgstats/metadata.xml
@@ -4,8 +4,4 @@
 <maintainer type="person">
   <email>robbat2@gentoo.org</email>
 </maintainer>
-<maintainer type="project">
-  <email>crypto@gentoo.org</email>
-  <name>Crypto</name>
-</maintainer>
 </pkgmetadata>
diff --git a/app-crypt/heimdal/Manifest b/app-crypt/heimdal/Manifest
index 9783e7b0e7c0..573d275c8c4a 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 4349 BLAKE2B 0e0e8f925d391f3100c9b87e696a049e9c4a25653d150876ba86d145c5a11f6b20853c6afeb747061cf3bc9683ab5d4ff95c864c168712c4555d1f1a82bc3d7f SHA512 a2d7a38214626053b96e15170f1a33e29cb5e70ac21dbf8588f0816cbe8dead6e6b4cc35d851e1124566a19a9453a59d08092f607611b2e15ce64576a28db4b7
-EBUILD heimdal-7.6.0.ebuild 4554 BLAKE2B 9e6a574c93ab56f033ff9386ca13f00f0b366eff259e8d488b9e9bd62fead797a9c41f30be26df02b8e55eeb25fbbdc18c4315c9ce23c432a1e6c6b758083bd3 SHA512 520d10a9d350c2398baf40ca1a0cf85b02db4ccfcdc61b174d64317dc448a9d4b7a78112ba490971335c2f90fb3e399635c35e49bb18feca5e94d417c693c05a
-EBUILD heimdal-7.7.0-r1.ebuild 4547 BLAKE2B f3f24342a0bce643340ebe0e47e4ae7fa7e4c155d7f7a071acb58e5fcafa95c476dd238edea6153da694f63edfbad6336a16248dd98f68606535e8d1a6c1635b SHA512 9742266b8dd2f2b6aab2524ffb339c0910c98c3e8d1294f00d92f4c4aaf53a82d3e9780d07cbf184389d384b3a69a62c41bdd5bfb06adb2d9079aed4ad9ab22f
+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.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 0ad3f4972ad7..8db06b10a500 100644
--- a/app-crypt/heimdal/heimdal-7.5.0.ebuild
+++ b/app-crypt/heimdal/heimdal-7.5.0.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python{2_7,3_{5,6}} )
+PYTHON_COMPAT=( python{2_7,3_6} )
 VIRTUALX_REQUIRED="manual"
 
 inherit autotools db-use multilib multilib-minimal python-any-r1 virtualx flag-o-matic
diff --git a/app-crypt/heimdal/heimdal-7.6.0.ebuild b/app-crypt/heimdal/heimdal-7.6.0.ebuild
index 9fa8c8515999..e459e0905a2e 100644
--- a/app-crypt/heimdal/heimdal-7.6.0.ebuild
+++ b/app-crypt/heimdal/heimdal-7.6.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python{2_7,3_{5,6,7}} )
+PYTHON_COMPAT=( python{2_7,3_{6,7}} )
 VIRTUALX_REQUIRED="manual"
 
 inherit autotools db-use multilib multilib-minimal python-any-r1 virtualx flag-o-matic
diff --git a/app-crypt/heimdal/heimdal-7.7.0-r1.ebuild b/app-crypt/heimdal/heimdal-7.7.0-r1.ebuild
index 21fe1180298f..a922bc8abb6a 100644
--- a/app-crypt/heimdal/heimdal-7.7.0-r1.ebuild
+++ b/app-crypt/heimdal/heimdal-7.7.0-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{5,6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 VIRTUALX_REQUIRED="manual"
 
 inherit autotools db-use multilib multilib-minimal python-any-r1 virtualx flag-o-matic
diff --git a/app-crypt/hmaccalc/Manifest b/app-crypt/hmaccalc/Manifest
index e20aa21b473a..889a901745f9 100644
--- a/app-crypt/hmaccalc/Manifest
+++ b/app-crypt/hmaccalc/Manifest
@@ -1,3 +1,3 @@
 DIST hmaccalc-0.9.14.tar.gz 111893 BLAKE2B 30aebd67e49db354c616110477e78fd6923df3ddfbe5e5023fd791bd90c783031da8c631fbfc9e5f2bdae06a08da1d56a08df921ddee359b630c5665e833ad4e SHA512 688a72b4e534ca4a1d45a116c0361ffd389de93dfdeec68e35cbffe0be13832789abaf33300003e12c7317ba473d3a0415f4b22cb3b7b36946c04bd40aa49184
 EBUILD hmaccalc-0.9.14.ebuild 571 BLAKE2B 9864a99137f4c76df27c3762e401192eb7239c062adf254b1e3791a118e25fc4caeb998654cba74d8125f09d898dd4e3b73bb3084879502f8995e54f6aa75204 SHA512 546d13ab95aec19fe7f8ed86b120ec4210cc0f6492c09ba440f5f0cd8e543035376b03fb4a4bd448928e993cd1be84380c6958863adbbe40a3c3448ce82926a1
-MISC metadata.xml 671 BLAKE2B 276b40259996c8556788b1aecc645cd2e344908e8705d4b73771401a07eb1a75132d81589ef046ad7e1b72d4421251a9690e10668d43a67a0cb925be58835e77 SHA512 d4bb7d03ed78f667255e38138262ccdfe33c42707e967817c52d8f445552b9502d6ed1a10a96df7e20cc62f7fa06c2285057a2f81cff1004b28c6e0c20fb17b7
+MISC metadata.xml 604 BLAKE2B 5eda5a1dc5cca63257f5f68b72124e30027499de6bf6358d0ad47b7f3545a10bf00cb92ffc842b2f2a1c2a68dfc1cbaddbc8354c0f62ec9e9eb1b9660525042f SHA512 f05d00d71bedeca8c3f991354cdb7fa15ac3ad50b2d60622fabaf6c0dc7b73f122a565ea0700e4218b6329c073fe2b461353c5f4588b5d25d26acf022148727e
diff --git a/app-crypt/hmaccalc/metadata.xml b/app-crypt/hmaccalc/metadata.xml
index 6557d925ad15..4afb6241f8ce 100644
--- a/app-crypt/hmaccalc/metadata.xml
+++ b/app-crypt/hmaccalc/metadata.xml
@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-<email>crypto@gentoo.org</email>
-<name>Crypto</name>
-</maintainer>
+	<!-- maintainer-needed -->
 <use>
 <flag name="fips">Enable NSS FIPS mode and support only the FIPS-compliant functions</flag>
 </use>
diff --git a/app-crypt/jitterentropy-rngd/Manifest b/app-crypt/jitterentropy-rngd/Manifest
new file mode 100644
index 000000000000..95d8051f36a3
--- /dev/null
+++ b/app-crypt/jitterentropy-rngd/Manifest
@@ -0,0 +1,4 @@
+AUX jitterentropy-rngd-1.1.0-do-not-strip-and-compress.patch 581 BLAKE2B ee6f98d762fea06504ea7157ea2b13ececeaef1ee204cf0e5d63fc0932e1c41da13b2a8ad0cb8564548fcabe1989693ed16c7d461f75844323864e457e8fb804 SHA512 7c42e8deebf0d36fdd91b879cbc28eab1a92d413f64ab5f19eeaa214b51f6e96866c1bd53fdd6c2c4e335ae156cef24d2bba4c1dd6b557d96e89b61618703241
+DIST jitterentropy-rngd-1.1.0.tar.gz 25891 BLAKE2B f711b173c68b74cbc0dbac1ae1b7a2beb5352b38e411f96172aa36ac7f720f05469f5fac2fa97b3514ec11fbe2ccfe0351ee7df8f51a8b36a566635ef93e4d08 SHA512 32835475b604e502caaab9b0d1cd9fe2920c126a27841669f6cf9c717094bfd4c11feab0f9f706ee4cf4caeedf26ced7039075499a3faaf41830c72968544646
+EBUILD jitterentropy-rngd-1.1.0.ebuild 530 BLAKE2B 0ad8384055a7405ab4e19cb57f5454b060f8b9fec3692ad8c00ff60822457a5810dce1f7654e61f2a061b5aac21a9280288eb7a2f48e2d5782bdecd7290c78d1 SHA512 080c4c3790641385159ec11f2ac1d6aa5321a54e84466ce179a38110ba5489a74811933218c2edff561fbaa6d6cf35bc8d835cd2d0eb90ad2e77ad57a6724772
+MISC metadata.xml 598 BLAKE2B 50854b04b1cf0b6370888000503a850d5a34b9cc49fbe917f26ff0a6d4fed2204e1b1921d06a1238c47d31fb92c82d8631a56c2fa60e6ef88b7d84aee4897aed SHA512 d13cb55c4649dff554018e04025e741c51397785f2951d1aa8ceb0f7712a2ed48c39b57ac4f6c197f8a4c96bfe8ba44023107201df5ab603d7ea2f11b0713227
diff --git a/app-crypt/jitterentropy-rngd/files/jitterentropy-rngd-1.1.0-do-not-strip-and-compress.patch b/app-crypt/jitterentropy-rngd/files/jitterentropy-rngd-1.1.0-do-not-strip-and-compress.patch
new file mode 100644
index 000000000000..069c005df3a6
--- /dev/null
+++ b/app-crypt/jitterentropy-rngd/files/jitterentropy-rngd-1.1.0-do-not-strip-and-compress.patch
@@ -0,0 +1,16 @@
+diff --git a/Makefile b/Makefile
+index 55b65b1..b04f270 100644
+--- a/Makefile
++++ b/Makefile
+@@ -36,10 +36,9 @@ $(NAME): $(OBJS)
+ strip: $(NAME)
+ 	$(STRIP) --strip-unneeded $(NAME)
+ 
+-install: strip
++install:
+ 	$(INSTALL) -D -m 0755 $(NAME) $(DESTDIR)$(PREFIX)/sbin/$(NAME)
+ 	$(INSTALL) -D -m 0644 $(NAME).1 $(DESTDIR)$(PREFIX)/share/man/man1/$(NAME).1
+-	gzip -9 $(DESTDIR)$(PREFIX)/share/man/man1/$(NAME).1
+ 	sed "s|@PATH@|$(PREFIX)/sbin|" jitterentropy.service.in > jitterentropy.service
+ 	$(INSTALL) -D -m 0644 jitterentropy.service $(DESTDIR)$(UNITDIR)/jitterentropy.service
+ 
diff --git a/app-crypt/jitterentropy-rngd/jitterentropy-rngd-1.1.0.ebuild b/app-crypt/jitterentropy-rngd/jitterentropy-rngd-1.1.0.ebuild
new file mode 100644
index 000000000000..bd3a671e48d4
--- /dev/null
+++ b/app-crypt/jitterentropy-rngd/jitterentropy-rngd-1.1.0.ebuild
@@ -0,0 +1,24 @@
+# Copyright 2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit linux-info systemd
+
+DESCRIPTION="Jitter RNG daemon"
+HOMEPAGE="http://www.chronox.de/jent.html"
+SRC_URI="https://github.com/smuellerDD/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+PATCHES=(
+	"${FILESDIR}"/${P}-do-not-strip-and-compress.patch
+)
+
+src_install() {
+	emake DESTDIR="${D}" PREFIX="${EPREFIX}/usr" \
+		UNITDIR="$(systemd_get_systemunitdir)" install
+}
diff --git a/app-crypt/jitterentropy-rngd/metadata.xml b/app-crypt/jitterentropy-rngd/metadata.xml
new file mode 100644
index 000000000000..5db19de18fb4
--- /dev/null
+++ b/app-crypt/jitterentropy-rngd/metadata.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="person">
+	<email>tamiko@gentoo.org</email>
+	<name>Matthias Maier</name>
+</maintainer>
+<longdescription>
+	The Jitter RNG daemon provides an entropy source that feeds into the
+	Linux /dev/random device if its entropy runs low. It updates the
+	/dev/random entropy estimator such that the newly provided entropy
+	unblocks /dev/random.
+</longdescription>
+<upstream>
+	<remote-id type="github">smuellerDD/jitterentropy-rngd</remote-id>
+</upstream>
+</pkgmetadata>
diff --git a/app-crypt/johntheripper-jumbo/Manifest b/app-crypt/johntheripper-jumbo/Manifest
index 1eff8f226cc2..39e34c5ca4c8 100644
--- a/app-crypt/johntheripper-jumbo/Manifest
+++ b/app-crypt/johntheripper-jumbo/Manifest
@@ -4,4 +4,4 @@ DIST john-1.9.0-jumbo-1.tar.xz 33638768 BLAKE2B 2fd6813e234308408d42581705ee8b25
 EBUILD johntheripper-jumbo-1.8.0.ebuild 2896 BLAKE2B 42aaf59ab405dc2f83ee5641fe028ef63934e5ca91a91b3f04d7c148b2ea47a5df8a6b9e54b3e0a19ca54e5cf2e9722d214e1c9dd8b0d1e7cc6f5304204eecd4 SHA512 1d7856a78537ae023d0a58d57337743053147d90d25df9c4bbc0ef0249b6d06385c89cc9e4f239c388f729d82828da5e3f3d88a64162ad0c5a687cfd8941025b
 EBUILD johntheripper-jumbo-1.9.0.ebuild 2794 BLAKE2B 3dda6a008d9d76a4fc3276adc685de7d95750c51c216121964b10f584e19e584213086d3b2a1ae583419c30858ca131b67f7f4b4e54bd7dd598aa0590db90b4e SHA512 4dfcd423c747377bd071c6c44ea366f3d9381828ed44bbfcdcc305ccfa6de0affc18da841a32d92c362c043a8a98be00f15cd333338e9f1a86ea001c9e1ccb36
 EBUILD johntheripper-jumbo-9999.ebuild 2831 BLAKE2B fbf02041abd851e037644a7dae6d419ed85785290be3eb929069091751b243630c241bd494516932a520d8f3a3f59510f4e2d4da97d47878aaeca11c7a50d2f9 SHA512 b3290798831d3fc9d8d0556a41108d1bc8d6e731cfb0125df47583314c9c2eefb15e96fa9ba75b007aaed515fe29d0c5685cfc5beeb80453a34a5e9a55a50732
-MISC metadata.xml 573 BLAKE2B bfe4625ed3871bcc6c083ce63f30b433c6904411db832f5833b753c02dda92d60086264b4167fc59c7b3130de2db73e4d8814c606f02372669c866c185d6477f SHA512 590ef9c3538bbda4e19f88acf78988510343771e4e764d68d0872add996bc041c28aa8f16efcb4b21232870ff7c3e768b3512f39f0da900fedeb99210c200fd6
+MISC metadata.xml 472 BLAKE2B 82b4e6bd8682bd19ffc1140a8225e1766333af7a10331e4ce5a0b1306959b267a23df2429b593bd74f0bc61e73bd7df6a756cc2820438335c3a565b6208d9219 SHA512 63bf68deac15fd3e96d6ccf7d4ca4c52192c79bf1d075305d1e9757b3ce20dd5f868ef4c908dbe020d2fe6884756b236281ec8902cc4294a3eac96aa05571abf
diff --git a/app-crypt/johntheripper-jumbo/metadata.xml b/app-crypt/johntheripper-jumbo/metadata.xml
index 6eefb4340ea5..b88d77761dbb 100644
--- a/app-crypt/johntheripper-jumbo/metadata.xml
+++ b/app-crypt/johntheripper-jumbo/metadata.xml
@@ -5,10 +5,6 @@
 		<email>zerochaos@gentoo.org</email>
 		<name>Rick Farina</name>
 	</maintainer>
-	<maintainer type="project">
-		<email>crypto@gentoo.org</email>
-		<name>Crypto</name>
-	</maintainer>
 	<upstream>
 		<remote-id type="github">magnumripper/JohnTheRipper</remote-id>
 	</upstream>
diff --git a/app-crypt/johntheripper/Manifest b/app-crypt/johntheripper/Manifest
index 66a47fbcb0e5..d034be12a0e9 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
-MISC metadata.xml 515 BLAKE2B 498289b766df94a5c7e5f770804658821c5c2a3428725c53141c784a5ecf2e9229277175f941c46923009c43df6a16ac8ba27bb8b7e16b852409a558548b6c47 SHA512 f5893e1cb42c3f71c07968a099b2ce67f27aac202fec65860b8f67ae006691821efba255108436c8a5e752674cb76c7d43c8bbbf97b864b1067dfd8d66c5a474
+MISC metadata.xml 408 BLAKE2B 061c3b13a1528247c36a3c97dda9b4eb044a06abb953180723a83b7c069e6b40decac9e12605a17d9a6ed4d896ada27acbf8d2c42044872e64efa4cb895b609d SHA512 cb3df73a8466c79899cc1a8c2ed2431a84300fe09dd2a930c958c9d1fd68004191f2384722fe8a96ccca305be50143170b2722c672ec807971c9265064ca0d35
diff --git a/app-crypt/johntheripper/metadata.xml b/app-crypt/johntheripper/metadata.xml
index 40069f63efa1..d15bc1c7ab36 100644
--- a/app-crypt/johntheripper/metadata.xml
+++ b/app-crypt/johntheripper/metadata.xml
@@ -6,10 +6,6 @@
     <name>Rick Farina</name>
     <description>Any and all help appreciated</description>
   </maintainer>
-  <maintainer type="project">
-    <email>crypto@gentoo.org</email>
-    <name>Crypto</name>
-  </maintainer>
   <upstream>
     <remote-id type="github">magnumripper/JohnTheRipper</remote-id>
   </upstream>
diff --git a/app-crypt/libb2/Manifest b/app-crypt/libb2/Manifest
index 29870cf9f7ec..78a53060f921 100644
--- a/app-crypt/libb2/Manifest
+++ b/app-crypt/libb2/Manifest
@@ -1,6 +1,4 @@
 DIST libb2-0.98.1.tar.gz 280826 BLAKE2B aa8c3dee3032f457410479be12d00c79a6ca6a7c0376a5c70265d30ff25b50663171f7096141834d4faa4dd5027f38b23b774e59be63475a3ecba855337fb1aa SHA512 a666fdbd1efa9cfff3028e953c62f21ba092c6733ccd12d4d04f1f836fc9747fc90053bc9166510d251d332b91e133853d2cc9b61c279517bd65b05e8483250b
-DIST libb2-0.98.tar.gz 275076 BLAKE2B 7c0aa473a58a5ceb6e913487cc6f0078e6cab661bd26cb1f5611473b430213521a23adbde227da6d7561b4d581369e268308ae6b2a10da5399c0d2d6ab288b26 SHA512 be400d16ab00b3006ec7412dcbf580427600f4997cee19c0448d849ff8bbbb58bbb7be3d49e4052cb1b6791b6bed9c9cc48b51da3ec77b2fdf3d197ccf0c8073
 EBUILD libb2-0.98.1-r1.ebuild 1744 BLAKE2B b2256260ca7312c87184a92e9b495fb7a7f4fed6353756f3c995c108f71b1abcb9dc304174760a8b624a743c3c39d9e4b275dc50c1daf3bfddfd18d100b0f2cc SHA512 73a90667e0786c443cccc566d43964ad78bfd10cd019f8d3544d2a3842721a58c225d509fedde0b34888da7031e04aabaac5f6311fe3f67ffa6034db646c4f01
 EBUILD libb2-0.98.1-r2.ebuild 1809 BLAKE2B 2d5c467c920014e91a4204466ff77bbbec319396442557821c9b4ba2ee004bf112b4a05ab775260c8dacdf5c8b7eb8588f77d99d40cd25f0eab4d316c4e2a03d SHA512 e7969e74044073ab89ba2cfa39b9a8dd9b4d8f824400d092688c96d2eca7a9c9da9c934b57628ea6a9e502d9d5bcc2e5fb6be0511f92c277624e44b62222e20b
-EBUILD libb2-0.98.ebuild 1015 BLAKE2B 8f6fc70a953aea90fa5dbecd894dd5b1335fe9bf737547f8c2c42ab46cc8b718f0bf1ad941b54820b36ce62829a3d2d4d0de1d6e8c34c90c839d4019781a0765 SHA512 7d1a55ff33988e20ab4588f17dc0a1d982c02ea785e1d9535ff740b923129c5491282191e77d6a8dddcb500bce22626face82b40354fcb4da207a2bdcbbdab2b
 MISC metadata.xml 688 BLAKE2B dafb52bda4cb5c27bbbb4cba85c178ce11e9511f0dedfed4ff3afe40789a28e4a8c9c275a1be7e86568419c29011c1a4ae5c67f7b778ece3c750d8a919d5d930 SHA512 a98e96312724a3af5d104e4adbb9f60cac16124c9beac2622045985c1b0c2276ff1d56561d59cfb5a24b57d29577312c7e73bdfe73bbe735c1c320b699065b11
diff --git a/app-crypt/libb2/libb2-0.98.ebuild b/app-crypt/libb2/libb2-0.98.ebuild
deleted file mode 100644
index 64ec18c1de9e..000000000000
--- a/app-crypt/libb2/libb2-0.98.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools
-
-DESCRIPTION="C library providing BLAKE2b, BLAKE2s, BLAKE2bp, BLAKE2sp"
-HOMEPAGE="https://github.com/BLAKE2/libb2"
-GITHASH="0d7015f6a640a63bc6c68562328e112445ea9d5c"
-SRC_URI="https://github.com/BLAKE2/libb2/archive/${GITHASH}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="CC0-1.0"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc64 ~x64-macos ~sparc-solaris ~x64-solaris"
-IUSE="static native-cflags"
-
-DEPEND=""
-RDEPEND="${DEPEND}"
-
-S=${WORKDIR}/${PN}-${GITHASH}
-
-src_prepare() {
-	default
-	# fix bashism
-	sed -i -e 's/ == / = /' configure.ac || die
-	eautoreconf  # upstream doesn't make releases
-}
-
-src_configure() {
-	econf \
-		$(use_enable static) \
-		$(use_enable native-cflags native)
-}
-
-src_compile() {
-	# respect our CFLAGS when native-cflags is not in effect
-	emake $(use native-cflags && echo no)CFLAGS="${CFLAGS}"
-}
-
-src_install() {
-	default
-	use static || find "${ED}" -name '*.la' -type f -delete || die
-}
diff --git a/app-crypt/libnitrokey/Manifest b/app-crypt/libnitrokey/Manifest
index 927f5c1b10d9..7f595f81e7d2 100644
--- a/app-crypt/libnitrokey/Manifest
+++ b/app-crypt/libnitrokey/Manifest
@@ -1,5 +1,5 @@
 AUX libnitrokey-3.5-tests-version-gitless.patch 789 BLAKE2B 9e184e9e51837796b65c15e4cae6979991f94721af3ab7f79566fb5b1af777960d400dee10325799e3b7448946f6c73f9b509be41a1b0925b2cc6d7e85dc90c6 SHA512 aa4a253822a25d906ae09f74c9c52683c517528386b24734ff75977b6d28a11382cce6cdeb66cf0ff981225a8c61c76e32e7df96880fd9ad9f53f63ca0ad6f9a
 DIST libnitrokey-3.5.tar.gz 94356 BLAKE2B 9e53213f309e903d26e0e8e01ab213d6bc42c5b8d720e4b19f27adb607f20ad0c6e1707bf7b55c525efbd6a4fbf7b9c87983decf6b05dab7d03701ae0ea8277f SHA512 d2a95071e92d839c8cde4ac1435158bb469c25662f2988a4e824dbc0dfe83af841e6d04589293deddd77746dbec17b30c50fab69af58cc727ed5e0f2dbd0b5e7
-EBUILD libnitrokey-3.5.ebuild 1116 BLAKE2B 2bbc6ddbf18443bdec8056c1bf5e647e9ea7a29189cb216c5b7f7b41cad77154feada3d5c8308398bb1f78796c406453fb0153b34eb1b84890d91b91b6b40334 SHA512 e980520dd1ac1489916204ca70af7fecbce989d39aaf8b06d9655349b20847600bea5d70f5f367014b9ac90b6fe35b6ebcfb3d7fde34f1c6ed08f4241cb0c4ea
-EBUILD libnitrokey-9999.ebuild 1048 BLAKE2B 4a94192b8ca59009b7f06224e332acbcec2d40238c1cdbc0b8ea6c3e3dbfd3dcfdd0d5eaf7004ec1c5faac66392aa1c256a8c798625aa6b152ea39a97b687d49 SHA512 ad2ba4576a581cc5b59bdbb4f36147ed6adee78e3f72aabd8963d89247f8ad30b939247d42ec89614fd308b0413b93df4c2a8e4082a6e7ff31b986d2cd2d1838
+EBUILD libnitrokey-3.5.ebuild 1123 BLAKE2B 3ae935e945aecc878babb981f1989d8105c02d95ccdc652b9367643449bab791e5ae8979a780c2aea3b7b5a235e1b0d0889bb5bea977a0c915dade5d9097b88b SHA512 ccdb2e813224866ac7955abb89d13f9e58f29e751b6fa5008940a3118cc607d6c1a775a0f0b72ab00a5fbba17e6a54b814b3495a0ff66d667b1179f12e02a85d
+EBUILD libnitrokey-9999.ebuild 1060 BLAKE2B 25e4a6145c7c2ef9b0929eb31d2becc50a4672bbbb4597f8c42804dc5b2d6288c6706e066c09e1dfce5d2da0d4fac3b9e91d15fe3e29304827fe23336171404a SHA512 a646127cc022f3af1d5ddc862d929b972949b6d6e82d88afd90d2895b180a63332f98bde6cea246e3106ebca1f4a55565eb1ab2d2f9b0fd8da7c4f92ce7a92d7
 MISC metadata.xml 397 BLAKE2B ec7996ade24566ed79175f047e18c18a7c51e3946c65c4b3cd986d3fe6372ed2a79ca13b6e2d0a21b5e907a2f8e27e7061ad9ce893ffbd93ead06c8814f4d00c SHA512 457d69deef3f3bcca1ac0b0a15d20ca03bf012523a03c311c5be065ad50a43ef5d7e0d7fb949a6a63f3198c35313d83e0e7a8ef882c1095234f93a2dd8be416e
diff --git a/app-crypt/libnitrokey/libnitrokey-3.5.ebuild b/app-crypt/libnitrokey/libnitrokey-3.5.ebuild
index 6a74fb21ae15..ca4417a0c16e 100644
--- a/app-crypt/libnitrokey/libnitrokey-3.5.ebuild
+++ b/app-crypt/libnitrokey/libnitrokey-3.5.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
@@ -16,7 +16,7 @@ if [[ ${PV} == *9999 ]]; then
 	EGIT_SUBMODULES=()
 else
 	SRC_URI="https://github.com/Nitrokey/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="amd64 x86"
+	KEYWORDS="amd64 ~ppc64 x86"
 fi
 
 LICENSE="GPL-3"
diff --git a/app-crypt/libnitrokey/libnitrokey-9999.ebuild b/app-crypt/libnitrokey/libnitrokey-9999.ebuild
index d3474ddf0dc0..37864f5ac542 100644
--- a/app-crypt/libnitrokey/libnitrokey-9999.ebuild
+++ b/app-crypt/libnitrokey/libnitrokey-9999.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
@@ -16,7 +16,7 @@ if [[ ${PV} == *9999 ]]; then
 	EGIT_SUBMODULES=()
 else
 	SRC_URI="https://github.com/Nitrokey/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64"
+	KEYWORDS="~amd64 ~ppc64 ~x86"
 fi
 
 LICENSE="GPL-3"
diff --git a/app-crypt/libsecret/Manifest b/app-crypt/libsecret/Manifest
index 38aa4747c91b..696b1fc89066 100644
--- a/app-crypt/libsecret/Manifest
+++ b/app-crypt/libsecret/Manifest
@@ -1,5 +1,3 @@
-DIST libsecret-0.18.6.tar.xz 487836 BLAKE2B d38a41743142d33e634d77bbf55ccab044def9658b3f50bd3f8cec9be6372ad1a56dcc4de58126cba1246c16da2863c003bf14ea6c8a90d8667658cf492f4b9a SHA512 4997519762f1470cfc0a4b3a791362d030af3c9b6ce6f58f8f8073b3a8adeea9b8caacedc884163997081dc39f395f9172330dbb41fed45d6c43ac5809de48e3
 DIST libsecret-0.18.8.tar.xz 509432 BLAKE2B 3e3995d2c44367e31f3914087494764acfe82fb597b524c4982b4fca4e16612509c675f545191ee3cdae59698614395bef54ad82ae88a7e4e19898ba0be7828f SHA512 9e2ec8d458af6ed078bf3c6d956599f73f2cc7720332c424e9aede1f77f3d969c5122cf7b70899bc07ad96a3a628bf79bc5fffa88274d1ef2bcaaca6719f90d4
-EBUILD libsecret-0.18.6-r1.ebuild 2673 BLAKE2B e02465d7351dc6c7c66563bbe47cef140e2e311d00691609df703d4d99ae5c3807c5d5531750d1094717e648b1c2a914ceddaf871ac87b56acb212592cb87f67 SHA512 ccfdabc4a356b6cbab1686a2e4eee672a4357411cc763e817ccb1e84397e9a9cf888d638cb6d9e0d82890fba104e23aad265cc8c35af2dbc8b0d999028091e22
-EBUILD libsecret-0.18.8.ebuild 2655 BLAKE2B dd7ab943aa2c8237051676c52310cfd7fceaec88f73c3fca74ecb4150df75ffd82bc4501678dce9e0a539a9021162fc57a6e3ce06abe6f6f6d6b4876e888b4cc SHA512 a8f946a1858ae725ce91a4859fdd5ad71abcc16648459c00906ca33a2a62afd12dacb45f06626f4ca1c56c4ebedd663a544bb4acbb5970bfb21ad37f2de655cd
+EBUILD libsecret-0.18.8.ebuild 2650 BLAKE2B 71568f8a006c2873a216c77b40ad86c8b0e9d07f049c3f40dab7cf46942e831bc039df990f828f540e535c1bf6e4024ec9f8c457b12dfef5987f3f41693d2933 SHA512 73abf7371bbadb14230fe95837ad6eb8affe573688cad0c78205a576df7d129ddba0c93c44c5e98b7ad6fa52a4717947ae8300798fa359cb4190cba54a2ef733
 MISC metadata.xml 253 BLAKE2B a1efbd3751efaa83ee173f557ec1c8a4497a90b60896cf5a7a07da40b4f94a7a299ca0385477e82b2f5e5dbdf9afa482ccbe21f35ef44214e9c451d764b65529 SHA512 8d59f413993268ca783f7407b676900bb2d964754bf705d4175e2bafbe058a52af74f3928e4bd84d292518f8cf13fab7051486ab7cdc61d02fae6e0188d44442
diff --git a/app-crypt/libsecret/libsecret-0.18.6-r1.ebuild b/app-crypt/libsecret/libsecret-0.18.6-r1.ebuild
deleted file mode 100644
index 8ba2cb353b9b..000000000000
--- a/app-crypt/libsecret/libsecret-0.18.6-r1.ebuild
+++ /dev/null
@@ -1,95 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python3_{5,6} )
-VALA_USE_DEPEND=vapigen
-
-inherit gnome2 multilib-minimal python-any-r1 vala virtualx
-
-DESCRIPTION="GObject library for accessing the freedesktop.org Secret Service API"
-HOMEPAGE="https://wiki.gnome.org/Projects/Libsecret"
-
-LICENSE="LGPL-2.1+ Apache-2.0" # Apache-2.0 license is used for tests only
-SLOT="0"
-
-IUSE="+crypt +introspection test vala"
-RESTRICT="!test? ( test )"
-# Tests fail with USE=-introspection, https://bugs.gentoo.org/655482
-REQUIRED_USE="test? ( introspection )
-	vala? ( introspection )"
-
-KEYWORDS="alpha amd64 arm ~arm64 ia64 ~mips ppc ppc64 sparc x86"
-
-RDEPEND="
-	>=dev-libs/glib-2.38:2[${MULTILIB_USEDEP}]
-	crypt? ( >=dev-libs/libgcrypt-1.2.2:0=[${MULTILIB_USEDEP}] )
-	introspection? ( >=dev-libs/gobject-introspection-1.29:= )
-"
-PDEPEND=">=gnome-base/gnome-keyring-3
-"
-# PDEPEND to avoid circular dep (bug #547456)
-# gnome-keyring needed at runtime as explained at https://bugs.gentoo.org/475182#c2
-# Add ksecrets to PDEPEND when it's added to portage
-DEPEND="${RDEPEND}
-	dev-libs/libxslt
-	dev-util/gdbus-codegen
-	>=dev-util/gtk-doc-am-1.9
-	>=dev-util/intltool-0.35.0
-	sys-devel/gettext
-	virtual/pkgconfig[${MULTILIB_USEDEP}]
-	test? (
-		$(python_gen_any_dep '
-			dev-python/mock[${PYTHON_USEDEP}]
-			dev-python/dbus-python[${PYTHON_USEDEP}]
-			introspection? ( dev-python/pygobject:3[${PYTHON_USEDEP}] )')
-		introspection? ( >=dev-libs/gjs-1.32 )
-	)
-	vala? ( $(vala_depend) )
-"
-
-python_check_deps() {
-	if use introspection; then
-		has_version --host-root "dev-python/pygobject:3[${PYTHON_USEDEP}]" || return
-	fi
-	has_version --host-root "dev-python/mock[${PYTHON_USEDEP}]" &&
-	has_version --host-root "dev-python/dbus-python[${PYTHON_USEDEP}]"
-}
-
-pkg_setup() {
-	use test && python-any-r1_pkg_setup
-}
-
-src_prepare() {
-	use vala && vala_src_prepare
-	gnome2_src_prepare
-
-	# Drop unwanted CFLAGS modifications
-	sed -e 's/CFLAGS="$CFLAGS -\(g\|O0\|O2\)"//' -i configure || die
-}
-
-multilib_src_configure() {
-	local ECONF_SOURCE=${S}
-	gnome2_src_configure \
-		--enable-manpages \
-		--disable-strict \
-		--disable-coverage \
-		--disable-static \
-		$(use_enable crypt gcrypt) \
-		$(multilib_native_use_enable introspection) \
-		$(multilib_native_use_enable vala) \
-		LIBGCRYPT_CONFIG="${EPREFIX}/usr/bin/${CHOST}-libgcrypt-config"
-
-	if multilib_is_native_abi; then
-		ln -s "${S}"/docs/reference/libsecret/html docs/reference/libsecret/html || die
-	fi
-}
-
-multilib_src_test() {
-	# tests fail without gobject-introspection
-	multilib_is_native_abi && virtx emake check
-}
-
-multilib_src_install() {
-	gnome2_src_install
-}
diff --git a/app-crypt/libsecret/libsecret-0.18.8.ebuild b/app-crypt/libsecret/libsecret-0.18.8.ebuild
index 6a79b234fee0..26067ee2d002 100644
--- a/app-crypt/libsecret/libsecret-0.18.8.ebuild
+++ b/app-crypt/libsecret/libsecret-0.18.8.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python3_{5,6} )
+PYTHON_COMPAT=( python3_6 )
 VALA_USE_DEPEND=vapigen
 
 inherit gnome2 multilib-minimal python-any-r1 vala virtualx
@@ -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/libu2f-host/Manifest b/app-crypt/libu2f-host/Manifest
index cd9f218658b8..cfabcf0eab1a 100644
--- a/app-crypt/libu2f-host/Manifest
+++ b/app-crypt/libu2f-host/Manifest
@@ -1,3 +1,3 @@
 DIST libu2f-host-1.1.10.tar.xz 471676 BLAKE2B 5066eaaaeda3b8c015afa8946f0af3b1b90a34488d4c71811c0d8f57a3ed2e4c8cb3d82d2df147dcf13ac3c384522d22f25894ac3a2d994a75b288891a67640a SHA512 91c5bf3994f1d3c9bd144f54b14b0404d839c15bef3c318619decdf1bd37214bcff33927af78a9826ff7d0bc9907c912a0e31104ae68d3a727a8436f2a1dbf7a
-EBUILD libu2f-host-1.1.10.ebuild 958 BLAKE2B fa5cbb0284764754ad1190da8e07b43f37a632a895188966b394e51ebfb1aa3197e1c60ff3584896beefb6068dadd1d5524d90ce6b56cecf9d59f6a0c5ce9f60 SHA512 0aade0f668c76a89d2bfae261dee437e849ec1c22cca333251da545d33b9908cecb11a9b9a9b9b6c5865edc88bbfb1105e047c8be361e2203afeb3bae24f3c7f
-MISC metadata.xml 668 BLAKE2B 7720f7dae3f50bb3c6061bb2fdfa973fc5cea8ee314c4d7b95934037430d8083ff8629b3fb4d6233e6617596810112e3a4fec93eb702058ec09cd86d0931183b SHA512 017018b2122b3adf87c7d3a8d70211f337de3b6ac9e8e446f3f2f70db29d33af201c9b2dbe4404e5ac7f36360f96abae24e6501ec60eb256e6ba974c37fc6932
+EBUILD libu2f-host-1.1.10.ebuild 965 BLAKE2B c9a6946736301a3cffc70d778d4a5e00ec04bca1cc06cbf1b0e18bc7d2c4af781384a48e77f21d4633cfb417716d437c19ee03d8ec2091af089f0574eb8fb3e2 SHA512 47999e6554bcab1d7115631918f321f6aa843284746b8e6167eff195be8547775d955be1730f144cd5620d7c80c50f734ea477fc625855313676236e044b064d
+MISC metadata.xml 561 BLAKE2B 5c5f06eedf51575a587ed9c191dcc6f0e84793ef095ae14741ac9fff4fcebe759cd12fe71456d120004f40037e3827a500852ff0eb1383dc860251df59c9cb8f SHA512 a3da7b20b8c880100dfb6518f58fe372ef64b095b4ae22072d1546a43713be5b5ab84f469abf1cad8d507ab85c37be33178983ab58e2973f2ad607e3c021c1e2
diff --git a/app-crypt/libu2f-host/libu2f-host-1.1.10.ebuild b/app-crypt/libu2f-host/libu2f-host-1.1.10.ebuild
index 6797a6c93d08..0c27d050b295 100644
--- a/app-crypt/libu2f-host/libu2f-host-1.1.10.ebuild
+++ b/app-crypt/libu2f-host/libu2f-host-1.1.10.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://developers.yubico.com/${PN}/Releases/${P}.tar.xz"
 
 LICENSE="LGPL-2"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="amd64 ~ppc64 x86"
 IUSE="kernel_linux static-libs systemd"
 
 DEPEND="dev-libs/hidapi
diff --git a/app-crypt/libu2f-host/metadata.xml b/app-crypt/libu2f-host/metadata.xml
index cd45b1827971..9ecbfa8a278d 100644
--- a/app-crypt/libu2f-host/metadata.xml
+++ b/app-crypt/libu2f-host/metadata.xml
@@ -1,10 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="project">
-    <email>crypto@gentoo.org</email>
-    <name>Crypto</name>
-  </maintainer>
   <maintainer type="person">
     <email>gokturk@gentoo.org</email>
     <name>Göktürk Yüksek</name>
diff --git a/app-crypt/libykneomgr/Manifest b/app-crypt/libykneomgr/Manifest
index 4045a2a9b0e1..315743e89005 100644
--- a/app-crypt/libykneomgr/Manifest
+++ b/app-crypt/libykneomgr/Manifest
@@ -1,3 +1,3 @@
 DIST libykneomgr-0.1.8.tar.gz 626257 BLAKE2B 4819420f36261251261264dfe688297107fa857cc78081dbbdaa90e5c821ceaafa7d770e431fdfec4c199273c67ec684da1f4570883c300f9283e73aeea42d17 SHA512 536db3a81b74d24e727cc09c5bb898723b602e6c55e249745ced59d5f9416673fdbecd80bb7ebc7031be349092c8fb4f5623c8f6972ab870ec1f50ac1bc2f795
 EBUILD libykneomgr-0.1.8.ebuild 562 BLAKE2B 9093de1a3a9be78f616849b4b5200f4063299ae24522a5118579a2570c843d22fb616f092cf4c9e641d2aaaeb3b36f566c9c9edd461fdc5c76f899005cba8d21 SHA512 a2b23d24768dcfd8d1b52bb95a3dda25c8879c50dc33fd13f9f45e5b9d71c3dfb7fdbb40c734cc4606c0ee55b743c0c12f4388ba4aa0ad2b11c167f13c14874e
-MISC metadata.xml 401 BLAKE2B 278a4aca731d3b5b8f20f1eba0f6474695f5de4e8a4bd67ebe93b3ad366874c034ac9b5809d44e2065b0e640b5e29cf23000463c98a9654cd09ca260964f9ee7 SHA512 90b43e61063738f2821f8f4134f5e5457b40840ae72097dbd01bf27cfb2dbd405941902bf414be2b67b10901708ca6c80d6573f0f9ed42828e1a83e635761455
+MISC metadata.xml 325 BLAKE2B 081e2efabea13e3dde8cc81bdb0a84a344cef9f553bd97a621b7eaeef8ba2b83741624a1e804368904b2dc48fdc3802d66e699331f1468e2a65d5768a5e40b28 SHA512 cf1683292cefaf49a20764fe6f5ef848bb196273aef6d2fd0e1b2c4da848ab93ebf0bf0388587b7e0de0ae38af5346b3ce7cff55f27af9c914834af775e95a41
diff --git a/app-crypt/libykneomgr/metadata.xml b/app-crypt/libykneomgr/metadata.xml
index 5b8a7d06fa11..e3e73c06a863 100644
--- a/app-crypt/libykneomgr/metadata.xml
+++ b/app-crypt/libykneomgr/metadata.xml
@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="project">
-    <email>crypto@gentoo.org</email>
-    <name>Crypto</name>
-  </maintainer>
+    <!-- maintainer-needed -->
   <upstream>
     <remote-id type="github">Yubico/libykneomgr</remote-id>
     <bugs-to>https://github.com/Yubico/libykneomgr/issues</bugs-to>
diff --git a/app-crypt/loop-aes-losetup/Manifest b/app-crypt/loop-aes-losetup/Manifest
index b2cc8595a369..572aa7d7fb74 100644
--- a/app-crypt/loop-aes-losetup/Manifest
+++ b/app-crypt/loop-aes-losetup/Manifest
@@ -1,4 +1,4 @@
 DIST loop-AES-v3.7j.tar.bz2 326818 BLAKE2B ca2db3162298e2e28dcc6feb5e6ba885a08097acafb9937a69898e6944c62cbb1c0ef601e13c0547550721430bf770f187ee71bc5e642d6107c982fae9d03462 SHA512 e1b59680680e2b40bb42cad9f1e89a344c7bfd0ee01fdc26151e9edea64b5111744588bc05c672de16c76ae0a3e4d6a8d4c4c9c09709a9f93bfc62a2f64ba7c7
 DIST util-linux-2.28.2.tar.xz 4149700 BLAKE2B da38a047b4a7dc867ba72aea149d515665375089d880d43c40f6d19a09ee33023d64b95c15073d6a83a36ee58ff6d47ef08671ab841b533bb747a337c5da6c02 SHA512 ac1c2d4c92bbc4eabed464cb0334c1d9b21e58df0f07f0b26e7adcfa188879de8632d195b65a4358c5e11e14ac6e09a1c6206265bbf1fab4ce122414bee7e940
 EBUILD loop-aes-losetup-2.28.2.ebuild 2393 BLAKE2B cb7536c3d6c5114fe346c1e37e1164595e31e8b3e6eeff751214d9739b21ed196e68838a7b82acc71ae50a1571cb249be00508f99ba631f4c641c40889fdcc41 SHA512 0fcf7848050017c32d1d570463187522f20b84a5f9fe6f534a72144e0e1039ac3ed4cbe0255637b3f2ffc2a12f9ce164b5777ff60b236cad492771178d797224
-MISC metadata.xml 318 BLAKE2B 645d30bddca8c141085ee99caba70b409c1318c175f6f25c0a16b81d2286f1c1b74ab694d2100fd20b1bf16bf5f4134c4642370b99bdedd8d2cc015a822ec768 SHA512 93c67a250f19a2a17bde884a0f493b5b675ae2e0b4dd89164dc8a052e7adb9b2b5ebd07a43fb5432a8198216134ed3a0eca4b14bc98b9be71e9d947f51b77439
+MISC metadata.xml 245 BLAKE2B fd79e41fa297a3b58dc8ff27190cf2ab9bcc28d34e15eccaa176e2638761f6dd98499016f3eb2ade9785947c08bc881db8dd8d90bb7bd87e24661b73467d1429 SHA512 df5fe2c09cd46dcfecbdbe3712375aa0488dc79cbfc077cc3bf97376799609764e387a2cd6c2b0eaf60dc3c247aaa602c3197aedc119d29a79f99ae4c4e2bee6
diff --git a/app-crypt/loop-aes-losetup/metadata.xml b/app-crypt/loop-aes-losetup/metadata.xml
index 12925882c9ff..52df7fac7210 100644
--- a/app-crypt/loop-aes-losetup/metadata.xml
+++ b/app-crypt/loop-aes-losetup/metadata.xml
@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="project">
-		<email>crypto@gentoo.org</email>
-		<name>Crypto</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<upstream>
 		<remote-id type="sourceforge">loop-aes</remote-id>
 	</upstream>
diff --git a/app-crypt/manuale/Manifest b/app-crypt/manuale/Manifest
index aa20b29eef73..4000b61f60eb 100644
--- a/app-crypt/manuale/Manifest
+++ b/app-crypt/manuale/Manifest
@@ -1,3 +1,3 @@
 DIST manuale-1.1.0.tar.gz 14015 BLAKE2B 1c3eb18e591032c1633e73da46bd91653627c127ccd9d0006d776ccc12d95faaf53b8942a47fcedcb37ef998ad6975efee7a20658f6e366fa51f0b6ddd635f31 SHA512 b78d6468fba14738f0b33cb11817a61692bab2b18a3331b2696c6e1c070a202903be6d6f642da7dd35560b15ee5fe24afecebe51395bdacae59f04cc582b6b44
-EBUILD manuale-1.1.0.ebuild 577 BLAKE2B 18265718962f5ba77b280d5dc2c5b405b783cede330b606aaff0ed125a43e50743373143961346bb2b3d325ff6dd6f8a991da95b8e925759e2a5163517b0b02f SHA512 fbc8f92d2a49f1a9cbdc87420f13bca9b428f5a4b3563a55bac1e252866577991f52f829f4857f4becd668fe2608f54d581aa65e74e86ad63c5da14c58ef7579
+EBUILD manuale-1.1.0.ebuild 571 BLAKE2B fb570a96e4e607af9a73d35b38fefed7b5eb32bf0454206ef8d80687691326adf2572db1d26f492e4f8e6c49d7837c37e1b873cfb41d3ade4a51209abcc8e103 SHA512 a9d0094c144b576c131cb771eab61fcbeae324746b482d8c33403c1515bc5e1496f9327cc1b9b8450808ef78a825b237f0cfad5b1d50cb7d232c88f7fb851f1f
 MISC metadata.xml 245 BLAKE2B 971a9685a9931969cce9ae3f586e5a1b1be60f3d494139c8f09b19e68552286c04f70e4321473e9d62e20136e322f0ce5c8265a986f27ab4c3b02dc2584a8e05 SHA512 959004edbb7652a51b20d5c16dcdc270389d9ea656a795928323ca071ba51cb34d25b4bedfdc0cabe9e95301986aec7b8f3972bf1a50df4253b6364da932b232
diff --git a/app-crypt/manuale/manuale-1.1.0.ebuild b/app-crypt/manuale/manuale-1.1.0.ebuild
index 6f8bd4555229..ea17625b0910 100644
--- a/app-crypt/manuale/manuale-1.1.0.ebuild
+++ b/app-crypt/manuale/manuale-1.1.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python{3_5,3_6} )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1
 
diff --git a/app-crypt/mcrypt/Manifest b/app-crypt/mcrypt/Manifest
index 5ef9ecf95e11..551415ff61f3 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 326 BLAKE2B 7815b2e4462f847a84c902df0c20b993c2a1cdd77006da029616096587e07003b2bba50499144d211c8ad0880eef53f0a3a9ce23af69f6320c427d6352958384 SHA512 a5d7a15b6084aebe038f38dc8003040c42434d415ebdb33b225e2772047950d35b2328dba5a7194533608b74ec47ca6a1bfccb56540f3a67308b499b04774207
+MISC metadata.xml 247 BLAKE2B a5340d0ae31867f0b98c1d238b57479e18ae57c0fa9015ee0a08a89b118e5637a4464fce09d5ece6ff3762cd0296cc5b4c75c8d22c69fccf0677b1eb19bf51c4 SHA512 ededbe4f421761e06a1e8cd4cc0ff2f42fa24b16ae55c2feb89ad444c248d53246406dac4171ea8d7efb42509f8c382258fea7209de1684de65a7a357bc66b20
diff --git a/app-crypt/mcrypt/metadata.xml b/app-crypt/mcrypt/metadata.xml
index a07f7533cf4a..8218d5403d95 100644
--- a/app-crypt/mcrypt/metadata.xml
+++ b/app-crypt/mcrypt/metadata.xml
@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="project">
-    <email>crypto@gentoo.org</email>
-    <name>Crypto</name>
-  </maintainer>
+	<!-- maintainer-needed -->
   <upstream>
     <remote-id type="sourceforge">mcrypt</remote-id>
   </upstream>
diff --git a/app-crypt/md6sum/Manifest b/app-crypt/md6sum/Manifest
index 18e2d5e8cd57..027816b4442a 100644
--- a/app-crypt/md6sum/Manifest
+++ b/app-crypt/md6sum/Manifest
@@ -3,4 +3,4 @@ AUX md6sum-1.0-format-security.patch 620 BLAKE2B 5864e943d0ba267c5e9995d2572d0e8
 AUX md6sum-1.0-ldflags.patch 427 BLAKE2B e7ecbab2d65cdad2bd45f2fd024081dd807a994a312090276db77b7cb7bd2c4636871ef3c2466e5ce137627949e16585cb8699e6ca25f5fb826bcca2a6e37153 SHA512 2ed3dc38eef78f365bd8e03e22264488c6a0d089c30f827e90ca5dd5ada9ad061e0c1a736c3ccc81c05fd172ffc8140034d703993233e5e3f8877cfb298fa1a1
 DIST md6sum-1.0.tar.gz 125626 BLAKE2B 19217592cfa65d16fad684448813adc6cda96c6ee8bfd01617c0a5f04b9ed5efb78aade64358deb535a2c9221c6a033b9d5486aee6438b5b6398f0e0096abf2c SHA512 8253a68dd036dd98b22c39a35a75f9bbdc4018ea63dc8f7823c831090d19f2f92a727458b4dc35388e494dbf496b9f5de693a1cfb3e5a8ca8441f31f0e817d46
 EBUILD md6sum-1.0-r2.ebuild 420 BLAKE2B b1e61c9d6a3dcf24593fe84a99fba4210256e6e6559e2658ecbb216b6379ef1485575f1a5dc78f43de40b277df474dde3aa89c19a302dcf83a1045848dda9376 SHA512 2a59cca8b20a0feef37b6b48ec901cf1a31a594e03b52c650d8d2b30d6755053c2bfcfe8c51ef020dbf760099cf8de600b03348037386018f1cac2eb81cee504
-MISC metadata.xml 316 BLAKE2B db383f2d08311259f00b79ee57ae9497c9a6f3693da97f18e4891760e42360b9e6f31116422e814f0680387bca1981dad3d89ed8a3d92e9df4e98c434ebe2811 SHA512 c6ae22608f860eaf81fcabca3750fe7a1b24249c5d6eb8aa33867c4a8fba5f1ac6203f298667db39dba9fa9164109bc59267f31e6d9435cd40a242c0055fa3a2
+MISC metadata.xml 243 BLAKE2B fd9cf8a384e75cb82f3f4bd4c4ef9a74bbe96865d8df8ea99a6eeae82a678596cd9c23394dadf0d18a12adf4e85d1d46e24534e7cbd95e7f57303907f332cdd3 SHA512 0e850d698f6655c9674b73ef8aa9f2ad2ce90f6843b9cca4550b7f92b355c4c43984f1fa767f646498ac1c281fceaca4dbeed3c3725797f38351be1dc3459fe0
diff --git a/app-crypt/md6sum/metadata.xml b/app-crypt/md6sum/metadata.xml
index 5554188586db..29f403db0f5e 100644
--- a/app-crypt/md6sum/metadata.xml
+++ b/app-crypt/md6sum/metadata.xml
@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="project">
-		<email>crypto@gentoo.org</email>
-		<name>Crypto</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<upstream>
 		<remote-id type="sourceforge">md6sum</remote-id>
 	</upstream>
diff --git a/app-crypt/mhash/Manifest b/app-crypt/mhash/Manifest
index 272db11d5fc0..7caa8a5578fd 100644
--- a/app-crypt/mhash/Manifest
+++ b/app-crypt/mhash/Manifest
@@ -8,4 +8,4 @@ AUX mhash-0.9.9.9-force64bit-tiger.patch 537 BLAKE2B b37015b12eb213cd91207163b6e
 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
-MISC metadata.xml 325 BLAKE2B 07d8e2f3ec1adec0b16be91a853079e875a3d318fb47ec60e43a6ea87fbbdbbf5f22ec364af47ae311070081235752cebac0fbca30785731cc4b924a9a14edba SHA512 32c365b53e7c9d2a3c6dcef43cc33163a690a0e2f3401e275d3511faa388149ade4b9f5c583307f5b94e6df005796b4ec935ecf35c6cda8d236e46ed0ab7336c
+MISC metadata.xml 240 BLAKE2B 930f7f4d63cd589f337e5fb82f0fd568e7b12917c1fbb663af43acb523311b683b7bd3e144af0673749143a5d7fa86f57e8bed96f87c32e054c28ae6bf8d768f SHA512 46b4040c549d189f732ec0752339b86521d8351f8d5529f272050722cb466e161772e5fd05db097e29a528786150aea5d78d80232d84cbf99521f4ff697d7a4a
diff --git a/app-crypt/mhash/metadata.xml b/app-crypt/mhash/metadata.xml
index 4d45a5368800..101ee8a0b3fe 100644
--- a/app-crypt/mhash/metadata.xml
+++ b/app-crypt/mhash/metadata.xml
@@ -1,11 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="project">
-    <email>crypto@gentoo.org</email>
-    <name>Crypto</name>
-  </maintainer>
-  <upstream>
-    <remote-id type="sourceforge">mhash</remote-id>
-  </upstream>
+	<!-- maintainer-needed -->
+<upstream>
+	<remote-id type="sourceforge">mhash</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/app-crypt/minisign/Manifest b/app-crypt/minisign/Manifest
index 9b599be6e829..9830e30829ad 100644
--- a/app-crypt/minisign/Manifest
+++ b/app-crypt/minisign/Manifest
@@ -1,4 +1,4 @@
 DIST minisign-0.8.tar.gz 14045 BLAKE2B 3c0cb0ebaeeacee5f56c788a48eef8d0a324c2db2fe8f63fc16a197870c327ed2cacc618cb6422f8d7d7ef35860b58aa0a2769c851e8af9b1a7a7cd9d2ca3a07 SHA512 79bf626d0c15e39ce3bdf53600038028c0b22904b648074bf516a9ea6962c9486c41244e80637a5fbac090cce1ed9b4b3d57b8a02632646e01b43aa413cd8bd9
-EBUILD minisign-0.8.ebuild 558 BLAKE2B 9b6013af92efcea9b269f5672b858e904bc0cdf617d6c6839efed303272b095005d74d8c3883f52f8f5704c37a7a23c3e86bfdebe8a0e4d811f85deee767997a SHA512 8f8520a1311f2f553105c779bcbf15ab511e987219e600aceb3f4e6fc175edfbc8c17117c2666f1d1a7bad37ad9780bc7e44e018c5f7f5b8db7712c65b2dba63
-EBUILD minisign-9999.ebuild 558 BLAKE2B 9b6013af92efcea9b269f5672b858e904bc0cdf617d6c6839efed303272b095005d74d8c3883f52f8f5704c37a7a23c3e86bfdebe8a0e4d811f85deee767997a SHA512 8f8520a1311f2f553105c779bcbf15ab511e987219e600aceb3f4e6fc175edfbc8c17117c2666f1d1a7bad37ad9780bc7e44e018c5f7f5b8db7712c65b2dba63
+EBUILD minisign-0.8.ebuild 570 BLAKE2B c8c52817c19759eac355ae3711bc181956e4ad9805a5cd2a9e62dab0755135bf7e34bcf79ee95bcb115e029be15ca2087c918f7fe7826f652207617ce16c0167 SHA512 d3bdae76c320a97fb762cd1923a70b1da8445c444e196245b5f35f3eac550ba01f1da7e8d1aa7c1625559b08bffd0e84d4bc4f1671f57459807a848b46f63f47
+EBUILD minisign-9999.ebuild 570 BLAKE2B c8c52817c19759eac355ae3711bc181956e4ad9805a5cd2a9e62dab0755135bf7e34bcf79ee95bcb115e029be15ca2087c918f7fe7826f652207617ce16c0167 SHA512 d3bdae76c320a97fb762cd1923a70b1da8445c444e196245b5f35f3eac550ba01f1da7e8d1aa7c1625559b08bffd0e84d4bc4f1671f57459807a848b46f63f47
 MISC metadata.xml 681 BLAKE2B 590bbd6d73e1a9d5ac5e3381ffa5f29e8f8a0f329874e5372f52425a679c8966211b689a699d75cd6bc299e6d670f7724284fd87fc8f6ce0f8038133dfcc33eb SHA512 2840cf105039a5bb4a7564f4d10f759c1cf0f7f183a9684fabc2a1a158ea01a8dc7c552bad57991b30bf676c88b2b00d1f7304a2c565d388e798cf931e566242
diff --git a/app-crypt/minisign/minisign-0.8.ebuild b/app-crypt/minisign/minisign-0.8.ebuild
index da90d6d5d3f4..720809d52a49 100644
--- a/app-crypt/minisign/minisign-0.8.ebuild
+++ b/app-crypt/minisign/minisign-0.8.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2019 Gentoo Authors
+# Copyright 2019-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -13,7 +13,7 @@ if [[ ${PV} == "9999" ]]; then
 	EGIT_REPO_URI="https://github.com/jedisct1/${PN}.git"
 else
 	SRC_URI="https://github.com/jedisct1/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64"
+	KEYWORDS="~amd64 ~ppc64"
 fi
 
 LICENSE="ISC"
diff --git a/app-crypt/minisign/minisign-9999.ebuild b/app-crypt/minisign/minisign-9999.ebuild
index da90d6d5d3f4..720809d52a49 100644
--- a/app-crypt/minisign/minisign-9999.ebuild
+++ b/app-crypt/minisign/minisign-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2019 Gentoo Authors
+# Copyright 2019-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -13,7 +13,7 @@ if [[ ${PV} == "9999" ]]; then
 	EGIT_REPO_URI="https://github.com/jedisct1/${PN}.git"
 else
 	SRC_URI="https://github.com/jedisct1/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64"
+	KEYWORDS="~amd64 ~ppc64"
 fi
 
 LICENSE="ISC"
diff --git a/app-crypt/mit-krb5/Manifest b/app-crypt/mit-krb5/Manifest
index ed69c16cb6c8..f019dec10d23 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 4316 BLAKE2B adf1993cf5479ac7230d02c9652b9f482a772cc2a86dd6bf6fc0b76e84fc4252b19b401772980c8885f5c33cfe2856e098defde2f840c3f24328bc3f275223c3 SHA512 fdd3ac833ec1c0bf9ace7f35b4f2946eb9afaad9c580005a46f866f272178954a5d076591ed21451b3da986c53687823cd50a3a5373dfcd0401cb21c3497bad4
-EBUILD mit-krb5-1.17.1.ebuild 4354 BLAKE2B 99b0f199e2a0f1e7bb7fbe5e0de5c8219165e62be437d1a7fc9b34562cc303be42eb72da6766c01f8c8bf85b3f722e8d6ad7f3400ff46b0cd937677694db9f33 SHA512 9610ab92b3a5b641e94708e810eebf7a242a5ebb0f810b761f75e3c575aef2f5588abb301fc642e651a7e03a521fff68f2498b40d12a3beacbc32660e3838d92
+EBUILD mit-krb5-1.17-r1.ebuild 4314 BLAKE2B af2f612070a0f35fe9f521df6726216e6728bea42d5de1e8d312632565201a4878c13faf20f0617c8a03a02cf55ac58b57d9c2fb7286af2a947fa9d88cb834e8 SHA512 7f7a8cc3558241faaff863c2a9fb9f398667f1997c579792f4d8550880b04f2ef9ed89d71ed56d344cd0722baecf2292473d842fee7da90d95831da0b9efd228
+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 dee8389adacb..a7d0539680a6 100644
--- a/app-crypt/mit-krb5/mit-krb5-1.17-r1.ebuild
+++ b/app-crypt/mit-krb5/mit-krb5-1.17-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{5,6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 inherit autotools flag-o-matic multilib-minimal python-any-r1 systemd
 
 MY_P="${P/mit-}"
diff --git a/app-crypt/mit-krb5/mit-krb5-1.17.1.ebuild b/app-crypt/mit-krb5/mit-krb5-1.17.1.ebuild
index ae03d2238a94..a8a83d67ccf1 100644
--- a/app-crypt/mit-krb5/mit-krb5-1.17.1.ebuild
+++ b/app-crypt/mit-krb5/mit-krb5-1.17.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{5,6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 inherit autotools flag-o-matic multilib-minimal python-any-r1 systemd
 
 MY_P="${P/mit-}"
diff --git a/app-crypt/nasty/Manifest b/app-crypt/nasty/Manifest
index 15a883f6dc5e..11beeced0376 100644
--- a/app-crypt/nasty/Manifest
+++ b/app-crypt/nasty/Manifest
@@ -1,4 +1,4 @@
 AUX nasty-0.6-flags.patch 468 BLAKE2B acc1ac4bbe024136a176f04a3f6ba85190ffa34b4655d4e284ed980774169ab790f5582d8ce8d86cb59ceecaeefb579f975dacc5144b6bf8fc5da741819a8f27 SHA512 56d808209a9ba1fd1fa3b77ed90398cded9adb08c271ed74c80c5dff793413f1e7270ab057bd253c8c1e951dec7e7b8ad6c92976abb7c267109f517ccb81d4a1
 DIST nasty-0.6.tgz 3811 BLAKE2B d6e5973c4f1335fe936b9a7c976d5a0f994cf618ed83c8ae7629256c2dbab17b631a095a14da366d7011add5df5263d63de66db4b3e69712aae0be092fa50064 SHA512 6803c1ccb843934ab6d2bd173c4cf154124926ee493a79072b351167f7fbbc08f90226ba63d2c591f2ae122d33d7cf1dc6b60e8684dc7ec650c8bcf3f04b3e07
 EBUILD nasty-0.6-r1.ebuild 553 BLAKE2B af753a0eda3a8756af06d098574d4ba0d0256673da30b02da0895ccfa4a3f7c2e187f114c333231ce9176f5a43085fbb0ddb83b056264c5bb23b147cd1dac8dc SHA512 d10d1c5da5a420d5d28daf30c04166bba01e9246ce10eed933da80db4503b0d8315d197037ca4864f348557632561a20866560f68b96c34acdca86fa2e848400
-MISC metadata.xml 246 BLAKE2B 569d634cc821d4a537880a58ca96bf709155b0af827d8153b9521d5ca29f174ec29629d11b9eb91ee1cbba5f1a823d5c621521105a00e9fbd6d9a27bc3740bde SHA512 8ac20e3524a896e77d186b34b589ffe4287593c43fca1d50bcc06cd27e8cb8f5c0da2087622413a748a1738177d5939a50bda7a1e5d0ba36fbf4fb6d7b9bb015
+MISC metadata.xml 251 BLAKE2B 958e5ce6ef310471d4c88ef4cfd054eb9476b56abe4e8b82b003632bae4d56a800530601a7fd4b0129fdf22fe5124e8642f60835c6792cdfe38e09afb2d701ec SHA512 10bbd614739518c3b33fc05f34caa511ad71c599e2df0cb58514f05186b9c4ef73e00e3c78018c38581376a90a7968a01c35620fca32fdc5a91a762233a8c5fd
diff --git a/app-crypt/nasty/metadata.xml b/app-crypt/nasty/metadata.xml
index 4f6e28828f65..91439c59951d 100644
--- a/app-crypt/nasty/metadata.xml
+++ b/app-crypt/nasty/metadata.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="project">
-    <email>crypto@gentoo.org</email>
-    <name>Crypto</name>
-  </maintainer>
+	<maintainer type="person">
+		<email>k_f@gentoo.org</email>
+		<name>Kristian Fiskerstrand</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/app-crypt/nitrocli/Manifest b/app-crypt/nitrocli/Manifest
index 4f78e952f78c..5d0800e3bcda 100644
--- a/app-crypt/nitrocli/Manifest
+++ b/app-crypt/nitrocli/Manifest
@@ -1,33 +1,58 @@
 DIST aho-corasick-0.6.9.crate 25979 BLAKE2B a1bbec11c322d20d435d8683151b144e31f04b07ca47fc1c8128464533256f4004c8d346fe59a1e1c41be5609fdf768fad5f1afa5df94d1a02ced5c4f02c4bac SHA512 8dfc817b435d8a44fb4ca79bb20e283659c2fe9a75a4892389958f5880acc436bbe32552098429f15585ee025d064fdb5806b814f0e9d67a4261ffd23852172b
+DIST aho-corasick-0.7.6.crate 108953 BLAKE2B d713366d0783e1ffbe65408e4d38ef9f12276f61043c768265de5d47e446a378306096a70252c9a49a6e7d3b97a09f30405a3d8df6b40dc2dfeb7407ed574c95 SHA512 120aa28e72279f561d7f51657aa0800dd46504cd92f758f848284e5f3695be6f5e24056a66b0f2d971c527277e92ae938e2357ade37b5cbe1c93913a5dc308b1
 DIST argparse-0.2.2.crate 19440 BLAKE2B 7b15b2072ff52149bc08c5d02a266f2eef78a3aa8844e49154cf2ae1a9cb960ddc2a96a065b4aa44637aca8216211f2965291364d9f06ff6f68524a1f15dfed9 SHA512 97691566d3adc6f6be1c00cdca48424fd3576c372d1c995e7e31658bd20e17ef13553f7de21968ba189fd812928aeb93ef0fa89fe2fd258f45a0a8e095783706
 DIST base32-0.4.0.crate 7791 BLAKE2B 6e457d08f6fe17159b0231b62774d2c366c623b07c7b37196edb8f33b886cdf7affece70afae6dd0b64fc4d2be10d3a01f2f0b81ed12d5c5e1cf50d39c80e68b SHA512 4c999f2fcded06d803471d08b8d9e42512a85f81974388afb3d5b450c86e5ea60e7b1fdaccc49b1e0346663827408f847e897523955edcaf397f20fe97038345
 DIST bitflags-1.0.4.crate 15282 BLAKE2B 63f5feb47460c344983cef8822804b1c4ac2f3adfffcf206df2b05fafb9c7bfd73986721cde46705a3e4a0dc72a40683e4d369f2339adfc1b55208bad1766875 SHA512 81850d2be62eabb8486024ab263da67e6eb8ebfa732cac3a5d46a9186c564b2065cba15fa3da468bbd26eaf2b67038680e5de19d5dd99d78f60dae8a1776c8de
 DIST cc-1.0.37.crate 44499 BLAKE2B d12551225fc4e20691a09fecc8a2a487090ce10ad7fe64b385cf54b74a124cf737aa31966f82d9a68e1a932dccb4ec495eb32cdb4dc808c985384fd0fa4b6950 SHA512 85cf4679d16df14a815563c459227ae85206eb79826099fcbd5f602fdfdc052f36237916a842d65d9a5ab57c559c18e645bb219422d85aa3690c11c0a8dcc92c
+DIST cc-1.0.48.crate 49885 BLAKE2B 98bc13fca4b9b39f61916c4cc6a0e4123f5805263a633dd329e0c943d6a3dc8e0572d5b382d61e207ef0e7ca96a66e4720fb7f1a817fd61b1ed842ecf09f5f08 SHA512 4392c4455195dabfefc920e3692dc41fc763f7ca9e7163be395d7acefdcd1cf4f5e7a2356a9d8be367d43cb3e4320ad8e7513e5532118a418cd38e98748fe165
+DIST cfg-if-0.1.10.crate 7933 BLAKE2B 063a96ed176f34f788666b40adc483d147fc011dee941ab60569ddd0e57502b5dd06ed71090f4e14ce005d06e240500a286f74652615e9d068fba649610d8cf8 SHA512 9d22616bfb4a75770a828a0a3cddac6787297a5fdc53eb17e25811cc94de717f2de8bd66d53c5d65ba1c83d8892aefee5ae758cf56a1ef0a0c3120f70b244339
 DIST cfg-if-0.1.6.crate 7411 BLAKE2B 0a19f5afaa89acfa7877e06e747c1e73af8b8a9886c97a803fc3d61d075b43f3fee6089c67ed28efe70aaf4082fc21dd5b24ea514fb1d761ba3d939dad496fee SHA512 e393816f659bb5b1e64ebc72a4b6e3e673afd00cba302c3c92c6f2e98db341a29197f6cf413107e569175a86aad85e74a93e2cd3a9fa9fa2d1b70b01c3fcf378
 DIST cloudabi-0.0.3.crate 22156 BLAKE2B e12054fd474754031f8f5038d5e2829e1586db974d38230cfd8774db591a58dfdcaea9fb61fc0b35366889d348b2c73ceaabbb462f1abeeffeaab167013c986f SHA512 691ed793e9b35ba382f03897f4c0efc31a528394862a27b814ba8993ad30bbe0ebc9808484baf580e8b69d9c13ad1612776a1efd0f6981545b420139ff83592c
 DIST fuchsia-cprng-0.1.1.crate 2950 BLAKE2B 8519407ab5d1f04d03cc946a07050db4dd7bc70e03894e35b9e66910a3be11224084a86ba45103fdec845e94b7ba4defbd7c5217b035a0796c0c4a94b9562cd7 SHA512 ea9f5beb0dfcb023c22cfc2b37ce52dfcf3a2cbbed0f79ffffc332878858386805c65dce8469a431002367562d857a6c064e075688540c27fcb4056a110059d2
+DIST getrandom-0.1.13.crate 24581 BLAKE2B a61df4369526f860eef6952a021c3f473562cc4171c373c105d8944c305370592cd98a6c28cc0f8d00496f6b47cb900a4498dad942d0b6f60b4d8163d8904f14 SHA512 534b01d28bc9e69a5ad1e84f34aa4154939c27d70c5f557f15e669fa8894c375486ee945a6a6d8adaf1b6b7accda0e24963f70e77dd51ee0638a6ae6daa38925
 DIST lazy_static-1.2.0.crate 10840 BLAKE2B ab0adcf0421131ddd35e95a31a0053e2ffccb03dfc0f46ca4bbb6341f40bdd56d01aed0987489e5e73aa5f7289f3c323d1de0db353a30bb0a75acf53ce8436f8 SHA512 0d80334da99292d68fb2ea9879540676fd45788547b7170b6df1b0a606c1645a07188837f9414196eb44ac63010a3c84fe5c4319478f6fc2cef837295a255edc
+DIST lazy_static-1.4.0.crate 10443 BLAKE2B 25b2e61bbac48f0dcbc79c81d7bf01f2403d8269ecb6be3ea6147bd00f7a588df15a91f44dfc18ada19b21faa71de4637c7d493a8628cbecd0e547d74e616a23 SHA512 e124c0521ec7c950f3c4a066821918da7a9c6e711115d98009ae7c351928fdddead852e7596fea5937a9c30e4e4ce8eee7099b20248b5d6e3b2494b6a6d88cb8
 DIST libc-0.2.57.crate 408902 BLAKE2B 5c84f490037b5e108400f710da79f5471d5f76c384641bbcb721aee21da84e6a2b523487dbf5984b746d070d23c449968ed546e0bfcdfa961dfd57bfb2f3dce6 SHA512 8f210c0e28d647cd2911ad2b7d2450b6e8ea3d628c0cc68000109a7bfdd64fa31706ed7e9bda0f71b920b38a3580fce3d53fe49e9cc53b6ab9e3aeb2eae0cb8e
+DIST libc-0.2.66.crate 457815 BLAKE2B 5da379ea738b75189e106d4be821c999394043303b8bb6a9caecdb1b53e449f11a58edc4589193611b76e7baf00e155ba1077bcca4d0cfae30826e946a0075f0 SHA512 5bf5645a7cbe626108cd71e1d189286ed161fcd3ea12cd34f4e392be4cf93bf78feb6128b1101bedc41a71091398f26771f3efd3880f779ee0be00f706914975
 DIST memchr-2.1.3.crate 20069 BLAKE2B 6afd95538abae42fdb22b82964b64657555734f2505e12c650f844b91d60a3f6f61277065e15289b6e6b7ef8ae5345674ce7465ce2320822e13734949ddcd49c SHA512 95fca57233f023191da0c0abf4835c63ca38404b05c2021e1fcb910068c29321e0b89660088e1be432ed8aea2c4d53f14587e08dba0b258892f2e608606b3b57
+DIST memchr-2.2.1.crate 20862 BLAKE2B 79c8b7772f6c4e76ef98e416cab1a87648fe1f78f77eb31a894a2b1611fcf2d8336e361ab3d692cd03579b33f6bc5adb20d42418475dac5441b8bf356e38e442 SHA512 0f5e11507a4235edaa8ef639753abf62f1c187c8c6e35b0c80c9306958e41893492d4995e28bf28e5710e8739c7e75bb75a515507ec87870741a3b426ba8f44d
 DIST nitrocli-0.2.4.crate 63798 BLAKE2B 64a4998f9b232993692f85ca3890ecdd20e1027dee61b6f31f06be459a02f11a3cff2c035aa462ee5ea1d680f9e201e25cffdd4ca8d54de80c13d78d9a877fa4 SHA512 cf10287591d55378956118a213e4f9752087be37c67d4c89f7660f51c98dbbf3a877afaf11af7625d3776bdf2c7944b25637873af70119d514f2be93131f9733
+DIST nitrocli-0.3.0.crate 68465 BLAKE2B e5534634c090649a818c2b6015e1f9167b26749dccfe48e6ef8c2d7803b1bad9cffcaa1ee3de48a1a04356fe57d5ed6f77ce678ddc75b9a3feadbbcd705d2e8f SHA512 6280d8e7c34ad162e481f0eb2763280193a5b76d871186ebd776033a60a9139f9b436f33061d2bef6467eabb47eb62666c9cf3ddb83290ba2883dfb06ca85e9d
+DIST nitrocli-0.3.1.crate 67983 BLAKE2B 196076079b837f9fd622b0ca0ee63575cbe0a0e317321691472df489cea5b97e472477048a44dc46d5024c1882c1e8ad3305c95ce9e6da91412cf3f6c03737cd SHA512 4e4099400175115cd5304a2f135ec497d0fa3d74a2d19ceb1634b2d921d38f54cc5404ab4de31a511a0f2967ffff355ce34236ed3a3530a16e8e86b9d009fe83
 DIST nitrokey-0.3.4.crate 27462 BLAKE2B 07412e0d3d98a0fcaa54be3d494b107a0a4d999da41dc39f8710a5eb845911d175ca15918e212a1025a34e3ddfff89b5ca4a138d66effd47b639afcb19572ca4 SHA512 abb43ca94b7d4ba55cfabce56b712c99bc4e50671149ae2001de77c2cfae25f17465130729a4a856005a692b846c67b54b2992e41b708e8ad94a8c3af0843e20
+DIST nitrokey-0.3.5.crate 27340 BLAKE2B 6a799f841fa5be1291bfaa071f6fe6072983ad1fd57bcbfefba588ec9c340429cfcb6502e898d8dc2b2a2bcb7bf1afd2aebbc98dae579300d4d636e0603d9023 SHA512 c61b10ff423c16e4cc0f7084900513256ff017f579edc8dd49148bd7b5ab8a7cec93e070e2c21b1ff6a7a0c7775f4f40144a92dd498e7fea6e4e45ef10845ac3
+DIST nitrokey-0.4.0.crate 34431 BLAKE2B 97e5de4f53beabb90ca00685bc62cce152d320bde7092a2a1b911a00a6d6a4bd2bedf5e93e584fd268b119de6626f499ad75c01c715d840be84a94965b90c450 SHA512 b84440bf8624848be5db7c2547d30ebdc9d8bbc8ad09a8809a1a05104f6cb2efe8f5ebd9abd9825ad5028aa474ab556a83836ce4390e650484e0ed1e73543c3c
 DIST nitrokey-sys-3.4.3.crate 61875 BLAKE2B 8c2abf91a40f54907f225c21df9d1e40ac22022a3b8229a8bd6c7a5cb8f87df74675ed5eadf6441bc81025e0cf3ebb21d8301004fe1fc76799e11568317bbf0e SHA512 ae69bc8d3fd0a58224ecfaacd159fbab4f7686daaecd96480a6c824ffbd22a8d2c948c5b2c803fa20ae41adfd4334c6462335f5d02dd7acbae0ab19b33cf0a3b
+DIST nitrokey-sys-3.5.0.crate 69014 BLAKE2B 61b036749f4c990c9f5575d464016ac4c2058ae81067dcfdefb49e70cc9702671ffe3e952848f24aaee475243208cfeb4bfb52dc5210b5b8db8d53124871378c SHA512 c7b5db1cd9d14dc46e2de6c47007da01ba9d242b0378490fd9c03b7e9ff18dbaea1e756b0731a7920cfae9be12f86b62e7219f8b380ac6dbdd0cfbe362fd72c5
 DIST nitrokey-test-0.1.1.crate 8044 BLAKE2B de775515a73a500d3c37a58431c14a1cb6d2f715808c855466b78373f983b948b9e257f03fbcb16729a3f17a3f930ddf3eaac913955286e27e0b27f573659d04 SHA512 4dfbc79e64ed77f58599bc570b126f7975e614de07fa30b3c7da421bf184fbf059f401da42110b14eae5a953599e3875430cd4f0e117df5ce9bd03a753026cec
+DIST nitrokey-test-0.3.2.crate 21714 BLAKE2B fc56914efde9fc25cbe04d8e69401b3bf1e231f80dae73a13e760616bf1aea92b9988efcdbede760b88747b4e33103405ad4c5e54597e8a23cc82aad08e4db60 SHA512 fbc2b00d7556244e880b3bf340bbb5bc19e3411f966d4474a661d5e78979a8eb9b02becfb528f026caa03eee658a715314d0e487fd3e0b2338ac489585a6fdf9
+DIST nitrokey-test-state-0.1.0.crate 14022 BLAKE2B 786a5dbbbbdc8043ab3fbdfe2b1f2e975c1b98558e828b47bc6ed210b1f4e053233b38dc12491d3256710863a20cd24ab404aff7b7a33789361e5304ccf87c71 SHA512 7d11336e50cdadb9d401a83def544c8aaca9cba5e85f7ecf3d1e94042c646dc39a4f4a17f9cdb1d14ae74b6bc1cf5f9ec2f1acb299c63d949f488fb5325b7580
 DIST proc-macro2-0.4.26.crate 33854 BLAKE2B 833db134470a8f12342248c514b08463836ea22eec90162ba96364686e593e3048fe16de669316d88ed5f44b27f948613cf98f4952d49f6b5f37f2da51584c2d SHA512 e35ce0e0a05559417475abc402ef88e6214d7f27ee6cff35577077c5334ec7c6dd5d1d8099f25617391cd4fd2f54838a16ae74039ea6f99ea1d2f0ef58dec010
+DIST proc-macro2-1.0.7.crate 35588 BLAKE2B 8d9b4c1f73c0959a77ac4b5839cf8b1a12259ef83c17fafd773a81518cf3750b43bb05df83719f2966afd5a71982b4a681d76692b93941127a52459990d3a281 SHA512 282514c6d052896130c83f632962a54f6310bea35b5418b41bdb540e51fad73d91bdb1c5e9f83dbd265c1f3d0fc67cd119db5483b5697e34b1598735ea9246b3
 DIST quote-0.6.11.crate 17283 BLAKE2B 04fa278094e505b806324d572154755d2696a6248ec6afb3aa5ea97ec2556e5b845cec3da1089ca321681591c0ca417caee1d51d7a2b57fc411c3f8270a0aea2 SHA512 5fd4936542eec530bbd33b1ee600746ed5c003eaf31c8aebf910fc1372d5ab91cfb10fbfe2a990a49e5eed88747f99d52cd430b34e0a5cce688094e55eeef4cd
+DIST quote-1.0.2.crate 23023 BLAKE2B 4091809b4fc9b8d0b56be814b127d6ffd7c1507becba85dc905606cbe85f46233dc4b429c1e865e7c7de336cb936d956169ceb5dd45b489b7722022ccf818a3a SHA512 67778dff9dc5c4edcdd6454b74ad9353bb6c0c4e51c16cb82f2e393a7d7a0cde084d3c93279b718a8398c40af0a9377ebfae5321e69e635efd8390c125b75ce4
 DIST rand_core-0.3.1.crate 15483 BLAKE2B 2e09b3b3306514c29bd7588498e79be7353de656d8cdeeb4dfc6a1ad092f15a861c2ac20591ff71f7f60d986de9a09c860de4a9f06799f04e736b31bc70a5fbe SHA512 5a7ae601124502bede760fd3179c2b28059ebc3b5983bfcb6b8fa62fb58df95cedc1aeb2734e792d894dfa4620801c13c29702f9cbee64243121575d4b6b9114
 DIST rand_core-0.4.0.crate 20326 BLAKE2B ff85118d2b5c793e3da37bd4d75032e2d73a87bbba0b4c0c07057c47c67b7e919e5c4458b4c929e3b55f53cd3ae6579be5d434369d307e962c00fb3272862937 SHA512 f80e76dabd3308a12880a9aa8b7be83db39b02778c95bb63f862488789a2a67e2f08d4f2dd1ad803c61df0a9fc7f6620aa753b3bf394542ce27c89189a911845
+DIST rand_core-0.4.2.crate 20243 BLAKE2B 22fee5e44127eee047ad8abcd9dd828befd0feee77ee9a0bcd4dd42174b1e650f2a19f1f3b39fde937e58c17afaabf7231e2aabf214c2eb22edf3f85b73f6eec SHA512 f7ae3b690e2cc1fbf2707ee04b752bc5472433f737ab581f9872f7c5660966bc6be45f0c5d2cd8771105df6d4a9d206c55f5cc6ffc1693b46e1ae03a2883b028
+DIST rand_core-0.5.1.crate 21116 BLAKE2B e74791f941a79971f2741172d489d546373c9abcb0dfbffcb7b97b858ec800b2e0c97df4ac636f3aa1b8dd6c14685edf317336d577f31b5c6cb7d89a157e547a SHA512 4f7500b35e165e6c817fdd67a50745d5497d24e554bb554705097e37258751e8755c4d6b8a69fcb5e1977708ba78620bc35d640e4e018fcd4e88d9dbdbebdcbf
 DIST rand_os-0.1.3.crate 18965 BLAKE2B 3cd93b10a46a70e0e3ccaf1fb8ee52230d74b7d790351652a8e39323bf0dcb446d14e9229e13c14a84e93394a22e0a127f50ded11db1df8ffc0a6bd564af63a7 SHA512 01e81a692b78df3b2bd65bc285e5052ccaf208c7d0ace414f251db4fcff7f9ae1502ee60ca5745c95e778d3d5efe15fa84153c17c422b6b6bfee829376c14575
 DIST rdrand-0.4.0.crate 6456 BLAKE2B 330ee64d998a0358f95a3dce50b3e1bbda531a3b613db7e5ba4038a1cf7191b60be3a0f33416e05380c41040704ce52727928915e9d2f4565d39984d1c86fcd6 SHA512 6476275d124bee28747191471e8d8f321a3b1c148c1f2a7ece4175f5244a7de90afe5f99d2eba5244d886b92e38232398864bf90e6d434b09494533942c8d894
 DIST regex-1.1.0.crate 241219 BLAKE2B 37441c1cedfa7fac3904a3a261f618afbdc64e9bcbd9f6913c551ac2cffd454456fce71ae1aefda70cf32d000d990d4e97d9867ffa042abf0e71bdc9df3cbec1 SHA512 f60d9e7c5a8647a1e0d35e995e799335ae695903985cd9f90923ab6483172602e9493005b7c7bd3dee0824de992dcd2f03320d58419206a0d5cfb675c68c4745
+DIST regex-1.3.1.crate 234662 BLAKE2B 41643af1321748db717b37bd4985916afae3a84e19f628ce5d5c194de42620e6b02221083c7e4b35bea5a6749c265575b2c0318dd58ea26b8bcf8d01768e1a27 SHA512 6530767ca2896db30599e5b3e2bf46a785d9c95bda3e530e82c659e5a98345effe5424738fec7545fa5edad12729a396938a9c1dd3a680c0405dab6000fc19f7
+DIST regex-syntax-0.6.12.crate 289531 BLAKE2B c1736b335844d8695e2795a869b538300a9bcfc92ca41e4e9840fc90c133553da4f2929b0f39fdbc7488551a8477b2adb20b83e728a3d847171579e20c925acf SHA512 671e4ecd9dbe58ab5938e0b55890ef0ab2c033221bf549ae0df3b6e831b57099b4c16f8577ca134a758999a1bfc0840aff49be138fb6a19e0b081089f66fa0ec
 DIST regex-syntax-0.6.5.crate 272475 BLAKE2B b2ff299b4b87ab91c925a10faa8a09507272600a12558cade5b18ce615844223384e8420f2025dbd642bf80acb5f608a6c0f5ca59a4c391d4f417fdea15058b0 SHA512 37f2c69b425335a28b8945fcd58a3a39a9adde5588fdcd4b460da0fbd137e0727a7835d71b4e87ff29185c153379402891847d93047e40a578f778a62b324f5d
 DIST syn-0.15.26.crate 145493 BLAKE2B ede140e0184464e765413aa4875a07ab9329de60eba6aa46253d2880032b84a56348060396ffec8a5d81a2aa22c6a6eca73c425778ead21c1c55ffb657cf3718 SHA512 947d70dff83ffd33fda806597d54e572555b54c1600e357df919165fdc7141c6f9762b37f25f9b850e8a7775c33b6df3fc93f3eff12b36b059e696ad90619baa
+DIST syn-1.0.13.crate 195242 BLAKE2B c6889e24927ac5ebc1248be2d1dd1512b888e67ecad686dc67d29ff517aac2035cd4a8bf6dc87db54532eed72608f3a06ace41989bc7f47789c20041841a99e8 SHA512 234b470f432c1981f13e63e37334e200cd872d288f0ca10fb849281a5fe13c077eb9d41e75933a296f8c3d4e71ca8cce8724ef8c3d98bd9972146fab3d010663
 DIST thread_local-0.3.6.crate 12388 BLAKE2B 290c35e5327e80a5cdca5609252b1efd1b78a654fc9ab4ba68eeaa3c2769d844f725d17d91cbb15048dbaac84913c51edcb39bb402882c9e7b4d0c4e4811518d SHA512 cd783d3d9caec43868da1f6118d4c4d520e03b9f1049d8f15d2c12482989401d3aee748e04a149953d35e5d6487355c2891d44569ef688bc1d45f01b6461d253
 DIST ucd-util-0.1.3.crate 25897 BLAKE2B d67d250603625d7fe55b1bd17a8bff03ddf2e48b531e8f754f51dcd49370a2b66d0915842fb2fce85a69df2c38f9c086ac3c36115d40c5a8138e5451f71a1cfe SHA512 50a796feb198012241d73001bb53c8e3d3168df379de91d7ecaccfd829b08a356afe3db736fb8cced8748141d7a9e4b157440442c425816c78c0615c08e20f2e
 DIST unicode-xid-0.1.0.crate 16000 BLAKE2B 159004a7bbb7476b39e982b51dbf615717095fd5946536e757653aa941bbf1b774f331db744ecc33bb2ead4b0a6d254fde86cfd6cd8b83ab9983fa89928eddbe SHA512 cc5343e2166938322cfd7c73f1f918f2a9c46846ac0ef55933d1e44cdfaf6f7da2b7ff18b68e356c47b6d8ba5565eda0db42c347dcbde830683f341ac2b1849d
+DIST unicode-xid-0.2.0.crate 14994 BLAKE2B e66b4255798f0ef1c81fb852613fee396a042d780d2158a171dbb5e7dedad0b3d2522f5401ae5d215f89ab8be4f5c371b046e4845693a65554c2a6eedc5d1e28 SHA512 590f727d8d8354023062ae5fe7ac5bed1bcf79d86b883effd7f33b3ea3b1c8922998a63d621ca6962a969e890fa6edd009871f21cd57b1969264f41ba3f78359
 DIST utf8-ranges-1.0.2.crate 8510 BLAKE2B 877ff38444aec99bf8e0d09c6880d4835eb453c8c7e38fa5e7f8fe3cadd5b34b11a030193e46fe97b19fd90e94de156c0eaf12c613aae7cee47f0f016a3fb96d SHA512 ac168b908a34c4814a682b77502d2e5aa3130acb01fa87e29c78b760a61ba61b01f9fa2d67202604ac9824e0b2fe92143b72c0d4100a62ff9f53e4b00a4a12fb
+DIST wasi-0.7.0.crate 33941 BLAKE2B de1e4e577a1237a233f81ff1a3bd7f888020a42d93a807187a154a3ae0593397358a8667a065f0cdd5497dd2a89889e418d33a0d42ab1631b3f99677e9ebd665 SHA512 1950e78df7f0ba21b917680633d092704f1fb906bd973de4ddc43cedb7bf449f6e881d50e3aa0d5595e8d58796915d582b69c116ef536f819b6f035affea18f0
 DIST winapi-0.3.6.crate 1029391 BLAKE2B 9a52085c3cb74d84bc66cee575da0105eeca69f6abd3c8c601a4de013bafea795f044748be10ec9ab419a9ec82a304a0b65ba4d74f6cb39baff91228f83009f1 SHA512 991eb3d6ba08d59e7f7ec81ebf469cecc56b3723b636392972d2fdc1d6f13d88f8a244ad5cbb20f6058d12b44e060ed663c12aa3fbcd1235ab511fafa105cd3c
 DIST winapi-i686-pc-windows-gnu-0.4.0.crate 2918815 BLAKE2B 4d357e4d30f9552972170d65b9a5358b69c46a3e772fe05efc22f3d4ffc1caeeaad7aacdc7abd503a7ad0545f8bd7d22bf351dcb6df76f812fa4d45c34d65df0 SHA512 a672ccefd0730a8166fef1d4e39f9034d9ae426a3f5e28d1f4169fa5c5790767693f281d890e7804773b34acdb0ae1febac33cde8c50c0044a5a6152c7209ec2
 DIST winapi-x86_64-pc-windows-gnu-0.4.0.crate 2947998 BLAKE2B 2ad1ea8b5fa07d544e910ccba043ae925269b76b26c9da356305b34b86741dd8b9aff0b9ffe3d562db4fcd7d7c46a11ce9e3168b782b1d89ae6881742b7ede82 SHA512 4a654af6a5d649dc87e00497245096b35a2894ae66f155cb62389902c3b93ddcc5cf7d0d8b9dd97b291d2d80bc686af2298e80abef6ac69883f4a54e79712513
-EBUILD nitrocli-0.2.4.ebuild 1402 BLAKE2B 3e917c95333884ef416762718b5a3afe4f2b80653a773330498dfeda6d2fe8e9434e63b28a8123d50b655ef77d9e0d7966781b0dd5cf617f21f659a2abe47dd2 SHA512 017a1925ca93130e14fb14f0f76ef5f5edd991098e989a0b0815cbe3e6309d9c6fd186b88032f173b4474c9886957b58bc061c3b33d12288957707ae95625d08
+EBUILD nitrocli-0.2.4.ebuild 1393 BLAKE2B fcd3890ed453e60720f06e9e59ed7e1122547d30f36e81329e32a1485a92adaec7e325e14fa4bf15a20c727f0cd77784eeb04177f9623c2c172c324a0bc5f2e0 SHA512 ece7cd759e2c873d9f7da95c186f622e3de27bc977d94be6684dc79e8138d47fdb2fcc000057052f900bd92f1baba6158358b13cd09bce24dfe791203e2aceea
+EBUILD nitrocli-0.3.0.ebuild 1402 BLAKE2B 583cbc0b43d355fa98cd5149d3a6ce0527a4cd2dead10f0c54af4be092f0dcc4301c9da92cd9ededb88ced0ff76f7efdae4dfb693663882981d3cae663378243 SHA512 693a801e8022455c8bf88a79d478b9044fd17566f10bae9afb32ef857b32242fd7c6390ee74589473ef932f5318f01808501f61b24218e6de41f5c28f7170352
+EBUILD nitrocli-0.3.1.ebuild 1207 BLAKE2B fa9299c2fc9af3c538bf199ffcca4efd369701c47d498827b2f416126f7ea472c11e76ad93d945c4a520f39c1157d80d94e04a971f08afc4543d79757bc3abfd SHA512 097d11e94992648c8fc318b52967621f5093c8a4535c966a36e8364ccbcb3149bf99dc8e5dab0d10e6129073086dd19cb97d5fd8536b9f876301b97ae1c144dc
 MISC metadata.xml 683 BLAKE2B a973761f8df97168483a0adc13bf44f088f13fb9c472986cffed08d53f69cdbc27a4bc195babcd86796853968c8face6c00004e060086b2ba4d09c52ce978815 SHA512 3f4615ba5af13e358c1c3a4b28c3dbec77c0b99af4692c0b2feedb4f21a1e5f8f76cb7fbd2cdaa5a8c899d340094b8029a6967dd68d591586bef551f8eb61b1f
diff --git a/app-crypt/nitrocli/nitrocli-0.2.4.ebuild b/app-crypt/nitrocli/nitrocli-0.2.4.ebuild
index ff6f4c8d1399..8003f3ae49a4 100644
--- a/app-crypt/nitrocli/nitrocli-0.2.4.ebuild
+++ b/app-crypt/nitrocli/nitrocli-0.2.4.ebuild
@@ -67,7 +67,7 @@ RESTRICT="test"
 QA_FLAGS_IGNORED="/usr/bin/nitrocli"
 
 src_install() {
-	cargo_src_install --path=.
+	cargo_src_install
 
 	einstalldocs
 	doman "doc/nitrocli.1"
diff --git a/app-crypt/nitrocli/nitrocli-0.3.0.ebuild b/app-crypt/nitrocli/nitrocli-0.3.0.ebuild
new file mode 100644
index 000000000000..c8cb63260fed
--- /dev/null
+++ b/app-crypt/nitrocli/nitrocli-0.3.0.ebuild
@@ -0,0 +1,74 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+CRATES="
+aho-corasick-0.6.9
+argparse-0.2.2
+base32-0.4.0
+bitflags-1.0.4
+cc-1.0.48
+cfg-if-0.1.6
+cloudabi-0.0.3
+fuchsia-cprng-0.1.1
+lazy_static-1.2.0
+libc-0.2.66
+memchr-2.1.3
+nitrocli-0.3.0
+nitrokey-0.3.5
+nitrokey-sys-3.4.3
+nitrokey-test-0.1.1
+proc-macro2-0.4.26
+quote-0.6.11
+rand_core-0.3.1
+rand_core-0.4.2
+rand_os-0.1.3
+rdrand-0.4.0
+regex-1.1.0
+regex-syntax-0.6.5
+syn-0.15.26
+thread_local-0.3.6
+ucd-util-0.1.3
+unicode-xid-0.1.0
+utf8-ranges-1.0.2
+winapi-0.3.6
+winapi-i686-pc-windows-gnu-0.4.0
+winapi-x86_64-pc-windows-gnu-0.4.0
+"
+
+inherit cargo
+
+DESCRIPTION="A command line application for interacting with Nitrokey devices"
+HOMEPAGE="https://github.com/d-e-s-o/nitrocli/tree/master/nitrocli"
+SRC_URI="$(cargo_crate_uris ${CRATES})"
+
+LICENSE="Apache-2.0 GPL-3+ LGPL-3 MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc64 ~x86"
+IUSE=""
+
+BDEPEND="
+	>=virtual/rust-1.31.0
+"
+DEPEND="
+	dev-libs/hidapi
+"
+# We require gnupg for /usr/bin/gpg-connect-agent.
+RDEPEND="
+	${DEPEND}
+	app-crypt/gnupg
+"
+
+# Uses a plugged-in Nitrokey and runs tests on it. These tests assumes a
+# pristine configuration and will modify the device's state. Not meant
+# to be run as part of the installation.
+RESTRICT="test"
+QA_FLAGS_IGNORED="/usr/bin/nitrocli"
+
+src_install() {
+	cargo_src_install
+
+	einstalldocs
+	doman "doc/nitrocli.1"
+}
diff --git a/app-crypt/nitrocli/nitrocli-0.3.1.ebuild b/app-crypt/nitrocli/nitrocli-0.3.1.ebuild
new file mode 100644
index 000000000000..c12f84a33627
--- /dev/null
+++ b/app-crypt/nitrocli/nitrocli-0.3.1.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+CRATES="
+aho-corasick-0.7.6
+argparse-0.2.2
+base32-0.4.0
+cc-1.0.48
+cfg-if-0.1.10
+getrandom-0.1.13
+lazy_static-1.4.0
+libc-0.2.66
+memchr-2.2.1
+nitrocli-0.3.1
+nitrokey-0.4.0
+nitrokey-sys-3.5.0
+nitrokey-test-0.3.2
+nitrokey-test-state-0.1.0
+proc-macro2-1.0.7
+quote-1.0.2
+rand_core-0.5.1
+regex-1.3.1
+regex-syntax-0.6.12
+syn-1.0.13
+thread_local-0.3.6
+unicode-xid-0.2.0
+wasi-0.7.0
+"
+
+inherit cargo
+
+DESCRIPTION="A command line tool for interacting with Nitrokey devices."
+HOMEPAGE="https://github.com/d-e-s-o/nitrocli/tree/master/nitrocli"
+SRC_URI="$(cargo_crate_uris ${CRATES})"
+
+LICENSE="Apache-2.0 GPL-3+ LGPL-3 MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc64 ~x86"
+IUSE=""
+
+DEPEND="
+	dev-libs/hidapi
+"
+# We require gnupg for /usr/bin/gpg-connect-agent.
+RDEPEND="
+	${DEPEND}
+	app-crypt/gnupg
+"
+
+# Uses a plugged-in Nitrokey and runs tests on it. These tests assumes a
+# pristine configuration and will modify the device's state. Not meant
+# to be run as part of the installation.
+RESTRICT="test"
+QA_FLAGS_IGNORED="/usr/bin/nitrocli"
+
+src_install() {
+	cargo_src_install
+
+	einstalldocs
+	doman "doc/nitrocli.1"
+}
diff --git a/app-crypt/nitrokey-app/Manifest b/app-crypt/nitrokey-app/Manifest
index 685b928f683e..b8d247185e63 100644
--- a/app-crypt/nitrokey-app/Manifest
+++ b/app-crypt/nitrokey-app/Manifest
@@ -1,4 +1,4 @@
 DIST nitrokey-app-1.4.tar.gz 1205541 BLAKE2B 3e2e3ed85aff85168f9669cd16df026cc2108c601998222f6f6411b19bc4f027541e2c9368f50d383c21bdf2f38d19c69559616d89f5736d4634973d686f2310 SHA512 e0a29bd312b5f8bd1a5bd09ac118b9191a9261341e31f59d355e119fce488c23978af804113f96a93d1b5301ad17e53c2cfaefc9f5ec3b37fdd1ba304325f8a9
-EBUILD nitrokey-app-1.4.ebuild 885 BLAKE2B 2656ab9dccda2be74c6f1a729ef097c66acf86fef65045283458db562353b158af060d65613767f874d54a3294554761453c1d5b8535fca442132fe5c982b0c8 SHA512 58139a711e7a61225a0c441b32b4d7544147134eae1d6bbb81dc5f68963cb29387ef572c7ac924461d94475e76b2996ab14d84052b98408870aec8be7b6f09d6
-EBUILD nitrokey-app-9999.ebuild 882 BLAKE2B 5ff121ed98b96662913b726f400b20e888a8fae24b3519a46d48061baed9d0d4199aef2cdcec8c590dc8ddd901df7958173d0712b95dae834b4963116edc7aa6 SHA512 a27c004d08d0e352af55943bf21bc182fbb3239ff381df5b7a4246e9d699fbf8a34cef154d2708b166637fc77222b5aab37db78f715a2f362459b4acdcea5e17
+EBUILD nitrokey-app-1.4.ebuild 892 BLAKE2B b16701e4b785540064ff71f651c579a28920ac496f8f16456596661c3097421ee40f8612b219fb1ca8c70020b3e5f2b283654f8c4f2f5286be5e05b0c357826a SHA512 9c41720e78912bbdf59f60c84524b0f6b3bf491fcd7d520e5718893574336a32120f0c8419352a9f9909ad65f4dafb0b162eff7a4896802e4feb7ba6df182766
+EBUILD nitrokey-app-9999.ebuild 894 BLAKE2B 63c279f2871365ccf206ce3b32129e1e2593fc7d89ac2622519788e8d81ccfa3769f80f6f10e0d6174957b81b344a09e893d51b70ffa1d6d0496a21a8b47f7be SHA512 4266239af611b00053fda5ec1fda3c2a70b971316f8cc901a71bf6b6c837f87c2b9237b2a2393ceecf7863f93493059e3467bfefc00882427bbad672360a8351
 MISC metadata.xml 399 BLAKE2B 622fa027d3ed6c95ea87e6c533289af1b66229f76bc163b490a8c5a819373c85d21ab22505c9a159a7598fdc17b1bfc7d01ff6217d3d8f8e64ef38f2d68d710e SHA512 fa204891e67b5c6f1ac7082fe49f52ae287f6aed77dd1fd8972770c7a5ddb7f2af71f543a3888c9f572dfb04197f98486a75ecba5960506274c634782af110ab
diff --git a/app-crypt/nitrokey-app/nitrokey-app-1.4.ebuild b/app-crypt/nitrokey-app/nitrokey-app-1.4.ebuild
index 1bf3389596c7..959c79c33783 100644
--- a/app-crypt/nitrokey-app/nitrokey-app-1.4.ebuild
+++ b/app-crypt/nitrokey-app/nitrokey-app-1.4.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
@@ -16,7 +16,7 @@ if [[ ${PV} == *9999 ]]; then
 	EGIT_SUBMODULES=()
 else
 	SRC_URI="https://github.com/Nitrokey/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="amd64 x86"
+	KEYWORDS="amd64 ~ppc64 x86"
 fi
 
 LICENSE="GPL-3"
diff --git a/app-crypt/nitrokey-app/nitrokey-app-9999.ebuild b/app-crypt/nitrokey-app/nitrokey-app-9999.ebuild
index 69510a7dc8f1..7b3dab537ea4 100644
--- a/app-crypt/nitrokey-app/nitrokey-app-9999.ebuild
+++ b/app-crypt/nitrokey-app/nitrokey-app-9999.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
@@ -16,7 +16,7 @@ if [[ ${PV} == *9999 ]]; then
 	EGIT_SUBMODULES=()
 else
 	SRC_URI="https://github.com/Nitrokey/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64"
+	KEYWORDS="~amd64 ~ppc64 ~x86"
 fi
 
 LICENSE="GPL-3"
diff --git a/app-crypt/nwipe/Manifest b/app-crypt/nwipe/Manifest
index 0f7c56386f1f..35042d3120cf 100644
--- a/app-crypt/nwipe/Manifest
+++ b/app-crypt/nwipe/Manifest
@@ -1,3 +1,3 @@
 DIST nwipe-0.25.tar.gz 49608 BLAKE2B 3506093c3e93b4aa982dffdd2f922f525404b397d7b3469f9ccdbf6708f824e9d3a2e34590a34cb4e0411bb3a8a4555a1f5940b826d39d39c10c75b668a10d1d SHA512 1051f2565ad7acaac7c289e2db91aa4dee40c3bb9a9dda97b2dec047e94cd91e7d59fd61603806628cabeb009932f011e734638fc9191c22bb812d7b4b661b46
 EBUILD nwipe-0.25.ebuild 563 BLAKE2B 86d067eaeb60a4b3d1629d8fbc4a1b87b3a1af0bbdaee1becda2a465b3eef784fb8b00f2d9a5f518155ad82db3e8a45bf75d2bb663ddcb3e8c6aaaa3e41dce43 SHA512 de5d1c66977fdecfb5b0a196c3504c5f61b1c26fc4957d490d012e87ec5a9af31d7655c62330cff3f3ce6f369193103f4337dec997457a55bd06251e3553558a
-MISC metadata.xml 325 BLAKE2B 7f200272a1bbd3a794cedae13459c0d339946dfcb07004474258144e65a82ff623fb8b132343f8e1a8ce9d4a30cf81e86724745aa9bd2a452d37201b658ac87f SHA512 7e34fed2902e5b4c88a73b8976a9d7e903e5149233d1bd8625485dd54a21f012fabf7585c5713bcba837ba15ae03656ad3fb1b51a110bc5c42e4a9ccb0728822
+MISC metadata.xml 247 BLAKE2B 056bdc9d5d640f487cb60a4ba64eea37b35e10f99db421540331f78e98cc4eeb55396a0aabbe73b5dc1a90fc2c14298544e21bdef3a43ffec09212133981c395 SHA512 b45f44f0dc651a7ae0a74a287b9f6736f16e4451d820c06d649fe1eccb6a92db440a640f623ab76b67b01485d6fc697c78c17a192056b7903f6d72ffdfac0357
diff --git a/app-crypt/nwipe/metadata.xml b/app-crypt/nwipe/metadata.xml
index 4ae809e68a16..c2ed1ed608a0 100644
--- a/app-crypt/nwipe/metadata.xml
+++ b/app-crypt/nwipe/metadata.xml
@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="project">
-    <email>crypto@gentoo.org</email>
-    <name>Crypto</name>
-  </maintainer>
+  <!-- maintainer-needed -->
   <upstream>
     <remote-id type="sourceforge">nwipe</remote-id>
   </upstream>
diff --git a/app-crypt/onak/Manifest b/app-crypt/onak/Manifest
index 37738c255eb0..aa6410a56eb5 100644
--- a/app-crypt/onak/Manifest
+++ b/app-crypt/onak/Manifest
@@ -1,3 +1,3 @@
 DIST onak-0.5.0.tar.xz 240764 BLAKE2B a42d9a97137ae7fb403d8a20f2a9a5b5060d216fca97447630c8e8659440d5baa0c6e0fbe983feec8b4061263decc1183868055fe53c0797d49dd1f2e4c141f8 SHA512 db38793acc82089089ac0b9fb6db9989b6bb8e94c35c14112d028d12f7bb7553b7409121378346625528c4916506d007bf40963f4a346483f51a23b670680a7d
 EBUILD onak-0.5.0.ebuild 1012 BLAKE2B 3dacd0c3dd3afc4b74018f8056f5acc74bd8cbacbdb9c82f553264f12894d2815b953828284adf878b2a31d0d6c8cf15f3189767de5505fcf11ccbc982a93ed7 SHA512 b10740cf0ca4c1790acf7d7584c9e64e7865ef4159a2d56a034da96f0adc48c246efe50bdb986c32d317471a1f680e5f77b12c3bb0e3b301ac14fa4d1b92f423
-MISC metadata.xml 246 BLAKE2B 569d634cc821d4a537880a58ca96bf709155b0af827d8153b9521d5ca29f174ec29629d11b9eb91ee1cbba5f1a823d5c621521105a00e9fbd6d9a27bc3740bde SHA512 8ac20e3524a896e77d186b34b589ffe4287593c43fca1d50bcc06cd27e8cb8f5c0da2087622413a748a1738177d5939a50bda7a1e5d0ba36fbf4fb6d7b9bb015
+MISC metadata.xml 167 BLAKE2B e4dadf27fd344484f2bccb5b904909c89aac568c32e5b3c44bdf139eacefd4b4fae74419f503d2b7da0dccc1b68ba05d777d11292c0f89270d1ac5c9c703e8ca SHA512 7c8decb24ee3a850e38186cf3c7f8933a28017426806870ad6ef9ceb2533be147a2681fc789b535a81cb528af8c29d90d3006e4f250aee23bd7dea4561294e33
diff --git a/app-crypt/onak/metadata.xml b/app-crypt/onak/metadata.xml
index 4f6e28828f65..7a38bb900964 100644
--- a/app-crypt/onak/metadata.xml
+++ b/app-crypt/onak/metadata.xml
@@ -1,8 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="project">
-    <email>crypto@gentoo.org</email>
-    <name>Crypto</name>
-  </maintainer>
+	<!-- maintainer-needed -->
 </pkgmetadata>
diff --git a/app-crypt/openpgp-keys-gentoo-release/Manifest b/app-crypt/openpgp-keys-gentoo-release/Manifest
index 69247e903517..2d44cf39eade 100644
--- a/app-crypt/openpgp-keys-gentoo-release/Manifest
+++ b/app-crypt/openpgp-keys-gentoo-release/Manifest
@@ -1,6 +1,4 @@
 DIST gentoo-release-test-sigs-20190224.tar.gz 3235 BLAKE2B 924c69a62d5321716f536144f0607bd3ec4a65d76be492adc729864fd9bef82df0086541ae13034a83152ea0c8dc3cbd168be6cff111a3484128a22cbc8ef1d4 SHA512 f8cc2e84bedbdf14ace6abe4aacf8f0c9810c77ff6ae0fac301829d9d4d5cf0c128a76516c773ac993879215bcdb0aab097e1e7e747d8e1a7c4cfc815bd4d3e6
-DIST gentoo-release.asc.20190427.gz 59649 BLAKE2B 138c6bad0ec688c515888433256c95cea7d8ec1e76587e0e89d3c11078eb1b85931ba9f6630f60dc8bc168b8303204ebe05b9bad7abe946a74730123b1c36d89 SHA512 1491fb2bcf9c6a29adf8ff08cbf8cd40517ee3de7adc048be29a2300f460e78594548c3e47bd18da68585248c560d868815ded5584ed18929e4072c4933484f0
 DIST gentoo-release.asc.20191030.gz 23981 BLAKE2B 307ceab69e309a53c2db191cf9d7a484318e852af648d93d9ad4bb2422737ab8de9257b457e5f201d86d226b348447acfbe57d259ce436150f75ccfb9f6ed60e SHA512 f3fbe0198f80f37784613c2a390c29f55e5b6291c44ee64d676806a26745017f8a9168573e13f6fc2fe93910927846c584b9f5cd017c4eac1cc875d7ed30cb8c
-EBUILD openpgp-keys-gentoo-release-20190427.ebuild 1157 BLAKE2B 9ac0c5abb4b57f4ef0df0a101864dc2f3ecb317620d8fefd2960469bd7b66d9828d3f3b05b9772bc4e566d4a2f13291607e30d27a4d4bfca75745155833c47b7 SHA512 e299f23e428461eaf6c33c234d776008148b2980fdcb529946d0125376d889ebee5864ab6c8579cd20b4a4c5f03359b9c193049c0c571afaf93bb81e77bfc52b
-EBUILD openpgp-keys-gentoo-release-20191030.ebuild 1170 BLAKE2B 5bbccc1c7158f42fb51a9f8a7e96a776befe6d16b3109d877a66dab1da8180fcbb57652cd41e5cb2d2e78b97b84b95ed1b809d4717bc707fbabf9bace3eebddd SHA512 28187da54c9d08efa6143b1a61d3575c1abce836aa8832fc5207fe41ca302c50e2ab2eacf693f57e23ca01d0a4d0017264b5d9bfbd10b28dff330565e6f8d303
+EBUILD openpgp-keys-gentoo-release-20191030.ebuild 1157 BLAKE2B f2d31c39be50ac26d3cd7144d5d1b558e3fbeb0f2cea13d8130da3e125ae2e480cf7ba85b88a1a706a50d8f612e83838b403bbe7c3fccf427f1930e2911b59ad SHA512 5014fb5bc50c2e5d151545490aeebeccf4e860f40971fc5c54e220326bf4dd341f4f660284f2904e6c415b5af9256e68c60469d71769cd735ff7446d40cc4096
 MISC metadata.xml 247 BLAKE2B 1750cec57189e711ca5eba89a78e1d317f0839fa53564fbd39b4e955c28d98f4ae04caf9069afc20a18536cdc92b30fe7b15eb086767c742bad07d9980cfd24b SHA512 d6e2ea8a9d74791bcbf3d6311a66bafc20b8f4db3a576d9a8d54b86d7afb231122b8d87f71f3f46360980adf8d815c633b6d5041f9a30fc8656e8fb66057a282
diff --git a/app-crypt/openpgp-keys-gentoo-release/openpgp-keys-gentoo-release-20190427.ebuild b/app-crypt/openpgp-keys-gentoo-release/openpgp-keys-gentoo-release-20190427.ebuild
deleted file mode 100644
index b8eebbf0047a..000000000000
--- a/app-crypt/openpgp-keys-gentoo-release/openpgp-keys-gentoo-release-20190427.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="OpenPGP keys used for Gentoo releases (snapshots, stages)"
-HOMEPAGE="https://www.gentoo.org/downloads/signatures/"
-SRC_URI="https://dev.gentoo.org/~mgorny/dist/openpgp-keys/gentoo-release.asc.${PV}.gz
-	test? ( https://dev.gentoo.org/~mgorny/dist/openpgp-keys/gentoo-release-test-sigs-20190224.tar.gz )"
-
-LICENSE="public-domain"
-SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-DEPEND="test? ( app-crypt/gnupg )"
-
-S=${WORKDIR}
-
-src_test() {
-	local old_umask=$(umask)
-	umask 077
-
-	local -x GNUPGHOME=${T}/.gnupg
-	mkdir "${GNUPGHOME}" || die
-	einfo "Importing keys ..."
-	gpg --import "gentoo-release.asc.${PV}" || die "Key import failed"
-
-	local f
-	for f in gentoo-release-test-sigs*/*.asc; do
-		einfo "Testing ${f##*/} ..."
-		gpg -q --trust-model always --verify "${f}" || die "Verification failed on ${f}"
-	done
-
-	umask "${old_umask}"
-}
-
-src_install() {
-	insinto /usr/share/openpgp-keys
-	newins "gentoo-release.asc.${PV}" gentoo-release.asc
-}
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 ae331b090421..ccfb39bbd1f4 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 8e1d6c70d1e1..ebe8d474370f 100644
--- a/app-crypt/p11-kit/Manifest
+++ b/app-crypt/p11-kit/Manifest
@@ -1,6 +1,8 @@
 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
-MISC metadata.xml 454 BLAKE2B 82db424896936d17b167806a47d54674d1d6eebe192ad1f8b4e985b00f74f10aa5f18ea587b866906571a91dcfda83626f6b25ebdbd6a6e02da65b34511b2b0e SHA512 24042c945cc3ab622b74c30eaa08819ebce4af9320b083ceb1f3f4db110fba6539121b4dbf0d245afdc395a9854bec022575861f7ae4e9418018d6bddbd4a888
+EBUILD p11-kit-0.23.18.1.ebuild 1955 BLAKE2B d49489e85d05b6c4f4be571032a7203a7142a31a0378ab6d67c04d003dbffccb25e15fc71fbb1a71c081117d9aee9859c30d1ecf7608a4536e00ccc483c864e5 SHA512 f3b0fd9f48e8989f6ab8cdafd44790356a2793bbd562bb10f11d6961baec1f078bcee4807b679fd9a8c727b80eb9cc1b75eeb64f108c232f45baddbee6915c16
+MISC metadata.xml 461 BLAKE2B 4e2b3a011845a7f8c6e4afc0f176615b5badbb64f73a6f83854c4b40babc1b2cafafd0dc26ea65a16d2b96a314600218271e63aeb58f5fb1a3dec3fbffd4973c SHA512 947edc1be15e91e32b12b75b95ba95ea3db9528c2e6bbaf3006f9d9c842bf63256614b1da3129b5a8dd9f2c57771523a79d02febdc17ce9214cbe91276eee82a
diff --git a/app-crypt/p11-kit/metadata.xml b/app-crypt/p11-kit/metadata.xml
index 911ed2493e78..21a9f711d2ff 100644
--- a/app-crypt/p11-kit/metadata.xml
+++ b/app-crypt/p11-kit/metadata.xml
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="project">
-		<email>crypto@gentoo.org</email>
-		<name>Crypto</name>
+	<maintainer type="person">
+		<email>zlogene@gentoo.org</email>
+		<name>Mikle Kolyada</name>
 	</maintainer>
 	<use>
 		<flag name="asn1">Enable ASN.1 certificate support</flag>
diff --git a/app-crypt/p11-kit/p11-kit-0.23.18.1.ebuild b/app-crypt/p11-kit/p11-kit-0.23.18.1.ebuild
new file mode 100644
index 000000000000..3a5ba72d93a0
--- /dev/null
+++ b/app-crypt/p11-kit/p11-kit-0.23.18.1.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/${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"
+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/pdfcrack/Manifest b/app-crypt/pdfcrack/Manifest
index b1ff3647356d..2e879451aac4 100644
--- a/app-crypt/pdfcrack/Manifest
+++ b/app-crypt/pdfcrack/Manifest
@@ -1,4 +1,4 @@
 AUX pdfcrack-0.14-cflags.patch 236 BLAKE2B ce6e226f6bb8286437fa3a40abae4d1fbde59f7913f6d5fd0c3b510e8f92043f15e96ab790d777c4306a06291de9f8bab9633cf42b29ec0262f34558035b134e SHA512 8fd2f9bc024bff34bb1f7e90e7f27b80473ca12f340735f4cbb8d3717354df9907a9f05d57950a4a9f9604c2452a75cb7de341b4b84f2d248a63ca047131388b
 DIST pdfcrack-0.16.tar.gz 34467 BLAKE2B 7eda8dae9cec3117f410f9ebbe6d536ca627c72b53693d4021f3faf104ed0439e05dda5848d1f18911544336c6303f9b061c373da9a0a275ecfa2c29ed425b76 SHA512 460113f28249d1ea1cefc6dac8ff22b33849ccff50f61830144e41eeec47c4b9113845bb955d26757adb0552d8c0dfa43b3f5666c1419afe4063037a1e1c933d
 EBUILD pdfcrack-0.16.ebuild 513 BLAKE2B 88ed9f07b3ab02b0fefe481206ec2fe0cf86dd2abbeeeb5a3ce8f344f8c0f0de3153590452fe03b180d0b5f75a88012ab4d28d0a37728efb358c97d3e3f13d51 SHA512 852cdea9e8748e0f01dd4f0316e30d7c4e9291b468ae092405a2a205a8fe851395715a83569a22ce866bac04de7b67e3dfb306fa22d88d9589a8502a8e8641a0
-MISC metadata.xml 318 BLAKE2B d6fc6a392870efe2b14c4fcde09a2b17806d42b8839124c079c87bd1b30c07054b3aaa3fa8a642f486155a6b1f9faf5a5e57cff7d6df12a7a8e464f1a261c762 SHA512 19b662a277c05c40365c89346bb98a42e1cc8924a0343899be55dcff0d38b919f681fd8b32ed8e0db0ef07b717847caf4df73d862bc73e46f2c6fe7985a94db5
+MISC metadata.xml 245 BLAKE2B 7f4d68ecbb61201c00aef20fe9e899bab5024bbe39ba5c1149dfe819cb45c3fb6b046804ce0bcbf42a59ec919f9aff8bc484ce8e98c72171ce3613dd9f79f611 SHA512 50ade59643a5304dba64fb839a86d1b3d6878d0c0d9282eb92d0eef8381566ef5d2118ffeaa0664d4ecaab63cc88d1da87768567a3afd848ba7ab5ded5203ae5
diff --git a/app-crypt/pdfcrack/metadata.xml b/app-crypt/pdfcrack/metadata.xml
index e76ba30337e1..b97debc0a9db 100644
--- a/app-crypt/pdfcrack/metadata.xml
+++ b/app-crypt/pdfcrack/metadata.xml
@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="project">
-		<email>crypto@gentoo.org</email>
-		<name>Crypto</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<upstream>
 		<remote-id type="sourceforge">pdfcrack</remote-id>
 	</upstream>
diff --git a/app-crypt/pesign/Manifest b/app-crypt/pesign/Manifest
index a87e3928df69..a3a9729bbcb3 100644
--- a/app-crypt/pesign/Manifest
+++ b/app-crypt/pesign/Manifest
@@ -1,4 +1,4 @@
 AUX pesign-113-nss.patch 2092 BLAKE2B f75730c2ab48f0ff6af4237fc46c535b3ceead357e31a548c28b78648fec7d52a5cc1bc9dfdb9db4e6cf22b7312cc452afb04a3088810140055ae88b55fb2f1d SHA512 7a4ebd4c875cf6678a6d2ca4083eafea552259e2c1692d167d0b948ac73d50244db3feea1c6d7c403e152236421609da5d92cd6405fb3107e1c3933c2f94fece
 DIST pesign-113.tar.gz 124618 BLAKE2B 36cdface6ecdf9003251da3058b21b2ee8e94eb655e47a8668b38c4ea576d990a71860952eea277d5e029bb007039c8e3ded9918e89d47f6db404423acbd1cc7 SHA512 e71dc90c2ab8085d1b000c0d2cf9cb00ddaed1ea1393db75c2d19a96f1b1c188a26b76850533ba97ec254a3b48db6b07a69b597c329ac891e64422780a358c24
-EBUILD pesign-113.ebuild 1177 BLAKE2B 2ac7fc3a2197194d5e1518ea110789054947eb94b2001190c34dcc6883559052681517361152ffdf39b807572d338f7764511a3dc109b27daf11c47ea557c8f7 SHA512 42308998cf9546dc4e844c96688c3c9990e51ee001925783e2e985cec4ec5470e63d62302cd8d81a5ae55492fc64e15eec8ff07a03da56c0bc53d1239a2ffdb1
+EBUILD pesign-113.ebuild 1139 BLAKE2B c0460e8597f0130f0a6f79ff239dd6e8393f69fa016d023c8088eb37ed933fdbd797855167ba81899dbd0fc4ac83177988743ec18c05a1b0ad237ebe6a26c3a4 SHA512 c59ce37beac4016a0e2e8a111cd1ce943fa6a2be6ee0df2bfbc0e95cfb7670a8dbd772f953ba856c254734dd797c9c1d90f3e923188b23fed1e6d41f45138eb0
 MISC metadata.xml 248 BLAKE2B 53654091f15005bbc49262b840fd687c88b36450646c7639f9767a891a973f393dbbdc093143b3b120e50b1263e383d674e227c44de4c204b34a3a7892ed59e7 SHA512 c77276afdf688db707b87d976aa741c359c9152d0de1ffbdb9d3202a3b62aa2797cd8beb86354dad9fa2158be17948f53995ab9b92ea04ef79e6dd8ac3ede1fa
diff --git a/app-crypt/pesign/pesign-113.ebuild b/app-crypt/pesign/pesign-113.ebuild
index 40d481c35cc5..fcb4a4ab3809 100644
--- a/app-crypt/pesign/pesign-113.ebuild
+++ b/app-crypt/pesign/pesign-113.ebuild
@@ -32,7 +32,7 @@ DEPEND="${RDEPEND}
 PATCHES=( "${FILESDIR}"/${PN}-113-nss.patch )
 
 src_compile() {
-	emake AR="$(tc-is-gcc && echo "$(tc-getCC)-ar" || tc-getAR)" \
+	emake AR="$(tc-getAR)" \
 		ARFLAGS="-cvqs" \
 		AS="$(tc-getAS)" \
 		CC="$(tc-getCC)" \
diff --git a/app-crypt/pinentry/Manifest b/app-crypt/pinentry/Manifest
index 01d79c456c94..49a556cdeaad 100644
--- a/app-crypt/pinentry/Manifest
+++ b/app-crypt/pinentry/Manifest
@@ -10,4 +10,4 @@ EBUILD pinentry-1.0.0-r3.ebuild 2925 BLAKE2B 6395fd2629b3756dd29cd2cb73d8465481f
 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-r3.ebuild 3096 BLAKE2B afaad64b37b29a769630c65db7fe84c402cdeae104282634452426a884a8be84a64c9c3515ba4b12280edf58d6708627ff2958eaf0e4d78f75ba30f544a74caf SHA512 e2fd6f68e03f566a4ad9ef35f9893b92fb3191cb669d8175df27cab7a0d068223270907db623727dce9c4e821418dff900bbb9589e014c9bcd84f2148d201b1a
-MISC metadata.xml 352 BLAKE2B 75bb4d471f7b82b6cfe614d5c2ed226df087792ed84803ce4b011c5ad0a5a1548a87c6ab4c17ffeef53eb64bdea262fda4f89d27c38950ff1ced736b38d7df59 SHA512 3817eb6ad931ab0ee363ed7f8612b08a44c0d02e7abb9d0734452c289350c9909ca4208acad01c54a3f1b260417c400f4692e37b34113c6d618680d41796e2d0
+MISC metadata.xml 251 BLAKE2B 958e5ce6ef310471d4c88ef4cfd054eb9476b56abe4e8b82b003632bae4d56a800530601a7fd4b0129fdf22fe5124e8642f60835c6792cdfe38e09afb2d701ec SHA512 10bbd614739518c3b33fc05f34caa511ad71c599e2df0cb58514f05186b9c4ef73e00e3c78018c38581376a90a7968a01c35620fca32fdc5a91a762233a8c5fd
diff --git a/app-crypt/pinentry/metadata.xml b/app-crypt/pinentry/metadata.xml
index 46f4637bdd41..91439c59951d 100644
--- a/app-crypt/pinentry/metadata.xml
+++ b/app-crypt/pinentry/metadata.xml
@@ -5,8 +5,4 @@
 		<email>k_f@gentoo.org</email>
 		<name>Kristian Fiskerstrand</name>
 	</maintainer>
-	<maintainer type="project">
-		<email>crypto@gentoo.org</email>
-		<name>Crypto</name>
-	</maintainer>
 </pkgmetadata>
diff --git a/app-crypt/pius/Manifest b/app-crypt/pius/Manifest
index ad57de141452..4a94704e5e82 100644
--- a/app-crypt/pius/Manifest
+++ b/app-crypt/pius/Manifest
@@ -1,3 +1,3 @@
 DIST pius-2.2.4.tar.bz2 40578 BLAKE2B e7989631813658ff888c72b825269482ff33296abf0b9780ecb24df4628c499087a7591372ef96449b4899b1bcd730b0c75411bcd3c8839c57d3d4b5de374862 SHA512 3a178d30d98d0ed7ddf6819578a54ccfb9719f77c1f6385e3b254e28cd890817f328685c02cc464d4d592961c28ba314ca3175056b412dcdb301b851d874eb60
 EBUILD pius-2.2.4.ebuild 491 BLAKE2B 8be85b57f3f5c6f15d5202cec3171208b1b2c14c8fa70695a340806a714aa689cca203f935f7b54a737db2217ada4e73c61555f5f40de207fb399db0891040e4 SHA512 20a051fd9360c4b4f97bf945ec48a1dfb6096178b73e0ea01472647e9eec27d0a8a09db139196498dec872c67bbf545847853a1f4c0ac7da21f064c9558355b2
-MISC metadata.xml 689 BLAKE2B 40ea626d106920eaf8d0e2ae15637e54f9f81933c222b058834f69e9ec1cef52c634fb176f1a6b8d48f4c0f664092cfcf2ee1f58bdec84f591410323eb0a4914 SHA512 77e117dc545213fdc376935a62d22a0b1db1aaa05fc5fc6ae83e0ffba49693411a451485c519c1bf1a17a829833a90d78472754600ed4dd5f779a772cc480218
+MISC metadata.xml 616 BLAKE2B df1c92cdf11a6fb8987f60694d736086727e4c0dbfe9240011b4850d753b154b15cfbe323bd4ccc250227d8be76a855b1026cc8b172bd14fd124f374f5884e8b SHA512 fe8cde51d90fc53518b9c85c654a7bff3066fa3171d8f3b721b2ad840691d669450d3741806c46b1303e94ce7a9f598ca29cd04eadc2d716b3e0c3c297ec0191
diff --git a/app-crypt/pius/metadata.xml b/app-crypt/pius/metadata.xml
index 168be220f27a..fdb742f14987 100644
--- a/app-crypt/pius/metadata.xml
+++ b/app-crypt/pius/metadata.xml
@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="project">
-		<email>crypto@gentoo.org</email>
-		<name>Crypto</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<longdescription lang="en">
 		The PGP Individual UID Signer (PIUS) is a tool for individually
 		signing all of the UIDs on a set of keys and encrypt-emailing each
diff --git a/app-crypt/pkcrack/Manifest b/app-crypt/pkcrack/Manifest
index cff7ca049790..500a45108d5c 100644
--- a/app-crypt/pkcrack/Manifest
+++ b/app-crypt/pkcrack/Manifest
@@ -1,4 +1,4 @@
 AUX pkcrack-1.2.2-build.patch 2539 BLAKE2B 54ce5effd250832aaf04977b4baa9a212cc80cf1fb4b50a7629314a7e716c2ced9a758f20631c0c783e25611ece51d19048880b9f63790140a8914a9661f1214 SHA512 48b71bc2d5aa850603eb1872c200465e655fcb527323ebc9d1728311fcf9fa15722f7b80a6809c7960ec0f4fcf3d4e65561880f61feb4dcbe35dedf15c198f20
 DIST pkcrack-1.2.2.tar.gz 174208 BLAKE2B fed476a9d681bb9e565d05ef636f58d6643c4f8897725c56b66e64123e9435f9bf28e550f0249794e81e9f968683ab81c19baa1ee51478e1b91509e8e318725a SHA512 5c64fb9ae09dedc70fb20cd689f432059fcd64f689072b529b4045c3241760fee273ee921da081bc08be2e0594d27101c5d89d99cb2b84e16f80c011419b7200
 EBUILD pkcrack-1.2.2-r1.ebuild 1073 BLAKE2B 8099424d0b171590c6475a77cba3a79dbc096d98a2cd6382ca85315578600cf69c8550336902a73a37bbd7929ccd99fb4dfbcb309cae1780f664970d0af6d5b8 SHA512 ccde8352eb50adb9a2424ce30569259f692487f29f869298e9f175a6805b8e50fca2fd627188e4f97261ef99ff1132ebde20a9db10e35fabec04dc95c59a2db4
-MISC metadata.xml 370 BLAKE2B 1d584e6fa52911c3d0f099c44193eeb00261e2f46f99dd2924744e9f4ce4af84bddc72b85415f85e3ca5ad11612914bcc022e494b9c4c00a5e95f8c1b5f1d72d SHA512 39a268538a1a2d5932b5295c4727c8769e4648cb94905ccead6b3941a7e8752b3992403f7623497267334f697478dc0db355e42bf2857b415f8ae06baa99d492
+MISC metadata.xml 301 BLAKE2B 4b9a147b2ba74e5bf1f9443f1219442e923236a14e057fa076790059600967430e0122b659e10c89a4045d268ec48a684cc3f6a7b62d08921a1b85d9862b0cc3 SHA512 dfddacdf37ba11096e49f904c70333deb7ea9a33bfc738c42807a8325d7dc6b1bcfaceed9c625540cca585af6168bced82a9785a1c44342790bc571d05322d02
diff --git a/app-crypt/pkcrack/metadata.xml b/app-crypt/pkcrack/metadata.xml
index 2507c03b02ab..9f4770df7b75 100644
--- a/app-crypt/pkcrack/metadata.xml
+++ b/app-crypt/pkcrack/metadata.xml
@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-	<email>crypto@gentoo.org</email>
-	<name>Crypto</name>
-</maintainer>
+	<!-- maintainer-needed -->
 <longdescription>
 pkcrack is a password cracking program for zip files. It works using a plain text cipher attack.
 </longdescription>
diff --git a/app-crypt/pkcs11-data/Manifest b/app-crypt/pkcs11-data/Manifest
index 507dacdbe95b..0b553cc64802 100644
--- a/app-crypt/pkcs11-data/Manifest
+++ b/app-crypt/pkcs11-data/Manifest
@@ -1,3 +1,3 @@
 DIST pkcs11-data-0.7.4.tar.bz2 226267 BLAKE2B d9390dbbf465e4ac945d5a5ed0d11ab538da269fed871a21b122e395c1080f9a1acf4eaea072e422a62b043d546d6a7c130f3c67ab07b953d3cbdc469142a3bd SHA512 79b13cbb7dbcb8a35c46e8de79d31e51e53a4e75783c3bef28a0d1aa8176db869a0bf984e516d21567619a7f8ea9206ac9ab5ee81672d9ae2a89efe713cfc46c
 EBUILD pkcs11-data-0.7.4.ebuild 441 BLAKE2B d5a6b5a19a70e6427efecbf3e7041efd29737aafc1db00da163a926a1f63da8b2374dc9ff6b7e5abaee40a3d1bcc47ad23d06f67761829e2e194720d05308361 SHA512 ff4b872e1f8fb3dfa78e061bc18304a2c87f4f9201e0064d9d3c5d2a6c3204c329f577e68f0261c0cd2d943cec06de4a8be0d85c95d7fb2b2644084fcc7a1765
-MISC metadata.xml 380 BLAKE2B 396f8b58abe666f74fd4f00945406e8d583aa2e842b36d77e6afe683a2b4cb31b6a2af61c24b23d8541c626752192254373a19d67d5106c0f326f4573f0a6f4b SHA512 a449e49c644a6b4dd3758dd3f495a4fe4e7b0fba7c4e21250f13868b758a9642e8062adf1a29ac54fcf8211d38071724c489e25ac7078f4100f31e9adb0d98d1
+MISC metadata.xml 307 BLAKE2B ae01ed33ba78fdb8a1bd890b7e57d75cfea4584ae4affe58bd8ab1397c795fd6f0d75194ed4b6c279de6631ab1a4813c5f05465e441d9641fe32f809277380f3 SHA512 f404f1f58c1fdcefca42d89064a4723578765379a187c5559c999930a459ba5d954a1ee5f37b854d340d80d41b739f25d31aa988f0b53ac96d0f498338f71c59
diff --git a/app-crypt/pkcs11-data/metadata.xml b/app-crypt/pkcs11-data/metadata.xml
index 47f64b59a7b3..cbe6bfa21c37 100644
--- a/app-crypt/pkcs11-data/metadata.xml
+++ b/app-crypt/pkcs11-data/metadata.xml
@@ -1,10 +1,7 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="project">
-		<email>crypto@gentoo.org</email>
-		<name>Crypto</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<upstream>
 		<remote-id type="google-code">pkcs11-tools</remote-id>
 		<remote-id type="github">alonbl/pkcs11-data</remote-id>
diff --git a/app-crypt/pkcs11-dump/Manifest b/app-crypt/pkcs11-dump/Manifest
index c62f20d1ef94..fbe4b4b2ec21 100644
--- a/app-crypt/pkcs11-dump/Manifest
+++ b/app-crypt/pkcs11-dump/Manifest
@@ -1,3 +1,3 @@
 DIST pkcs11-dump-0.3.4.tar.bz2 255715 BLAKE2B 61545d1b929f47799fa1c3f2591b245b7dadf70df786d7c3574109e66cab407449ec158e2bf29fcdce2238bc316029293ee9f37586367da971f1a8aa777bc015 SHA512 b38dbe8d7b04d7227592c90f6de815da7a030014df2f5f18d8c81587a742c587424a0eea3a1c8ec6e5c8c8f6dccc144130b91c57bef3d5882ee161629a97781b
 EBUILD pkcs11-dump-0.3.4.ebuild 492 BLAKE2B 721d41e557a7d1d6bf0bab3cb064c5cc401cb5d0e12d343fda4afa85b4b103648646244f52c078412d89dad5940b6dd580c72e24ee8358fc516e30fa385b2b7e SHA512 b63b2e3ed5fc56682e42ab76292141d6e1f0a4f5f23bb8c0159cd6779580fdb70109652d8c1bd3a2d5862422a22173f237a9da5d372b8c068aac17ac3310f505
-MISC metadata.xml 380 BLAKE2B 0484e6749f0e9d27b41d0563f83c2b914ecc408621c507871dc9fb782cc4bcb0c6a09dacf4122db06a852ef5b2d284ec591779a1cff7bc75b169560b726d29f8 SHA512 158f5682664a88638cef415bb42b780b27142b9ef9f3ce182b83330bfa922dda8935d137e6f50f8150905b6ecf66103cfde7be3cfff0f111766e55e8ad5830c6
+MISC metadata.xml 307 BLAKE2B 6d692123eb29fc361d6b528781dce686a58c9d25cd85822d49ff80275f78173a8d36c02d7595b267286f055bfc2b20b46332a6f80bb5788c6e2834f1b6119225 SHA512 db3bc942e4feff7a33d76e37e1469d8855e49eec7c5a402ecaedd776e2678d76e3f3cb4e1d79e70258b33afc95325b521397ed04f054434192e7b4b4315c99a4
diff --git a/app-crypt/pkcs11-dump/metadata.xml b/app-crypt/pkcs11-dump/metadata.xml
index c34b4e770775..ab07aa2158bc 100644
--- a/app-crypt/pkcs11-dump/metadata.xml
+++ b/app-crypt/pkcs11-dump/metadata.xml
@@ -1,10 +1,7 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="project">
-		<email>crypto@gentoo.org</email>
-		<name>Crypto</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<upstream>
 		<remote-id type="google-code">pkcs11-tools</remote-id>
 		<remote-id type="github">alonbl/pkcs11-dump</remote-id>
diff --git a/app-crypt/qca/Manifest b/app-crypt/qca/Manifest
index 11116dcb7d24..a5c526e16d39 100644
--- a/app-crypt/qca/Manifest
+++ b/app-crypt/qca/Manifest
@@ -1,6 +1,4 @@
 AUX qca-disable-pgp-test.patch 446 BLAKE2B a98d5951d7b89c65787d7d586a5504949c51271ebe09c5e19b90a2e24f24fb6d03d6c1f76d7ad4234354bc2507cf7031c716b3b2bf8243b8c1d85065079dded4 SHA512 30bb6d31b9392166d6bbae39da2eeb1788ac9cccffb801b074468a3606a6e1a56d6a41ee276d3b8b8d39112bf6aea7025f07f4810bb835102bd00521ee9eb104
-DIST qca-2.2.0.tar.xz 691264 BLAKE2B 3b9196372c8a8f2e50a86a8a581a549d52a324cbfa919945683222d605747f7127af469a1de0310e24e823243ab4cd884a763b7baac94048e739f49d2a31dcbf SHA512 2a3f73bbd73ae8f74b2b4ec143bc010b7efaba267fc3349fc681623f29a288f69e5c457597f4964f88172a98e0a7eba6d2555675704d5d7026df794b8f772e69
 DIST qca-2.2.1.tar.xz 691676 BLAKE2B d5bcc0d6e791811e1efcdbf2e09916fe40ad682b0e59b2993c73a5bd79e09fc28facdec81259a982bee05223c8dfce78b9a6b729ca4e566c0901a13b91575379 SHA512 3a0e8aa7cf3ea9a7244facaf1d521ebca2753af37636e7bf5f21c57ae880ac9682ae7d6d9fa5ce41b73568ff9538214956b89cd41228c2cb828d9068c2031a9c
-EBUILD qca-2.2.0.ebuild 1969 BLAKE2B 72b78ac7b693525f63cc76e77c69c1024ce60507fd847c8568b90a1b1a0fdc78200fc2b6c5624080862b44336e9d5365a10f626a8da192f94887fec7c7d08030 SHA512 9d7bb0ace76857c671e7c6347c02ebbc903f6624eef7c9dac9cf3e1d98910cd4c514e40d2fb86aed40354531caed6ea613dc8f07932cf8f6e271026de78bee9f
-EBUILD qca-2.2.1.ebuild 1972 BLAKE2B e1f1c12c7745af1c3b5e920465590a7f76f4a16c4c46f45255baf2c4aedb1c45f9b3187eb9232d169171465276d0f8ea9fbc37226825e74d5f1667ce7d86dc9d SHA512 e42997e2308528df8732a0078fa3eb1128e37c527b68b3d7645b5f27538f4e577f76ab83d6da84eb86d0680f75dbac24840b8e900bda0b052e71f8d8adde540d
-MISC metadata.xml 842 BLAKE2B 1732f7a0efeba7de6c54bfb817a69f9be88eab8bb37a75f5ee685ba7893ad9be13a10ea8b2a404954846e1ea73dc617d0a89ac3b1f69a83928275b9e8d5fc7ab SHA512 900de0e8b914d1970b3e4fcfbdbeea48c1e56ab596e6c959e4dce29a0fd0cb0b6969ab6899784a80b6c233a656f3a4501513d8af6b4acc8519a5ecf1c9a1a622
+EBUILD qca-2.2.1.ebuild 1945 BLAKE2B 9808a992be6521cdd6f163cd7dc146f0db8781d78afc435ffa5f71aaad354d97fcd929221854e3b5c678e30e0bf3377e3a15e46a8588939ee3756f4894776b30 SHA512 85ce5fa36b35c2880799ca19c7722aa7e51991e7e13353ce5af483ac9f5d86f7d2b509aa3bb0c29996a9edfb62a81c54976f8648ea0449b9d62392d925643834
+MISC metadata.xml 745 BLAKE2B ff8e25b082d3c642fce099df1a218a4936bdc862a96fd237303d040c477544cf6368d23cc5de414d95f021e9c6ec475879225ab201f7c6d6711c04153ac53140 SHA512 6b82494b8dfe0d36da9818a6dcf775252dbb7051430232ccc2519c449cc2877da6478ca98f5b7a982a7660a869a0b8ae7a814fb18108ff42fed9712a9253e867
diff --git a/app-crypt/qca/metadata.xml b/app-crypt/qca/metadata.xml
index dff1320aa6b8..612a394e3440 100644
--- a/app-crypt/qca/metadata.xml
+++ b/app-crypt/qca/metadata.xml
@@ -2,10 +2,6 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <maintainer type="project">
-	<email>crypto@gentoo.org</email>
-	<name>Crypto</name>
-</maintainer>
-<maintainer type="project">
 	<email>qt@gentoo.org</email>
 	<name>Gentoo Qt Project</name>
 </maintainer>
diff --git a/app-crypt/qca/qca-2.2.0.ebuild b/app-crypt/qca/qca-2.2.0.ebuild
deleted file mode 100644
index bacd8da8b969..000000000000
--- a/app-crypt/qca/qca-2.2.0.ebuild
+++ /dev/null
@@ -1,88 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake-utils qmake-utils
-
-DESCRIPTION="Qt Cryptographic Architecture (QCA)"
-HOMEPAGE="https://userbase.kde.org/QCA"
-SRC_URI="mirror://kde/stable/${PN}/${PV}/${P}.tar.xz"
-
-LICENSE="LGPL-2.1"
-SLOT="2"
-KEYWORDS="amd64 ~arm arm64 ~hppa ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris"
-
-IUSE="botan debug doc examples gcrypt gpg libressl logger nss pkcs11 sasl softstore +ssl test"
-RESTRICT="!test? ( test )"
-
-BDEPEND="
-	doc? ( app-doc/doxygen )
-"
-RDEPEND="
-	dev-qt/qtcore:5
-	botan? ( dev-libs/botan:= )
-	gcrypt? ( dev-libs/libgcrypt:= )
-	gpg? ( app-crypt/gnupg )
-	nss? ( dev-libs/nss )
-	pkcs11? (
-		!libressl? ( dev-libs/openssl:0 )
-		libressl? ( dev-libs/libressl )
-		dev-libs/pkcs11-helper
-	)
-	sasl? ( dev-libs/cyrus-sasl:2 )
-	ssl? (
-		!libressl? ( >=dev-libs/openssl-1.0.1:0= )
-		libressl? ( dev-libs/libressl:= )
-	)
-"
-DEPEND="${RDEPEND}
-	test? (
-		dev-qt/qtnetwork:5
-		dev-qt/qttest:5
-	)
-"
-
-PATCHES=( "${FILESDIR}/${PN}-disable-pgp-test.patch" )
-
-qca_plugin_use() {
-	echo -DWITH_${2:-$1}_PLUGIN=$(usex "$1")
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DQCA_FEATURE_INSTALL_DIR="${EPREFIX}$(qt5_get_mkspecsdir)/features"
-		-DQCA_PLUGINS_INSTALL_DIR="${EPREFIX}$(qt5_get_plugindir)"
-		$(qca_plugin_use botan)
-		$(qca_plugin_use gcrypt)
-		$(qca_plugin_use gpg gnupg)
-		$(qca_plugin_use logger)
-		$(qca_plugin_use nss)
-		$(qca_plugin_use pkcs11)
-		$(qca_plugin_use sasl cyrus-sasl)
-		$(qca_plugin_use softstore)
-		$(qca_plugin_use ssl ossl)
-		-DBUILD_TESTS=$(usex test)
-	)
-	cmake-utils_src_configure
-}
-
-src_test() {
-	local -x QCA_PLUGIN_PATH="${BUILD_DIR}/lib/qca"
-	cmake-utils_src_test
-}
-
-src_install() {
-	cmake-utils_src_install
-
-	if use doc; then
-		pushd "${BUILD_DIR}" >/dev/null || die
-		doxygen Doxyfile || die
-		dodoc -r apidocs/html
-		popd >/dev/null || die
-	fi
-
-	if use examples; then
-		dodoc -r "${S}"/examples
-	fi
-}
diff --git a/app-crypt/qca/qca-2.2.1.ebuild b/app-crypt/qca/qca-2.2.1.ebuild
index cbd6b1639a19..d2bfa334dc7d 100644
--- a/app-crypt/qca/qca-2.2.1.ebuild
+++ b/app-crypt/qca/qca-2.2.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit cmake-utils qmake-utils
+inherit cmake qmake-utils
 
 DESCRIPTION="Qt Cryptographic Architecture (QCA)"
 HOMEPAGE="https://userbase.kde.org/QCA"
@@ -11,7 +11,7 @@ SRC_URI="mirror://kde/stable/${PN}/${PV}/${P}.tar.xz"
 
 LICENSE="LGPL-2.1"
 SLOT="2"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris"
+KEYWORDS="amd64 ~arm arm64 ~hppa ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris"
 
 IUSE="botan debug doc examples gcrypt gpg libressl logger nss pkcs11 sasl softstore +ssl test"
 RESTRICT="!test? ( test )"
@@ -64,16 +64,16 @@ src_configure() {
 		$(qca_plugin_use ssl ossl)
 		-DBUILD_TESTS=$(usex test)
 	)
-	cmake-utils_src_configure
+	cmake_src_configure
 }
 
 src_test() {
 	local -x QCA_PLUGIN_PATH="${BUILD_DIR}/lib/qca"
-	cmake-utils_src_test
+	cmake_src_test
 }
 
 src_install() {
-	cmake-utils_src_install
+	cmake_src_install
 
 	if use doc; then
 		pushd "${BUILD_DIR}" >/dev/null || die
diff --git a/app-crypt/quickcrypt/Manifest b/app-crypt/quickcrypt/Manifest
index 82c5d3f53acf..8df722edee83 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
-MISC metadata.xml 246 BLAKE2B 569d634cc821d4a537880a58ca96bf709155b0af827d8153b9521d5ca29f174ec29629d11b9eb91ee1cbba5f1a823d5c621521105a00e9fbd6d9a27bc3740bde SHA512 8ac20e3524a896e77d186b34b589ffe4287593c43fca1d50bcc06cd27e8cb8f5c0da2087622413a748a1738177d5939a50bda7a1e5d0ba36fbf4fb6d7b9bb015
+MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-crypt/quickcrypt/metadata.xml b/app-crypt/quickcrypt/metadata.xml
index 4f6e28828f65..6f49eba8f496 100644
--- a/app-crypt/quickcrypt/metadata.xml
+++ b/app-crypt/quickcrypt/metadata.xml
@@ -1,8 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="project">
-    <email>crypto@gentoo.org</email>
-    <name>Crypto</name>
-  </maintainer>
+<!-- maintainer-needed -->
 </pkgmetadata>
diff --git a/app-crypt/rainbowcrack/Manifest b/app-crypt/rainbowcrack/Manifest
index b5edac91f6cc..411dc974fd58 100644
--- a/app-crypt/rainbowcrack/Manifest
+++ b/app-crypt/rainbowcrack/Manifest
@@ -1,3 +1,3 @@
 DIST rainbowcrack-1.7-linux64.zip 208726 BLAKE2B 842e0a3ee74a8576a5331cc86259178b382e82f465f3093e7d1fa1b44907c1c30a73f53c2f7f527e052bc6266ceffd350c42b9b80b1298072a02c0cbd25e660d SHA512 068fe9d31004e08c0fcbe5a11500bd6248eca2f204a8d99a7343824ebc1dd847a01eb459f28d77fdd84eae98b05169a69e10b8893b9b5dd027381965c19b7bdb
 EBUILD rainbowcrack-1.7.ebuild 955 BLAKE2B ec3864d6ea73fbc86459d16d93ab254c71a26dddd9aef2696eeda0f609fc0968eb7e07d7e93970d730abd8525d73604f55efc2e22a0d57023afb3e0afc6e2a4f SHA512 f269c621d2b06d0c967364a410459be648a997f3d5be4cd572fe5b4452901104ca2cf3aed0b4e4d7de04991b8e7d5717446053c44384da971e2dfa7d4801e92e
-MISC metadata.xml 982 BLAKE2B fbc05af924e12a9682024c9e24cb1c35f84874ad36b11c705a5810cab63f83e3c2abd89e828f231fb82fcf7e672ebaa9511b80fe749274d2b5e4e2ee1add26b8 SHA512 c76947d085f4c322baa8f15112f2e7a64887a025c5871f95f934f52778d0d714061fddbd2a8ed66b31e5cde92045cba77817c708533ba83fab89c9e46d6c8a0c
+MISC metadata.xml 987 BLAKE2B 7976cc9d563bcec84a2f9e6ebc2865be112d9d6fbe3cd55cea9a5864adfc0548c77b9637085bc08f29ea70bb684a31925e659be1f48c6f6d160bb630c42ea945 SHA512 1b809cb5ae08e6309dd50d3925eaedfe7a72549dd75a2656d46afee1130bef798e290906fdc4228c4da87f4db61e3e8cd7da8939a63bdcbf1d1dad7b537a824c
diff --git a/app-crypt/rainbowcrack/metadata.xml b/app-crypt/rainbowcrack/metadata.xml
index dba1a3e1b1d7..f4f61b37c8f0 100644
--- a/app-crypt/rainbowcrack/metadata.xml
+++ b/app-crypt/rainbowcrack/metadata.xml
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="project">
-		<email>crypto@gentoo.org</email>
-		<name>Crypto</name>
+	<maintainer type="person">
+		<email>marecki@gentoo.org</email>
+		<name>Marek Szuba</name>
 	</maintainer>
 	<longdescription>
-		RainbowCrack is a general propose implementation of Philippe Oechslin's faster time-memory trade-off technique.
+		RainbowCrack is a general-purpose implementation of Philippe Oechslin's faster time-memory trade-off technique.
 		In short, the RainbowCrack tool is a password cracker. A traditional brute force cracker try all possible
 		plaintexts one by one in cracking time. It is time consuming to break complex password in this way. The idea of
 		time-memory trade-off is to do all cracking time computation in advance and store the result in files so called
diff --git a/app-crypt/rhash/Manifest b/app-crypt/rhash/Manifest
index 5c2fc6edb899..b1692cf08231 100644
--- a/app-crypt/rhash/Manifest
+++ b/app-crypt/rhash/Manifest
@@ -1,9 +1,13 @@
 AUX darwin-triplet.patch 657 BLAKE2B cb710ca481e9a45d593ab857dc10ff8baf6c3bc5fbd2ac9ef97cee5589d8873cdc81a6a730f9058a7b9a10199667384ebbf56f828d2e6b817bf40443653adbe5 SHA512 5caec1179c860c0bf003605dd96d8c4a47a3ef784d937080a237106364918a36c1bf1138b9a4b1b0f5e5c042d653c5b324ada1a0f9b621dc33aa4a11d4f9c1c1
 AUX freebsd-triplet.patch 800 BLAKE2B 43f1f7e1fa43313e2f323a3e5031a463185c2388a3b59c75f1a3a216d6ce6e04be9cb584ffe3c44773c072408740c02354dec4969d42d6abd824a1fc633fa4dd SHA512 7f66e6ab4bdc21959e00b8ad21aaa13eab6d11552d92e8978ce5c501339a3ddf0b303f47ae5fce4056522ffea90cef3d25c5dc5d6469e7bbffa078526e1c7404
 AUX rhash-1.3.6-no_echon.patch 1224 BLAKE2B 949b6aa839667a6fef3c3a668b6cadc451986ba837807b3d7a56b80f50c8248d734745f886d40d341a99fefaf439f95bdeb0382ee15ea9e4f8561f98703fba2d SHA512 3771077c64c28b1fcf310d7a449d3e1eb951d1669b2ad3ddffe76d98ac5821ea8af40013984c65f28c7fce3434b7173a74a77120847f557cab2dedefac0c8b58
+AUX rhash-1.3.9-nls.patch 744 BLAKE2B 898b5fe0227dce6f78825790f8b10f80f38ced806dd2851d059ab0c1ce92b0c916046ea2de608a20edeb96bcaec272dd08abc55791b360b96b5f0a1b5c2767cc SHA512 8ebc08fc3b04aa8534ce85beddd74ed589d907bfce7374e489a69b48b26d7a1425371b593394001372ee318e677e09eae360b12527ce81a0468107104a770c5e
+AUX rhash-1.3.9-rc-segfault.patch 9662 BLAKE2B c7fc3833c7b635f808b99d3879dd40ea8ae08e3a6a6bd1f281ea0a9583f7fd94a738ebbc35db5c275dd71d7a004a486623617d13e48a95619a8b7b5d0fd25b28 SHA512 d9db2ee0eba473ef2f651eba92f36722bd30bffc0700367261883a0c6477259f41f29a7a6e3661983f4ed9afe1a8d27d1b223f165edf22ee846d961adb14b462
 AUX unquote-cc.patch 791 BLAKE2B a872b7a8e8d2e04f5cf3dda0b4f4aa5e0177878942f9836f8a431d950392dafb46be646048a0ab4dc4a31ac20b6676fa8627b39bbb30a990861cf8d3cfc742f8 SHA512 7a4c2bf019cbcde021bb79572abdbc9b42f995ada5bb9798fed127d79c44ed9d4b9544c1413952604b1dd45ed307acdacba6675419f6331d75ecf34c15b8f5ca
 DIST rhash-1.3.6-src.tar.gz 328097 BLAKE2B c74993d183f0f2e479f0bd5831a9f653b9bd17bbed4d1ba896f6e33db98b7141175cd3c688dc41dfd8ec4b98acb51255ae5b795435cbc9dfb5ab77573cb25543 SHA512 54f7f238ed1fdc01c29cc1338fa86be90b69beff0df8f20d24ce9cb3c48c7f4668b84a3fe0d4d8b04b54bc8145485d493435edf3219de3a637af0f9c007c85c6
 DIST rhash-1.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.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/files/rhash-1.3.9-nls.patch b/app-crypt/rhash/files/rhash-1.3.9-nls.patch
new file mode 100644
index 000000000000..a6fb902676f3
--- /dev/null
+++ b/app-crypt/rhash/files/rhash-1.3.9-nls.patch
@@ -0,0 +1,22 @@
+From a165520d3f63e976dd3b842c2fbb05f05f1029a8 Mon Sep 17 00:00:00 2001
+From: Aleksey <rhash.admin@gmail.com>
+Date: Sun, 15 Dec 2019 03:35:09 +0300
+Subject: [PATCH] i18n: fix a string in uk.po by adding newline
+
+---
+ po/uk.po | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/po/uk.po b/po/uk.po
+index 959e47a..d6c0b1d 100644
+--- a/po/uk.po
++++ b/po/uk.po
+@@ -234,7 +234,7 @@ msgstr "Перевірити хеш-файли, вказані у командн
+ 
+ #: parse_cmdline.c:91
+ msgid "Update the specified hash file.\n"
+-msgstr "Оновити вказаний хеш-файл"
++msgstr "Оновити вказаний хеш-файл.\n"
+ 
+ #: parse_cmdline.c:92
+ msgid "Rename files by inserting crc32 sum into name.\n"
diff --git a/app-crypt/rhash/files/rhash-1.3.9-rc-segfault.patch b/app-crypt/rhash/files/rhash-1.3.9-rc-segfault.patch
new file mode 100644
index 000000000000..a2052c67bbf2
--- /dev/null
+++ b/app-crypt/rhash/files/rhash-1.3.9-rc-segfault.patch
@@ -0,0 +1,230 @@
+diff --git a/ChangeLog b/ChangeLog
+index 8537968..9724c9d 100644
+--- a/ChangeLog
++++ b/ChangeLog
+@@ -1,3 +1,7 @@
++Tue 07 Jan 2020 Aleksey
++	* Bugfix: restore behavior of 'rhash -rc' to be the same as in v1.3.8
++	* Bugfix: fix a segfault and memory errors
++
+ Sat 14 Dec 2019 Aleksey
+ 	* === Version 1.3.9 ===
+ 
+diff --git a/calc_sums.c b/calc_sums.c
+index a76c8c9..0f25224 100644
+--- a/calc_sums.c
++++ b/calc_sums.c
+@@ -535,6 +535,7 @@ int check_hash_file(file_t* file, int chdir)
+ 			log_error_msg_file_t(_("file is binary: %s\n"), file);
+ 			if (fd != stdin)
+ 				fclose(fd);
++			file_cleanup(&parent_dir);
+ 			return -1;
+ 		}
+ 
+@@ -586,6 +587,7 @@ int check_hash_file(file_t* file, int chdir)
+ 			rhash_data.miss++;
+ 		rhash_data.processed++;
+ 	}
++	file_cleanup(&parent_dir);
+ 	time = rsh_timer_stop(&timer);
+ 
+ 	if (res >= -1 && (rsh_fprintf(rhash_data.out, "%s\n", str_set(buf, '-', 80)) < 0 ||
+diff --git a/file.c b/file.c
+index 6f593f9..2f0eb2a 100644
+--- a/file.c
++++ b/file.c
+@@ -266,7 +266,7 @@ static int detect_path_encoding(file_t* file, wchar_t* dir_path, const char* pri
+ 	int i;
+ 	assert(file && !file->real_path);
+ 	file->mode &= ~FileMaskStatBits;
+-	if (!dir_path && ascii)
++	if (ascii)
+ 		file->mode |= FileIsAsciiPrintPath;
+ 	/* detect encoding in two or four steps */
+ 	for (i = 0; i < 4; i += step) {
+@@ -333,45 +333,39 @@ int file_init_by_print_path(file_t* file, file_t* prepend_dir, const char* print
+ #ifdef _WIN32
+ 	{
+ 		const char** primary_path;
+-		const char* dir_primary_path;
+ 		wchar_t* dir_path = (prepend_dir && !IS_DOT_TSTR(prepend_dir->real_path) ? prepend_dir->real_path : NULL);
+ 		int encoding = detect_path_encoding(file, dir_path, print_path, init_flags);
+ 		if (encoding < 0)
+ 			return -1;
+ 		if (encoding == 0) {
+ 			primary_path = &file->print_path;
+-			dir_primary_path = (prepend_dir ? file_get_print_path(prepend_dir, FPathUtf8) : NULL);
+ 		} else {
+ 			primary_path = &file->native_path;
+-			dir_primary_path = (prepend_dir ? file_get_print_path(prepend_dir, FPathNative) : NULL);
+ 		}
+-		if ((!dir_primary_path || IS_DOT_TSTR(dir_primary_path)) &&
+-				(init_flags & (FileInitReusePath | FileInitUpdatePrintPathLastSlash)) == FileInitReusePath) {
++		if ((init_flags & (FileInitReusePath | FileInitUpdatePrintPathLastSlash)) == FileInitReusePath) {
+ 			*primary_path = print_path;
+ 			file->mode |= (encoding == 0 ? FileDontFreePrintPath : FileDontFreeNativePath);
+ 		} else {
+-			*primary_path = make_path(dir_primary_path, print_path, 1);
++			*primary_path = rsh_strdup(print_path);
+ 		}
+-		return 0;
+ 	}
+ #else
+ 	if (!prepend_dir || IS_DOT_STR(prepend_dir->real_path)) {
+-		file_init(file, print_path, init_flags);
++		file_init(file, print_path, init_flags & (FileInitReusePath | FileMaskModeBits));
+ 	} else {
+-		const char* path = make_path(prepend_dir->real_path, print_path, 0);
+-		file_init(file, path, init_flags & ~FileInitReusePath);
++		file->real_path = make_path(prepend_dir->real_path, print_path, 0);
++		file->mode = init_flags & FileMaskModeBits;
+ 	}
+-	if (!prepend_dir || IS_DOT_STR(prepend_dir->print_path) ||
+-			(!prepend_dir->print_path && opt.path_separator != ALIEN_PATH_SEPARATOR)) {
+-		if ((init_flags & FileInitReusePath) != 0) {
+-			file->print_path = print_path;
+-			file->mode |= FileDontFreePrintPath;
+-		} else
+-			file->print_path = rsh_strdup(print_path);
++	assert(file->print_path == NULL);
++	if ((init_flags & (FileInitReusePath | FileInitUpdatePrintPathLastSlash)) == FileInitReusePath) {
++		file->print_path = print_path;
++		file->mode |= FileDontFreePrintPath;
+ 	} else {
+-		file->print_path = make_path(file_get_print_path(prepend_dir, FPathPrimaryEncoding), print_path, 1);
++		file->print_path = rsh_strdup(print_path);
+ 	}
+ #endif
++	/* note: flag FileInitUpdatePrintPathLastSlash is used only with file_init() */
++	assert((init_flags & FileInitUpdatePrintPathLastSlash) == 0);
+ 	if ((init_flags & (FileInitRunFstat | FileInitRunLstat)) &&
+ 			file_stat(file, (init_flags & FileInitRunLstat)) < 0)
+ 		return -1;
+@@ -544,9 +538,10 @@ static char* get_modified_path(const char* path, const char* str, int operation)
+ 			end_pos = strlen(path);
+ 			start_pos = (end_pos > 0 ? end_pos - 1 : 0);
+ 			for (; start_pos > 0 && !IS_ANY_SLASH(path[start_pos]); start_pos--);
+-			for (; start_pos > 0 && IS_ANY_SLASH(path[start_pos]); start_pos--);
+-			if (start_pos == 0)
++			if (start_pos == 0 && !IS_ANY_SLASH(path[start_pos]))
+ 				return rsh_strdup(".");
++			for (; start_pos > 0 && IS_ANY_SLASH(path[start_pos]); start_pos--);
++			start_pos++;
+ 		} else {
+ 			char* point = strrchr(path, '.');
+ 			if (!point)
+@@ -580,9 +575,10 @@ static tpath_t get_modified_tpath(ctpath_t path, const char* str, int operation)
+ 			end_pos = wcslen(path);
+ 			start_pos = (end_pos > 0 ? end_pos - 1 : 0);
+ 			for (; start_pos > 0 && !IS_ANY_TSLASH(path[start_pos]); start_pos--);
+-			for (; start_pos > 0 && IS_ANY_TSLASH(path[start_pos]); start_pos--);
+-			if (start_pos == 0)
++			if (start_pos == 0 && !IS_ANY_TSLASH(path[start_pos]))
+ 				return rsh_wcsdup(L".");
++			for (; start_pos > 0 && IS_ANY_TSLASH(path[start_pos]); start_pos--);
++			start_pos++;
+ 		} else {
+ 			rsh_tchar* point = wcsrchr(path, L'.');
+ 			if (!point)
+diff --git a/hash_check.c b/hash_check.c
+index 1f9c936..582a09d 100644
+--- a/hash_check.c
++++ b/hash_check.c
+@@ -210,9 +210,9 @@ static int detect_hash_type(char** ptr, char* end, int* p_len)
+ 	} else {
+ 		/* search backward (but no more then 129 symbols) */
+ 		if ((p - end) >= 129) end = p - 129;
+-		for (; p >= end && p[-1] == '='; eq_num++, p--)
++		for (; p > end && p[-1] == '='; eq_num++, p--)
+ 			char_type = FmtBase64;
+-		for (; p >= end && (next_type &= test_hash_char(p[-1])); len++, p--)
++		for (; p > end && (next_type &= test_hash_char(p[-1])); len++, p--)
+ 			char_type = next_type;
+ 	}
+ 	if ((char_type & FmtBase64) != 0)
+diff --git a/tests/test_rhash.sh b/tests/test_rhash.sh
+index 8c6e40d..db41b19 100755
+--- a/tests/test_rhash.sh
++++ b/tests/test_rhash.sh
+@@ -84,12 +84,9 @@ remove_tmpdir()
+ trap remove_tmpdir EXIT
+ 
+ # prepare test files
+-SUBDIR=$RHASH_TMP/dir1
+-mkdir $RHASH_TMP $SUBDIR || die "Unable to create tmp dir."
++mkdir $RHASH_TMP || die "Unable to create tmp dir."
++cp "$SCRIPT_DIR/test1K.data" $RHASH_TMP/test1K.data
+ cd "$RHASH_TMP"
+-cp "$SCRIPT_DIR/test1K.data" test1K.data
+-FILE_A=dir1/a.txt
+-printf "a" > $FILE_A
+ 
+ # get the list of supported hash options
+ HASHOPT="`$rhash --list-hashes|sed 's/ .*$//;/[^23]-/s/-\([0-9R]\)/\1/'|tr A-Z a-z`"
+@@ -207,14 +204,13 @@ TEST_EXPECTED="(message) 1 E8B7BE43 5c334qy BTAXLOOA6G3KQMODTHRGS5ZGME hvfkN/qlp
+ check "$TEST_RESULT" "$TEST_EXPECTED"
+ 
+ new_test "test %u modifier:           "
+-cp $FILE_A "dir1/=@+.txt"
++mkdir dir1 && printf "a" > "dir1/=@+.txt"
+ TEST_RESULT=$( $rhash -p '%uf %Uf %up %Up %uxc %uxC %ubc %ubC\n' "dir1/=@+.txt" )
+ TEST_EXPECTED="%3d%40%2b.txt %3D%40%2B.txt dir1%2f%3d%40%2b.txt dir1%2F%3D%40%2B.txt e8b7be43 E8B7BE43 5c334qy 5C334QY"
+ check "$TEST_RESULT" "$TEST_EXPECTED" .
+ TEST_RESULT=$( $rhash -p '%uBc %UBc %Bc %u@c %U@c\n' -m "a" )
+ TEST_EXPECTED="6Le%2bQw%3d%3d 6Le%2BQw%3D%3D 6Le+Qw== %e8%b7%beC %E8%B7%BEC"
+ check "$TEST_RESULT" "$TEST_EXPECTED"
+-rm -f "dir1/=@+.txt"
+ 
+ new_test "test special characters:    "
+ TEST_RESULT=$( $rhash -p '\63\1\277\x0f\x1\t\\ \x34\r' -m "" )
+@@ -252,7 +248,9 @@ TEST_RESULT=$( $rhash --simple -a test1K.data | $rhash -vc - 2>/dev/null | grep
+ match "$TEST_RESULT" "^test1K.data *OK"
+ 
+ new_test "test checking magnet link:  "
+-TEST_RESULT=$( $rhash --magnet -a test1K.data | $rhash -vc - 2>&1 | grep test1K.data )
++# also test that '--check' verifies files in the current directory
++mkdir magnet_dir && $rhash --magnet -a test1K.data > magnet_dir/t.magnet
++TEST_RESULT=$( $rhash -vc magnet_dir/t.magnet 2>&1 | grep test1K.data )
+ TEST_EXPECTED="^test1K.data *OK"
+ match "$TEST_RESULT" "$TEST_EXPECTED"
+ 
+@@ -283,6 +281,20 @@ TEST_RESULT=$( $rhash --simple --embed-crc --embed-crc-delimiter=_ 'test.data' 2
+ check "$TEST_RESULT" "d3d99e8b  test_[D3D99E8B].data"
+ rm 'test_[D3D99E8B].data' 'test_[D3D99E8C].data'
+ 
++new_test "test checking recursively:  "
++mkdir -p check/a && cp test1K.data check/a/b.data
++echo "a/b.data B70B4C26" > check/b.sfv
++TEST_RESULT=$( $rhash -Crc check/ | grep b.data )
++match "$TEST_RESULT" "^a/b.data *OK" .
++echo "B70B4C26" > check/a/b.data.crc32
++TEST_RESULT=$( $rhash --crc-accept=.crc32 -Crc check/a | grep "data.*OK" )
++match "$TEST_RESULT" "^check/a.b.data *OK" .
++# test that hash-files specified explicitly by command line are checked
++# in the current directory even with '--recursive' option
++echo "test1K.data B70B4C26" > check/t.sfv
++TEST_RESULT=$( $rhash -Crc check/t.sfv | grep "data.*OK" )
++match "$TEST_RESULT" "^test1K.data *OK"
++
+ new_test "test wrong sums detection:  "
+ $rhash -p '%c\n%m\n%e\n%h\n%g\n%t\n%a\n%w\n' -m WRONG > t.sum
+ TEST_RESULT=$( $rhash -vc t.sum 2>&1 | grep 'OK' )
+@@ -290,8 +302,7 @@ check "$TEST_RESULT" ""
+ rm t.sum
+ 
+ new_test "test *accept options:       "
+-rm -rf test_dir/
+-mkdir -p test_dir && touch test_dir/file.txt test_dir/file.bin
++mkdir test_dir && touch test_dir/file.txt test_dir/file.bin
+ # correctly handle MIGW posix path conversion
+ echo "$MSYSTEM" | grep -q '^MINGW[36][24]' && SLASH=// || SLASH="/"
+ # test also --path-separator option
+@@ -301,7 +312,6 @@ TEST_RESULT=$( $rhash -rC --simple --accept=.txt --path-separator=\\ test_dir )
+ check "$TEST_RESULT" "00000000  test_dir\\file.txt" .
+ TEST_RESULT=$( $rhash -rc --crc-accept=.bin test_dir 2>/dev/null | sed -n '/Verifying/s/-//gp' )
+ match "$TEST_RESULT" "( Verifying test_dir.file\\.bin )"
+-rm -rf test_dir/
+ 
+ new_test "test ignoring of log files: "
+ touch t1.out t2.out
diff --git a/app-crypt/rhash/rhash-1.3.9-r2.ebuild b/app-crypt/rhash/rhash-1.3.9-r2.ebuild
new file mode 100644
index 000000000000..861a75662e4d
--- /dev/null
+++ b/app-crypt/rhash/rhash-1.3.9-r2.ebuild
@@ -0,0 +1,81 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs multilib-minimal
+
+DESCRIPTION="Console utility and library for computing and verifying file hash sums"
+HOMEPAGE="http://rhash.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}-src.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+IUSE="debug nls libressl ssl static-libs"
+
+RDEPEND="
+	ssl? (
+		!libressl? ( dev-libs/openssl:0=[${MULTILIB_USEDEP}] )
+		libressl? ( dev-libs/libressl:0=[${MULTILIB_USEDEP}] )
+)"
+
+DEPEND="
+	${RDEPEND}
+"
+
+BDEPEND="
+	nls? ( sys-devel/gettext )
+"
+
+S="${WORKDIR}/RHash-${PV}"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-nls.patch
+	# Fixes for https://github.com/rhash/RHash/issues/104
+	# and https://github.com/rhash/RHash/issues/106
+	"${FILESDIR}"/${P}-rc-segfault.patch
+)
+
+src_prepare() {
+	default
+	multilib_copy_sources
+}
+
+multilib_src_configure() {
+	set -- \
+		./configure \
+		--target="${CHOST}" \
+		--cc="$(tc-getCC)" \
+		--ar="$(tc-getAR)" \
+		--extra-cflags="${CFLAGS}" \
+		--extra-ldflags="${LDFLAGS}" \
+		--prefix="${EPREFIX}"/usr \
+		--libdir="${EPREFIX}"/usr/$(get_libdir) \
+		--sysconfdir="${EPREFIX}"/etc \
+		--disable-openssl-runtime \
+		--disable-static \
+		--enable-lib-shared \
+		$(use_enable debug) \
+		$(use_enable nls gettext) \
+		$(use_enable ssl openssl) \
+		$(use_enable static-libs lib-static)
+
+	echo "${@}"
+	"${@}" || die "configure failed"
+}
+
+# We would add compile-gmo to the build targets but install-gmo always
+# recompiles unconditionally. :(
+
+multilib_src_install() {
+	# -j1 needed due to race condition.
+	emake DESTDIR="${D}" -j1 \
+		install{,-lib-headers,-pkg-config} \
+		$(use nls && echo install-gmo) \
+		$(use kernel_Winnt || echo install-lib-so-link)
+}
+
+multilib_src_test() {
+	emake test
+}
diff --git a/app-crypt/scrypt/Manifest b/app-crypt/scrypt/Manifest
index 8b096b3b3f3f..d41ab0bb8950 100644
--- a/app-crypt/scrypt/Manifest
+++ b/app-crypt/scrypt/Manifest
@@ -1,3 +1,3 @@
 DIST scrypt-1.2.0.tgz 107796 BLAKE2B 83ad13e83dad1ecf6a73553e2402c01409062e53089b5c6598607a50794113ad7ed89d855486e33464237b5ba033b57b72af851199e674235ac53e822fece865 SHA512 81ac8d82c38dc73981fa5bd4c011142c7ccef962a650ed849317a49e8aa66c26f4557dde326202792500a996178784d5eb0d28f909ab630cb05c86fdebfaae0d
 EBUILD scrypt-1.2.0.ebuild 370 BLAKE2B fbab30f8da99b3a0aebebf8e1f01386eb319101c93f377808cdcc97ce0a7be27d6479b3f2694d37659458023d2b97e8f5b6a8f78c6f9812171660701641f49cf SHA512 273611f0a388859719fd9d8e2667421a6df4cad42af07a25d03d49a620d32f5d214a813db0842db382ae83acb218775f56a4b269217ec13a7b56bc1ae84d2a2e
-MISC metadata.xml 236 BLAKE2B a7bb92e6d53f7252ee56a885bf098930e228a76a75bca119358ca860901ceeecccc43efe5279c54250ebda58f77ae9c97d2ae540d8b399283cb3aa348111fcd2 SHA512 5f6cd6a85527534d5de7118de5af212ee3044c8c5530a7f7087a28074a2d4ab7be1728325bd985adc063dc795d3cf2b1c4e58a4c4c4ec02d739bd4bbc544ef08
+MISC metadata.xml 167 BLAKE2B e4dadf27fd344484f2bccb5b904909c89aac568c32e5b3c44bdf139eacefd4b4fae74419f503d2b7da0dccc1b68ba05d777d11292c0f89270d1ac5c9c703e8ca SHA512 7c8decb24ee3a850e38186cf3c7f8933a28017426806870ad6ef9ceb2533be147a2681fc789b535a81cb528af8c29d90d3006e4f250aee23bd7dea4561294e33
diff --git a/app-crypt/scrypt/metadata.xml b/app-crypt/scrypt/metadata.xml
index f1c3d59fb213..7a38bb900964 100644
--- a/app-crypt/scrypt/metadata.xml
+++ b/app-crypt/scrypt/metadata.xml
@@ -1,8 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-	<email>crypto@gentoo.org</email>
-	<name>Crypto</name>
-</maintainer>
+	<!-- maintainer-needed -->
 </pkgmetadata>
diff --git a/app-crypt/scute/Manifest b/app-crypt/scute/Manifest
index 14638b21ca11..ceeba7bbbd20 100644
--- a/app-crypt/scute/Manifest
+++ b/app-crypt/scute/Manifest
@@ -1,3 +1,3 @@
 DIST scute-1.5.0.tar.bz2 991598 BLAKE2B 3a5fdcb5c7d1ae50ce5aa508388e768c6f59c366d81d91312a60ff319b3ad7e01b3bfe5986ee880980b0f5371402c21bd8da963977459d3b90fbd607e64ea2ae SHA512 ad1dbdba5681a92696c851eca7e2bfb61f7bf84f5e02728efc1f72cd25c4ee2dc18fe975e2903d1a85c635d16be1e2085ff2305827b48d80e18c9354e555b39a
 EBUILD scute-1.5.0.ebuild 923 BLAKE2B bf4d0516c065713b065309c3b7fff0108d9caa99e22e5e9d5aae855fff8beda3297aa64f8b9a6ed6cbf4ccdfb5fac15e458ba29e53d35a2985e39bf6b3f058c7 SHA512 b5773c2352cb7d01acbd4e4bdd3d98ffa215707ff1d6d93614062b67d916ef6abdbce425b62bbd1ff859bf18b2b065f175974090ebd64dadcfb6afd7454e13e8
-MISC metadata.xml 1031 BLAKE2B cbe957a386e02db4f584dd3e844b0e86da8b17b3c09e000821925be37196a5aac46f4d3a7730dfd4062ee91018be2428f1270202183b60225a9da8614d006317 SHA512 60ff0db241cca0cd3442e635b3579fdcb574d1121b47806a0046f77e6c4b5a32146c44779e52939570110ed7a0745b8606e7ea6b8e5b923d850d8d08a22dd1af
+MISC metadata.xml 924 BLAKE2B bb0ebeccee119b2b861a49d6d9cbfc996462dcde41d7afa25fb3bf21c6cc5977a85350878f8087cb87a9e889bfc0e1e77b07801843ef62597844f0524450625c SHA512 ecde34768937a2c45c5cb393e34d47eae6f26d7a3c1f525dc63c706971476692286759b3beb189d02694379740f9ce7aee6b2dcd3404b423955462917da107b2
diff --git a/app-crypt/scute/metadata.xml b/app-crypt/scute/metadata.xml
index ef8bdd1eaecc..3889f4a06370 100644
--- a/app-crypt/scute/metadata.xml
+++ b/app-crypt/scute/metadata.xml
@@ -6,10 +6,6 @@
     <name>Lucas Yamanishi</name>
   </maintainer>
   <maintainer type="project">
-    <email>crypto@gentoo.org</email>
-    <name>Crypto</name>
-  </maintainer>
-  <maintainer type="project">
     <email>proxy-maint@gentoo.org</email>
     <name>Proxy Maintainers</name>
   </maintainer>
diff --git a/app-crypt/signing-party/Manifest b/app-crypt/signing-party/Manifest
index 51bb356f28a4..a7129637fc68 100644
--- a/app-crypt/signing-party/Manifest
+++ b/app-crypt/signing-party/Manifest
@@ -1,5 +1,3 @@
 DIST signing-party_2.10.orig.tar.gz 222778 BLAKE2B b2225ba3038037a8f841e5f2ee8c5f08f3fe294e617c42396269aadf348965a17151bb31b11a76b2d84806e060cb0eb1093963f72e17bb5549ac6fbec0e332fb SHA512 82e51b91c282a72e9d16d920b87560c66aeafc0219e91615ea47d2f1a5df903fb459201f34368e6fa7ea1e2d2ca46a73096f30a068c8c35322af2f3ea256b269
-DIST signing-party_2.9.orig.tar.gz 222606 BLAKE2B 5c7fd8fdb4945f3155d5dc146716ae402c72ec3cc728feb5b3d009878d88313ed26dbf4461820346bd3340ec84d9a439dfd52950452ad796bf1fbc98a342ff6a SHA512 31a0f15f679c0339753bafbac645609e9e16f3da2c5105c33e87e0f258453b3101f188398a7c1509fe5c005339289ac5465ccb18631a526d231c714f9ed61d96
-EBUILD signing-party-2.10-r1.ebuild 2800 BLAKE2B 2e2525516b9b83358d30bef5651c783b4fcbf846a70106a7d352c1f2c7a8ca5ad93e279971455fe296deb084fedf868640c4de13e9cdffbe7e46c68030e22ac7 SHA512 7d5efe342c29c55c6ac7f46ece06552d152656d3f955011f89f65e64275dbc3f325ed5060127b61aea52ee32dd758ae5e680efc1ad1f1bdd6cda98a23c7dd63e
-EBUILD signing-party-2.9.ebuild 2731 BLAKE2B 173c2cb4d3b371c085bba45252ed049ee3738092b1dea0e3d175c88b585c96713f72adaf35dba82079f45578657f3d6266b38e58e0f28347f591d53a769b7605 SHA512 0c1b0ba4495c199a1a69d287c4bdfc8eec952bfaab3975f7ef47b5d91e6abc48b4652e85aaad2ed78dbe5d04d278f2935de596ae2615cc13740b72565b01d704
-MISC metadata.xml 340 BLAKE2B 9b55569cc672c3f5077b76cd53d557b442db05ac73fe19ace5ebebd26c51ec30fdbf82ef937fd591b112c7ba25188132882f104d317ef57ef435ccd4305619fd SHA512 6625069cb3bad8e5bb3c30676fbc5d3f28f8659c4580d9b380a50b766f5cf3ca6e7a79f42a5c8d24eead14876937abb3c5cca45ed419b80bca02842a78089a60
+EBUILD signing-party-2.10-r1.ebuild 2797 BLAKE2B 0ed8ba0f6cea19101471b9edc3df44e78753dcc69c03670d6ab4ccd0ffa45a75906d5914f889be4071f7f88441fae2f8797a1c9836d306f778679f902f958c6e SHA512 e18d0896f5a4a5947567e2b646bc2d061930b6b64e2e0f2835a6617da5b257008a3e1f92f1640c1a2d69af5fab95c3effe449ff9a30be831dac675f3304c3830
+MISC metadata.xml 243 BLAKE2B f7576f14be2c0aa21ca2c7147133e4a4132d6559cca1519745dd2f4ea912b3856950c7645e13d2317f38c80ba93b13d47370260920241a5ab60a4eae59f2cf33 SHA512 0dc1f228861badffd9c4175af734b72435dc7c60d369a3d9ff946c5b98b3f2f49af7d433f7ec5fc2afee7015b8f75259e8debe150b1bcffa0cb66425bed10d8d
diff --git a/app-crypt/signing-party/metadata.xml b/app-crypt/signing-party/metadata.xml
index c680f2cd2c64..203fa55c746f 100644
--- a/app-crypt/signing-party/metadata.xml
+++ b/app-crypt/signing-party/metadata.xml
@@ -5,8 +5,4 @@
 	<email>zlogene@gentoo.org</email>
 	<name>Mikle Kolyada</name>
 </maintainer>
-<maintainer type="project">
-	<email>crypto@gentoo.org</email>
-	<name>Crypto</name>
-</maintainer>
 </pkgmetadata>
diff --git a/app-crypt/signing-party/signing-party-2.10-r1.ebuild b/app-crypt/signing-party/signing-party-2.10-r1.ebuild
index 3c2e21cb2b0c..8cd2f3ebb114 100644
--- a/app-crypt/signing-party/signing-party-2.10-r1.ebuild
+++ b/app-crypt/signing-party/signing-party-2.10-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="mirror://debian/pool/main/s/signing-party/${PN}_${PV}.orig.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="amd64 ppc x86"
 
 DEPEND="dev-lang/perl
 	app-crypt/libmd"
diff --git a/app-crypt/signing-party/signing-party-2.9.ebuild b/app-crypt/signing-party/signing-party-2.9.ebuild
deleted file mode 100644
index cd273b6a7680..000000000000
--- a/app-crypt/signing-party/signing-party-2.9.ebuild
+++ /dev/null
@@ -1,113 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit toolchain-funcs autotools
-
-DESCRIPTION="A collection of several tools related to OpenPGP"
-HOMEPAGE="https://salsa.debian.org/signing-party-team/signing-party"
-SRC_URI="mirror://debian/pool/main/s/signing-party/${PN}_${PV}.orig.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc x86"
-
-DEPEND="dev-lang/perl
-	app-crypt/libmd"
-RDEPEND="${DEPEND}
-	>=app-crypt/gnupg-1.3.92
-	dev-perl/GnuPG-Interface
-	dev-perl/Text-Template
-	dev-perl/MIME-tools
-	net-mail/qprint
-	>=dev-perl/MailTools-1.62
-	dev-perl/Net-IDN-Encode
-	virtual/mailx
-	virtual/mta
-	|| (
-		dev-perl/libintl-perl
-		dev-perl/Text-Iconv
-		app-text/recode
-	)"
-
-src_prepare() {
-	default
-
-	# app-crypt/keylookup
-	rm -r keylookup || die
-	sed -i -e 's#keylookup/keylookup##' Makefile || die
-
-	# media-gfx/springgraph
-	rm -r springgraph || die
-
-	find . -name Makefile | xargs sed -i -e 's/CFLAGS:=/CFLAGS=/' -e 's/CPPFLAGS:=/CPPFLAGS=/' -e 's/LDFLAGS:=/LDFLAGS=/'
-
-	sed -i -e 's/autoreconf/true/g' keyanalyze/Makefile || die
-	pushd keyanalyze/pgpring
-	eautoreconf
-	popd
-}
-
-src_compile() {
-	emake \
-		CC="$(tc-getCC)" \
-		CPPFLAGS="${CPPFLAGS}" \
-		CFLAGS="${CFLAGS}" \
-		LDFLAGS="${LDFLAGS}" \
-		STRIP=true
-}
-
-src_install() {
-	einstalldocs
-
-	# Check Makefile when a new tool is introduced to this package.
-	# caff
-	dobin caff/caff caff/pgp-clean caff/pgp-fixkey
-	docinto caff
-	dodoc caff/{README*,THANKS,TODO,caffrc.sample}
-	# gpgdir
-	dobin gpgdir/gpgdir
-	docinto gpgdir
-	dodoc gpgdir/{VERSION,LICENSE,README,INSTALL,CREDITS,ChangeLog*}
-	# gpg-key2ps
-	dobin gpg-key2ps/gpg-key2ps
-	docinto gpg-key2ps
-	dodoc gpg-key2ps/README
-	# gpglist
-	dobin gpglist/gpglist
-	# gpg-mailkeys
-	dobin gpg-mailkeys/gpg-mailkeys
-	docinto gpg-mailkeys
-	dodoc gpg-mailkeys/{example.gpg-mailkeysrc,README}
-	# gpgparticipants
-	dobin gpgparticipants/gpgparticipants
-	# gpgwrap
-	dobin gpgwrap/bin/gpgwrap
-	docinto gpgwrap
-	dodoc gpgwrap/{LICENSE,NEWS,README}
-	doman gpgwrap/doc/gpgwrap.1
-	# gpgsigs
-	dobin gpgsigs/gpgsigs
-	insinto /usr/share/signing-party
-	# keyanalyze
-	# TODO: some of the scripts are intended for webpages, and not really
-	# packaging, so they are NOT installed yet.
-	newbin keyanalyze/pgpring/pgpring pgpring-keyanalyze
-	dobin keyanalyze/{keyanalyze,process_keys}
-	docinto keyanalyze
-	dodoc keyanalyze/{README,Changelog}
-	# See app-crypt/keylookup instead
-	#dobin keylookup/keylookup
-	#docinto keylookup
-	#dodoc keylookup/NEWS
-	# sig2dot
-	dobin sig2dot/sig2dot
-	dodoc sig2dot/README.sig2dot
-	# See media-gfx/springgraph instead
-	#dobin springgraph/springgraph
-	#dodoc springgraph/README.springgraph
-	# all other manpages, and the root doc
-	doman */*.1
-	dodoc README
-}
diff --git a/app-crypt/ssdeep/Manifest b/app-crypt/ssdeep/Manifest
index 02611f4d60f3..ef93233449ea 100644
--- a/app-crypt/ssdeep/Manifest
+++ b/app-crypt/ssdeep/Manifest
@@ -1,4 +1,4 @@
 AUX ssdeep-2.10-shared.patch 174 BLAKE2B fff5447389ca80a63bf8ac422ca8c06aa1d17715bde05e00e9922b57004f807a435cef58d2d32af269eb39c764ba53b81daae4b745f69f74754f83f13923ee21 SHA512 9429c38e22cf100809062818c286419d141089e0dd081c11034d7f62143ef9fe2d2bac0ad67104d448c387b7bd4b84ff364933f363faae3dda527e5e8390ad1f
 DIST ssdeep-2.14.1.tar.gz 408831 BLAKE2B 7e0709a18876a192568e37d1deb63df11f2feadaff7b53c3bcb3a9f2566b18897e50b7543a29ec5cd3132981bcaf4609615793f31fa9cf654334e8fc5a90afac SHA512 a8f87e21f654d482a67709da273cf58808af377cfcb20f189986bad58530e382f8f1d3a5eaf33aa02284015a6fa7ccfc7fc383e487de6e0e4f57405a16537217
 EBUILD ssdeep-2.14.1.ebuild 774 BLAKE2B f61a6ad44d40811c4acebbf8d9422d198e188169600c78b4992ffd1081ae49b2dd0989ef7605aa68324c5a00acb8fb8fe6b34286a1afb7ceb545b271bd028a74 SHA512 fcdae0f0d2d3d36f699ea48bc403069b85d4e8e7d760888bca8b9cb517e9c81838f5020c7ba4aa708f89fe4f907671d980003502b23f5a282627c422cfb83d7e
-MISC metadata.xml 316 BLAKE2B 1916bbf9c489db6a30a7ee238630b4c5b137c1d795ab18183761dd49a5d7bdd40c970c916201c6e217435569f35e7e74ade29f1c3b65b43997dcc0f0f9625d4a SHA512 3fd64f3472e5d036fb4617b2f44d074eff34eeb940cc90c55334712f745b5f4abe02939f423fbf5e28ab6b4eddea2655016711efeffd4707932fe136b0562707
+MISC metadata.xml 358 BLAKE2B 6e87002bb9491d178516d9b139a62a7973d041401db7d016306883cf272c4c4ce153bade321f9fdf402d1d40abe974965e93d21adb301e39755fc5927635e18d SHA512 3c511d34ba8966c2a7f948f7b5c7264c9a5e011cdc47056298952789f9d2d9fb4ddaedaef655faeccfcbbe3f34e4bb68c08cf00463fe967ca329a5b1c2328cf7
diff --git a/app-crypt/ssdeep/metadata.xml b/app-crypt/ssdeep/metadata.xml
index ce7e1f31f036..50a5222b3ea5 100644
--- a/app-crypt/ssdeep/metadata.xml
+++ b/app-crypt/ssdeep/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="project">
-		<email>crypto@gentoo.org</email>
-		<name>Crypto</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="sourceforge">ssdeep</remote-id>
-	</upstream>
+    <maintainer type="person">
+        <email>ikelos@gentoo.org</email>
+        <name>Mike Auty</name>
+    </maintainer>
+    <upstream>
+        <remote-id type="github">ssdeep-project/ssdeep</remote-id>
+    </upstream>
 </pkgmetadata>
diff --git a/app-crypt/stan/Manifest b/app-crypt/stan/Manifest
index c5cfac4e059e..388074e87fd9 100644
--- a/app-crypt/stan/Manifest
+++ b/app-crypt/stan/Manifest
@@ -1,4 +1,4 @@
 AUX stan-0.4.1-errno.patch 643 BLAKE2B 958dd753d5cca8ca9edde109b4242012af9c5098622ad1c737f4f655de69324295ceb80bfc52f4cf2754a94305a51fd143bc5ad2ec4857e3b2d77446ed052cbc SHA512 3b1aaa533559252136d99aad482e26b41dc1a8516dbaf56ca3e7c152378f622b44634d0e54cc5803f3fb1f7aa30a2305ab16535cf1c1d1d3de60c6ec5b75491c
 DIST stan-0.4.1.tar.gz 37471 BLAKE2B 6d2dd24a42daf56d06d723af41d89c243b7c511bc5ba51e673b6a6ee03685b460a05805942607a819c142ed4138970b9e510c307394bbc36f68cf455dc4f8fe5 SHA512 f7c123c9887a6cf994d66d950fc50c42340b35ae6353b69918be95cc7886b59ed2042a85c40596dcf25724043810c50f81c977c54af26af0e7131c12bda0e00b
 EBUILD stan-0.4.1-r1.ebuild 572 BLAKE2B 6ccdfea4b7a592dabc2072469c1675a70b9c3fe5b7410d523d1828b6034163226ea2d32ae46875c2cc071c601cc70836e1be0d2c9272bd1b4898501a16db25c5 SHA512 9ac8c7f6ff04e02acefcd362abf783131a18d5fe967423a25182dec96201fad345554ce25b41ea48ee5f223dfd5d835c1af64877c50dbcddb98a076ba099ecd0
-MISC metadata.xml 236 BLAKE2B a7bb92e6d53f7252ee56a885bf098930e228a76a75bca119358ca860901ceeecccc43efe5279c54250ebda58f77ae9c97d2ae540d8b399283cb3aa348111fcd2 SHA512 5f6cd6a85527534d5de7118de5af212ee3044c8c5530a7f7087a28074a2d4ab7be1728325bd985adc063dc795d3cf2b1c4e58a4c4c4ec02d739bd4bbc544ef08
+MISC metadata.xml 167 BLAKE2B e4dadf27fd344484f2bccb5b904909c89aac568c32e5b3c44bdf139eacefd4b4fae74419f503d2b7da0dccc1b68ba05d777d11292c0f89270d1ac5c9c703e8ca SHA512 7c8decb24ee3a850e38186cf3c7f8933a28017426806870ad6ef9ceb2533be147a2681fc789b535a81cb528af8c29d90d3006e4f250aee23bd7dea4561294e33
diff --git a/app-crypt/stan/metadata.xml b/app-crypt/stan/metadata.xml
index f1c3d59fb213..7a38bb900964 100644
--- a/app-crypt/stan/metadata.xml
+++ b/app-crypt/stan/metadata.xml
@@ -1,8 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-	<email>crypto@gentoo.org</email>
-	<name>Crypto</name>
-</maintainer>
+	<!-- maintainer-needed -->
 </pkgmetadata>
diff --git a/app-crypt/swtpm/Manifest b/app-crypt/swtpm/Manifest
index fbcfd8fc4961..d3b8b6ac17ea 100644
--- a/app-crypt/swtpm/Manifest
+++ b/app-crypt/swtpm/Manifest
@@ -1,5 +1,5 @@
 AUX swtpm-disable-test-dependencies.patch 774 BLAKE2B 8089885d5b21cea09fb5ec59d69640754671ba27763d57bdb45345768722166d4cd5fa0d890542aa79a90c2b8e609f611ac4ccd58be71ec13128d81daccb50bd SHA512 d803222c8fb04a7909f8a60563dfd23327c842f12138309f3b901309651857d6c545ca8e46c68c9b60b97f0e03ab79575784e242409d41b3d69e6ad8516428e5
 AUX swtpm-fix-localca-path.patch 1197 BLAKE2B fb94a734303e1c71158ffda2958275a377d9c75b98262061b06bb22d2dce6efd3b5d126758b65cbab8141a78549c4ab99d3aa2c241c4870de67f871706840b5d SHA512 c9a0e6ee27f0b38b65f2cad65a48622c3b9e9e8913bba002f0c82168f22162dbc62ed2b104942ed8141889625f225f29516ecbd20ba6ffb5091eb2201df0f107
 DIST swtpm-0.2.0.tar.gz 297419 BLAKE2B 9045cfd127d2f7e8e2e202818a375b4f6398806a097ed0df73abb76426db3af65a0d27f5e7212ce099d796862d3a9b3d421e987cf159bdce8879fc764eb5e923 SHA512 bda54690c0438138ff7adcc212fb125d2bb62618b10305eeced776e014bb135ea1a1dd1271a99fb2c60bf7e418644ded029c3c09ec2c6c1258e5062122cacf19
-EBUILD swtpm-0.2.0.ebuild 1251 BLAKE2B 67acf31dcb7ef3580688e657a41ce40e90d2b95332eae2e898395b7908aecb27c67501e85cf17c2c2980134150a1a6b672e15dc184f99fd8e053ca255d37fcd0 SHA512 c3db748e00f35a74b9d5fdd1861dce44e1b12e02b49f0ab2e8501fae7e09a542ba60159e27f7248db05040e528a77fcd8021d479170adc337b81142c5ac0cbe0
+EBUILD swtpm-0.2.0.ebuild 1249 BLAKE2B 13f4d7d1c7491c94527986f04fcc429db6fe9c57988bf75d99605fc72e012b528bcf9790b382ce0451f60fdc91e12e0ac5d07bbc6f6fecf0488f9821dbab0ed1 SHA512 0a8a85b50443d8abe5922f8ad638386f3665801e6023ee72c67e62d8ddddc7b91cbf81e475c3ba065a6fc32a9561167ab0a1ea96b9dd37fbc7acdf4ac521a26c
 MISC metadata.xml 457 BLAKE2B defc06c2642823aa760cafc22e90f891f9337358bfaa446778e1f4107f6e295ec21b5987f49bdcee3fd7b68084be1b864d7569e74bd729345e4886b08c617a06 SHA512 c80e24dc4ec41e5aae1e7fe67208c945e62c02f469164d0a76445269e3e0204674cd593956f99fa1539505e1a70a15bbf6c02afcf6b38592f04f3c4d3f275e08
diff --git a/app-crypt/swtpm/swtpm-0.2.0.ebuild b/app-crypt/swtpm/swtpm-0.2.0.ebuild
index f2e8e8c41fac..170483bd7cb5 100644
--- a/app-crypt/swtpm/swtpm-0.2.0.ebuild
+++ b/app-crypt/swtpm/swtpm-0.2.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{5,6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 
 inherit autotools python-any-r1
 
diff --git a/app-crypt/tc-play/Manifest b/app-crypt/tc-play/Manifest
index 9e4904e2d586..f739d28b031f 100644
--- a/app-crypt/tc-play/Manifest
+++ b/app-crypt/tc-play/Manifest
@@ -1,4 +1,4 @@
 AUX tc-play-2.0-build.patch 677 BLAKE2B 1b0f8372a6e94a7ff2cc3c1236855d6d1973172b78586e6ee72f29723841aa700ece23be1c985b00c37196da20ea18c1b30f13d0e00fa8de6bf603cfce769110 SHA512 0f41f59b8fe4376f5d48dcb3e3ca76698b141924b6f0b3768eb46238f6d597f2a8cf3c6aa840bba57ecfd61337182eb48e627fc1a04b348849e8bc5346c82e9b
 DIST tc-play-2.0.tar.gz 1015525 BLAKE2B 1481eecc8aaf2cb9698eed96a9cdabaa2b74daf11865dd29a6fab7e66fb76aa2f6e544fe7ac53a2510415ee6ddf3c5732c774a26708fe354113eb9de6a9b62d9 SHA512 17408b2a664eb6822c77ede4f38ca67cdf643512014619d830a2c024bb8971811eded4edd65f6398d6112a3b57cd11a5b414357878c817c9cc2aac9d851946d7
 EBUILD tc-play-2.0-r1.ebuild 1153 BLAKE2B 0df2277e3499661225ea83f24ed5473b321c5d6e6f2a52bd4371fe8fc1ff4d1fb191d7bdd704b6ab95acf956b71ceff8310f2e00170823adff889562bbd19594 SHA512 fe0388c49dd139cf7cd6f1f65bcfa7d855a42576f57d374dc49bdb3a2197aa1ebcde9f5bd572abcc35dac0a3b0afe701dfa30d96bf2de459a2107c38f67b4282
-MISC metadata.xml 329 BLAKE2B 09a867de52dae3e8b79438e2aa2893b7222dc9aa25013c2fc922fb2e1159f4dc96d57836f524770c284372ea9cf0a4056adc6ec425ccde5f6c3fad035d369ca7 SHA512 82f9a92ca705a89f30dd5ae33f45c7b233cd39894083572f8a17c60207d9de15d2188ebe6330da1765b5cd37ce656d904689c8862d3301fb1bd0bb001c1cef73
+MISC metadata.xml 251 BLAKE2B 76f6eaf0ebfcb190eb467addc7fc768de01e2e9666de3b7597c1cc208e2e03c459924758d50dc72d0017b240ed489f31b824f9d27ed962552870597c8c2bf591 SHA512 8e0f23146bd61c8f9c60d29c77a589306fa5f33c54fed7dbd8555b09f56c1c83ed4f80aaf54900bb2de962c578ad04557bb12ea70356a17a9250baf551e1e3a1
diff --git a/app-crypt/tc-play/metadata.xml b/app-crypt/tc-play/metadata.xml
index 5f7a0a616455..a6542c0db7a1 100644
--- a/app-crypt/tc-play/metadata.xml
+++ b/app-crypt/tc-play/metadata.xml
@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="project">
-    <email>crypto@gentoo.org</email>
-    <name>Crypto</name>
-  </maintainer>
+  <!-- maintainer-needed -->
   <upstream>
     <remote-id type="github">bwalex/tc-play</remote-id>
   </upstream>
diff --git a/app-crypt/tpm-emulator/Manifest b/app-crypt/tpm-emulator/Manifest
index 2f903578c00c..ef99f9ddc145 100644
--- a/app-crypt/tpm-emulator/Manifest
+++ b/app-crypt/tpm-emulator/Manifest
@@ -3,4 +3,4 @@ AUX tpm-emulator.confd 20 BLAKE2B 13dd9f09a0a4efb9a039bfeababb5f00b8b2c3c1777e60
 AUX tpm-emulator.initd 776 BLAKE2B 0daa0247396d1b5f1c9542b28f825899a5cc45bd748b6b7e2328440fd466fd6b461e32487a955816a79827bf350cfb33bd71a6b197a8e67dbf5509750098cb59 SHA512 22d7b163dc6f567c1900a275ae545c4421b2d459ba535a24f48d7ad2609f5df36533849aa781d4dd704961db102eea08c99b79c01d0e3981fb46d2eb4e39d6fe
 DIST tpm-emulator-0.7.5.tar.gz 222341 BLAKE2B c6dc7494800f4c6d1f5e622c6a47fdd5487e0f2cbc34173d9039d6eb5fd7541dd2c1f514efbf220c605424059844e18650b31ee9934eda6626427b915fd6bc53 SHA512 24c16ec36ca92c484d6e8dfa53c8ca00dbc5b58d78d7166041db1e9ae277d763f0fc0a6b0cbd7e62fcf4671f6ad2d8df1213256be0a4200b79b6ee61ab73b2ef
 EBUILD tpm-emulator-0.7.5-r1.ebuild 1714 BLAKE2B 9859186e9745a64ccb8cc65d4a3aec3c6cc16a4481e453cfa2e6611687892734be5d878a62039c3f99d00b515c7391e40bb86c5ed285d6063bb9c1d360cb19f7 SHA512 79d8f027b36b54433aad52c3fe8dbd8bfa3c2a2e16b811b9d3f78571c13e51a769816dcab6f44e75254da5f964e81ede9bc04f3915bfbc7bc72e6ba4402f0561
-MISC metadata.xml 395 BLAKE2B 053fec93e12819e95abadca4f2e9f871589c21ce8a7369092cfb04cb593a4fa687956458dfc2c7249b6951bb3b7c45f6c38fac1448d9e5d250ed8256f92df327 SHA512 dd69f6a31ebaa3971c316d967bd643654d11465bb0de20059ea82a4851691b605c42deb4846614627ae9c8b2b30075e6c44e53f9810999839ceaf2e9ee9aada8
+MISC metadata.xml 322 BLAKE2B 152476fdbb201eb989479f5d304b14075c7f0fabbc31776ce2c553659c60847a6c5c5ce94a8db678bf4d4100cc5fbc284982ceb790b6486723842deae903e9f0 SHA512 bedc51c7cf05986ce745bd848a7bca2be7230c53764bab7cbc3732b5c817bde999a09739dd02fdbee455eba5c2efd957ccc27ff3ccbcfcfe81eca7b9dc01b8f1
diff --git a/app-crypt/tpm-emulator/metadata.xml b/app-crypt/tpm-emulator/metadata.xml
index 401103a0692f..00300599e1bd 100644
--- a/app-crypt/tpm-emulator/metadata.xml
+++ b/app-crypt/tpm-emulator/metadata.xml
@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="project">
-		<email>crypto@gentoo.org</email>
-		<name>Crypto</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<upstream>
 		<remote-id type="sourceforge">tpm-emulator</remote-id>
 	</upstream>
diff --git a/app-crypt/tpm-tools/Manifest b/app-crypt/tpm-tools/Manifest
index 11aa5ac6aa87..cc9e72eebb88 100644
--- a/app-crypt/tpm-tools/Manifest
+++ b/app-crypt/tpm-tools/Manifest
@@ -1,4 +1,4 @@
 AUX tpm-tools-1.3.9.1-openssl-1.1.patch 6028 BLAKE2B bd7a7b3dc748618004cbbfb7dc51a6f4e3f1c53654193b227c4b3eccd75fbb6d22ed46241a3e201399daa418d58cdd5b124cc2a467f8f59b4b33f54394035602 SHA512 caf3f9a3f82073d71618305132b883ab51ba3220d30ce5c160b9785bcb2e7268cf47621381530d39e1641e0b27bfeb30dcbfd62ae235d82d07942824f533cc7a
 DIST tpm-tools-1.3.9.1.tar.gz 482859 BLAKE2B ee915679e23bead04672bf719ce59bb6f20b550be39855b5304caeff554bf54d3cfe9104d464af7762388995e51d2bed0f9bedad83e42146cb7457382d09f4b2 SHA512 63a9c0e761cd890cc0a218de79a9c0169e151aba7824c19bf6b7ec894cf41c4950de1f63bd849aa93a4bdff36cf0fe557bc17113912b6d77f57f2bf1190b6a08
 EBUILD tpm-tools-1.3.9.1-r1.ebuild 1018 BLAKE2B ec2e15103c01f08048ccf9beacc3e7505d45add816a2871301f3c566365f75c514759907ee2fe3bfdd01e75a7ca4ed5e1c0c4c40fbdc1d199dd0073e87362bf5 SHA512 f196ad0f3b5a0f4ffc37280d26bac4faa4ae072de3a032822d68d6ed41859c33a1e8036fc294e010bfc8af0046d65c4290ce5a61af9b520839bfee4be54f377a
-MISC metadata.xml 515 BLAKE2B 06991185c31f6e40b7cda3c9842339911e9806d024e1493ef674751b4d253f5f701a8386a8969f7124b29b2c984f109ec98cb767380b48781fb22bd266d7863a SHA512 5aea8cabd5ae0a00b4a49717efaf8ed6d6363131ff8bdc2a9167108297d32dee72c5419bbc84ae9ba1263d515dff2aa092b991c8411771a2b8c361bcf000258a
+MISC metadata.xml 437 BLAKE2B 996a2b0589cad35e07abebe94f5b72ab91af5a143e8150f8dc1aa13252f0dce07e5831537199173c3bd244486ad913ed1d7b6a29c0501125e1041377d87c1df3 SHA512 e8ecc28c83cba3e72f7950dc0969486e8e4e0da613c37c76aa3e50b113e0adb6bb9a2172681266fb294a6cbb1fd7406d2d7a28771af635c71b40b3ad031d2465
diff --git a/app-crypt/tpm-tools/metadata.xml b/app-crypt/tpm-tools/metadata.xml
index 31ebf3b6ac32..c53b4aaedf5a 100644
--- a/app-crypt/tpm-tools/metadata.xml
+++ b/app-crypt/tpm-tools/metadata.xml
@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="project">
-    <email>crypto@gentoo.org</email>
-    <name>Crypto</name>
-  </maintainer>
+  <!-- maintainer-needed -->
   <use>
     <flag name="pkcs11">
       Build Token data management utilities based on OpenCryptoki's
diff --git a/app-crypt/tpm2-abrmd/Manifest b/app-crypt/tpm2-abrmd/Manifest
index 1e035a3ac85f..72802e9afda6 100644
--- a/app-crypt/tpm2-abrmd/Manifest
+++ b/app-crypt/tpm2-abrmd/Manifest
@@ -3,5 +3,4 @@ AUX tpm2-abrmd.confd 17 BLAKE2B f3b6301cb29f0f741c26025bded10af8948eb7f16faca051
 AUX tpm2-abrmd.initd 390 BLAKE2B 5dbaccf073eba208e13c24f92127e41c4c71fe62dd9bf2062301efbcc16daa1559ffba127399a189d6466e21a8cf9b85ac0e09d34f495be58430eb3cfe0886ef SHA512 aef622face110e22831dddab8a6474b4d003e6d50da9d334653a88ef0a7fca88377379a56fef9c404af5222c8c2fb97090eca913aa7d96183c4e14d7ab470044
 DIST tpm2-abrmd-2.1.1.tar.gz 561352 BLAKE2B 4106811b238fee7b503bf0afb4ed857371bab023d8e449d5864eebb2386779e2bc8fb0f2bf8e334ebd8d7abe5c569f2b2cc2ea60b07672b1d3294092e63c2a5a SHA512 d685812c26a097190ced5a9e8ceb1544eb9e3858606123644d5496031706af91e5ba9fb54eb371bcb4eed4d236617f7a21a49a792196db9c5ebf277582ac7124
 EBUILD tpm2-abrmd-2.1.1-r1.ebuild 1211 BLAKE2B 1d21d99ed796ba182a8d1188cdeab2f8ed68d107b80223f69d9dd4f76d346dfe593e1912c44b629a408485b1c102d0ce8d643f6721c7f5d5ba0dd0e1e8a34526 SHA512 6d537e4bd4f81d68a954a710c211ea0bf759ff0c1dd7bd4c4462dd57c8f6a8fa72caf274ea5996d29a3049d4ca1677a159d10360c8f0e4e18fb46ba8d700c1e1
-EBUILD tpm2-abrmd-2.1.1.ebuild 1242 BLAKE2B ed68e30994eea41067ee4032d3b31d49eb6121e2fbe46bcde8a1aa7d4fe15fb604acbcc232ae4aa689382488a43e04418c1ff469b477e1d96bf0755e39cb7635 SHA512 cabd1e6c7f107aeb4179fc21b126581cea02ec2648a5214f8e393ebd5505f48b04d0bc50a15da383f1809b5eb90cd57ae2a450d929f166fb357e2701a228388c
-MISC metadata.xml 329 BLAKE2B 32d5f42e0427e9c83625ec972d4b266a1338c1629933628a0a32b8e4afb053468fece7f03916a983cdce9ff0a1d36d9c0f44006e7df4e383817005197a8be9a3 SHA512 920412d7cae5cfe3cd9a96133948b3101595edd966cc0d056934cdf45f9f4c36e1bb8fc79b0ee7146b2d1047d895de9d1fd57a7a753f4957707fad57962a9cb2
+MISC metadata.xml 256 BLAKE2B ef1b528e6888edab8fb403562cc532d082bef9cd585a69c35e1e180662c319351d05e708ed47d0daf911f68eb2842deca3f0bbfea58310e6fcd75e0fa406a1c4 SHA512 d7f2c7e7308b4fae73309ff23cd8210df042d969cc5d2419ccb5b8017b1ea5d1842a9943f4b4e6e0d9d5cd56a12327e7bb8d9da578799f67516110611005c152
diff --git a/app-crypt/tpm2-abrmd/metadata.xml b/app-crypt/tpm2-abrmd/metadata.xml
index 81a49e4dc591..3693cb8ff2e3 100644
--- a/app-crypt/tpm2-abrmd/metadata.xml
+++ b/app-crypt/tpm2-abrmd/metadata.xml
@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="project">
-		<email>crypto@gentoo.org</email>
-		<name>Crypto</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<upstream>
 		<remote-id type="github">tpm2-software/tpm2-abrmd</remote-id>
 	</upstream>
diff --git a/app-crypt/tpm2-abrmd/tpm2-abrmd-2.1.1.ebuild b/app-crypt/tpm2-abrmd/tpm2-abrmd-2.1.1.ebuild
deleted file mode 100644
index 50c48fc0ff29..000000000000
--- a/app-crypt/tpm2-abrmd/tpm2-abrmd-2.1.1.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools systemd user
-
-DESCRIPTION="TPM2 Access Broker & Resource Manager"
-HOMEPAGE="https://github.com/tpm2-software/tpm2-abrmd"
-SRC_URI="https://github.com/tpm2-software/${PN}/releases/download/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="static-libs test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="sys-apps/dbus:=
-	dev-libs/glib:=
-	app-crypt/tpm2-tss:="
-DEPEND="${RDEPEND}
-	test? ( dev-util/cmocka )"
-BDEPEND="virtual/pkgconfig
-	dev-util/gdbus-codegen"
-
-PATCHES=(
-	"${FILESDIR}/${P}-build.patch"
-)
-
-pkg_setup() {
-	enewgroup tss
-	enewuser tss -1 -1 / tss
-}
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		$(use_enable static-libs static) \
-		$(use_enable test unit) \
-		--disable-defaultflags \
-		--with-dbuspolicydir="${EPREFIX}/etc/dbus-1/system.d" \
-		--with-systemdpresetdir="$(systemd_get_systemunitdir)/../system-preset" \
-		--with-systemdpresetdisable \
-		--with-systemdsystemunitdir="$(systemd_get_systemunitdir)"
-}
-
-src_install() {
-	default
-	find "${D}" -name '*.la' -delete || die
-
-	newinitd "${FILESDIR}"/${PN}.initd ${PN}
-	newconfd "${FILESDIR}"/${PN}.confd ${PN}
-}
diff --git a/app-crypt/tpm2-tools/Manifest b/app-crypt/tpm2-tools/Manifest
index 78aea5c3954d..666901454dd2 100644
--- a/app-crypt/tpm2-tools/Manifest
+++ b/app-crypt/tpm2-tools/Manifest
@@ -1,4 +1,4 @@
 AUX tpm2-tools-3.1.3-libressl.patch 2589 BLAKE2B 2d949ed3d8470bbfee647e691f03ee4a53cc70230140dddba85424238670f147465eecaf85ce95696782e2cf3e8229fa5233300e93e33f4d48c0d56485f3d0a5 SHA512 e45ba9fa0f758105cccd4ded4422f285fdf3c8bd35240c8301ac911049618ae35ad5084045dc72658aced371a4af807dc521e830fdafe1cf9b71bc0f1a7a1325
 DIST tpm2-tools-3.1.4.tar.gz 589388 BLAKE2B aaaa9a0158d0658dc2db4734b18ea1d49bd6c0aef84c4f1236f3134245165dccdb0bada69d92f0e5a59ecb1f2973e5cd25924d2b9c4cad2891d9e4f9fb94a84b SHA512 c5e1be4ffab305ee42a8b4a9c9aa4373158259a58844e273465f97a74f913fb12098b9fd81127148be95ecba7378f6a45b96af256dde3101a237e5e33e8e8ccb
 EBUILD tpm2-tools-3.1.4.ebuild 720 BLAKE2B 496847fa7e4159f6ef979582e0f5924c7ee2087b245b7eb271a1527f466daeec997befe10c12be9c00ae1f43de83ec3d94f5411da6ed399bc81080c723badc8c SHA512 a1076e0809cbf374ecaaa6dffe6b3f4c6e2c0b928daefc0b894c2f6d0df2215d2957f5fca5232ce4e11eb7d9f44eb26b6505be1f3b20f0b72c65a1851d5e082f
-MISC metadata.xml 329 BLAKE2B 4839966acc6a4c84deaf050a21adaa680d3a93e5cb17ecff79dd6818723264570b215796e9733ef9beb078b17977078bad12deb6716ee3774947502e8efbbd78 SHA512 49d92ff1f240ce29957166befc9af7af18e665a388943f81c5a3c11c6dd12a924b19ed8dfaf2656223028444bfafa63fb15a54ad6c51e7c37b55ff1fe7287912
+MISC metadata.xml 256 BLAKE2B 471e60418669580a7ce88f03ff1ad8243c73ab7829ea0ba1701ce1de665c49a06914cb466832681d616240835dcba2d6059dfd4786374150a9379a4f365b6e5b SHA512 e8d9bb2aa327e85ef4df414e504633815b18b74a5ba11a9943b6e6870ad76392af0fa85344ec0e6cfbd2a1b5cecef32a6330e742249064cbb34d04c5140e33b3
diff --git a/app-crypt/tpm2-tools/metadata.xml b/app-crypt/tpm2-tools/metadata.xml
index a1035736860b..42a8d7b7aea8 100644
--- a/app-crypt/tpm2-tools/metadata.xml
+++ b/app-crypt/tpm2-tools/metadata.xml
@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="project">
-		<email>crypto@gentoo.org</email>
-		<name>Crypto</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<upstream>
 		<remote-id type="github">tpm2-software/tpm2-tools</remote-id>
 	</upstream>
diff --git a/app-crypt/tpm2-totp/Manifest b/app-crypt/tpm2-totp/Manifest
index 52ea402b8f78..719cb6dd949c 100644
--- a/app-crypt/tpm2-totp/Manifest
+++ b/app-crypt/tpm2-totp/Manifest
@@ -1,4 +1,4 @@
 AUX tpm2-totp-0.1.1-build.patch 2384 BLAKE2B 55acd1b8b8c3425542e7207653598b3c2854c84699d3b40f5f64d75e67a51868a5a8b1aca960124694ceaf3793a3f7a2f3dc51e1a3a71418502625c35785e033 SHA512 7330fccd400be74952652515b5c90a49d91e4b70a4488df18b4e34402ce03bcf2e480223a6b70d5f98b23e7fe0e8b38aa8d46012752a881498f2c804a96481f6
 DIST tpm2-totp-0.1.1.tar.gz 357787 BLAKE2B c7a24b30c155cfd5387180a2c8584497327eadd701068aa5eb3c385bbadf26f448f88c238849fbf68c4e7265f01d3783b3aa50a912070df1c2fd4485310f2299 SHA512 33a4af16a292ddd674a399bf12ce0b355d95de7014e8be11816a1d88edfd36ae222a8b7508f3aa1be3b46c7e04bf2712ee4839cf9f4f83fc308cb4f639ec5b9f
 EBUILD tpm2-totp-0.1.1.ebuild 722 BLAKE2B 2df2c7d4102da1a0d119260d802d76af2705ced973d1108b2309485407cf29805117c97009dcf47286ea97536d3eff7c13eff7057eec94a339f396ced5518c65 SHA512 961b438f32a367ef19b161355bd0e3157ec7a0ebb8fc77032a92531cd6cb5d9ab971443e47ba44035930f274efb3d5ea6b899982f41958815ce0c9c516c759d9
-MISC metadata.xml 328 BLAKE2B 7578cd490eb3c3614ff8a237bbb177830c3fc068579d7cf1e78099a718513b1120435bcb5256232ae6b2042e3282e05751fac4a16193511f450d397965822317 SHA512 c58e6858b8d127eacc0b4b3f1e5639e2d8358c7411461b90f0d6c26c556383390b12627c71fbbce3469d3b7342653393e5af804ecef02a0545961d17ca988c08
+MISC metadata.xml 255 BLAKE2B 83f5573006dd43d1a93725143c337deafb573112198d8fb41570a9fa137d41cdacf05337955e7b80cb417bd1d05bed98ea3bb80bea7721a0807e75f30d6e5ba1 SHA512 1f2d7ad8dfbe9cda78c28aa8abfdcdc87f39e30220902c179fc6b4985966ee42c1bdd8051bff74728110438a46e1ee00df5d7e277d9ab06eddfb6b56e9fd60e4
diff --git a/app-crypt/tpm2-totp/metadata.xml b/app-crypt/tpm2-totp/metadata.xml
index 0509d4663725..b07ebff083cd 100644
--- a/app-crypt/tpm2-totp/metadata.xml
+++ b/app-crypt/tpm2-totp/metadata.xml
@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="project">
-		<email>crypto@gentoo.org</email>
-		<name>Crypto</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<upstream>
 		<remote-id type="github">tpm2-software/tpm2-totp</remote-id>
 	</upstream>
diff --git a/app-crypt/tpm2-tss-engine/Manifest b/app-crypt/tpm2-tss-engine/Manifest
index 2e87502e78c2..82cb84fa6960 100644
--- a/app-crypt/tpm2-tss-engine/Manifest
+++ b/app-crypt/tpm2-tss-engine/Manifest
@@ -2,4 +2,4 @@ AUX tpm2-tss-engine-1.0.0-build.patch 2362 BLAKE2B d1e28ef019da77a9f857b90d9bce7
 AUX tpm2-tss-engine-1.0.0-libressl.patch 1054 BLAKE2B 42f666eb44e61659e941758ab48bcf76c5be94be5944d7437db0671b286f038d8cee3e8754ca84fdbb0957b7e964445e798d2c494354c6ca9eff576ce45d7f6d SHA512 9b7c769d6a65ec67a522d78abb56da8c8560074a6bc1efcb300669308bfeeb39340da7c049a4c5d0a446f9e0d4e9fc03ee80ad0db52395c4a81013e11d27796d
 DIST tpm2-tss-engine-1.0.0.tar.gz 382277 BLAKE2B 6580eb83f4e9391a12df2fb9cb86ace385a9e29004a64f6ca9378d9b8f60572a7761f4f486e1010d435487fed28858737d2bb71b08e400e9551a7b83c198bbe7 SHA512 b06722c82c9cefd5184125b26fb46bd7b20d62631c21c51a028348833c4786b41ff64f2c1cb7d53f749a6cf35b8fae02ae02285fc43d1d044e2d2b6e2e7048a3
 EBUILD tpm2-tss-engine-1.0.0.ebuild 821 BLAKE2B 986550cef0aeefccb1e0b123d7bbcecfdefa6c5b41bbc9b2e9afe411578a3ac7192294fb6cda7f54a6d6640a288e24b7b25f211ae11bd08c0bae15203bcb41a5 SHA512 26fd09212feab98c4bf353b37400692d3595fcf1229fc2c19715b07cf84b0dfec5019d300bd2aa3e74017992f2a347cfb32590865dc583f5ca44f453335a3751
-MISC metadata.xml 334 BLAKE2B 8ee81cad095cd2c3f3a31e2b181ab678a4a51316e868bd6f84af46aa6bf87af35bea0a9d6fa0fad368175f55020e23cbdf2aed8af3ccb853bc3085db4ba82dc3 SHA512 0d38a3515c9b31fc64988812c4015a25fa8a7c6550cfe90e78f73bfcecad57d1c043da2843b5c72c7a220db1c77b1790c32cab61fa3ec970b72da7f448e12b02
+MISC metadata.xml 261 BLAKE2B 1f28a367c89055b59f6e03dba69b5f2ca8305effc0475795410a035eea72b2586a0e18b62bcb56fab8b387cb1bf86598cb206ac57a8bc68007371b1543a3f443 SHA512 c30b7dd0d2a8e605cd0d2b33a22e3da2fc8f7592d5b4b5292f3a8c59d872ee342bcfc3b9b3971f69a2a4bacc319f3be53b64d495815d608198e77b68203cba4d
diff --git a/app-crypt/tpm2-tss-engine/metadata.xml b/app-crypt/tpm2-tss-engine/metadata.xml
index 7931bebd0b34..8a310e85c09b 100644
--- a/app-crypt/tpm2-tss-engine/metadata.xml
+++ b/app-crypt/tpm2-tss-engine/metadata.xml
@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="project">
-		<email>crypto@gentoo.org</email>
-		<name>Crypto</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<upstream>
 		<remote-id type="github">tpm2-software/tpm2-tss-engine</remote-id>
 	</upstream>
diff --git a/app-crypt/tpm2-tss/Manifest b/app-crypt/tpm2-tss/Manifest
index 4932b209c7cc..ecb1d29afe00 100644
--- a/app-crypt/tpm2-tss/Manifest
+++ b/app-crypt/tpm2-tss/Manifest
@@ -1,4 +1,3 @@
 DIST tpm2-tss-2.2.3.tar.gz 912179 BLAKE2B 36b2a462512822dccb3adab605ea9922132f027455a1d2895b6735f6200fe44f08288477c99afd0f6c06b4bff3090104b6412b12ea4a518888cf756fb8ee53c4 SHA512 68087cbf2b7acc33788e90b3825bf2c91faa65cfc04b576790634c88876a8a6930d6943f83b7cf0858e37e5e7307703d0c975b9fc0b0ad1d87f66c74b65bd411
 EBUILD tpm2-tss-2.2.3-r1.ebuild 1275 BLAKE2B 668138a018c9e3d811c941265f555f0b835d2a0f3e35a30efa280bb36fbdd9707193c23728448bc8be7b03f1759133f69b7f718de42b714b11f7af368da264f5 SHA512 f40fe96f4ad6427abe10c8573deb16586c2a48455af487b7eaba427b1cfac00847dfb316037600fafb18fb731fa7fbb631b87dca0a1f8d43e23ca4889d6e0f9a
-EBUILD tpm2-tss-2.2.3.ebuild 1301 BLAKE2B ff9463239c9aca960b72a15340a2b596a1587feef28dee9452cb80d6e8530ca32250e41daca16580e0708d23f91ab41bf942b83fc8db5e994a91e98da00f68cb SHA512 33ec0d577320a4ad115310cdee5fb4f975756c509a0f9d5f714d15b6e6dc79a53263090af851caf78ffd464b0e874966bccf238c02ff8d885067bd3a76f65371
-MISC metadata.xml 501 BLAKE2B be53401663c21ea24b8fd7a898a30b398c5773d86b5f30cf9a8c4b2334736e09b64ea60e2f6069b765d7babc5695b64a8b38aa3020d65ff224910eb633d76ae6 SHA512 901b9e66b98cea1ee90c8f885f402d66d7fb90494d9b95a2028e4834d5750edb4945563275def32f3944f4e28ba5a3aa558abf3ffce935df1af316cb1cb1d865
+MISC metadata.xml 428 BLAKE2B eb2275eb4f616c25503204fb29175ba8c9ca6e4e65445f1c4815147edb458f118a8c108a3c177abb4396d3c4e329c4cda48b51e5ed4d1d25da0412b3d34e4129 SHA512 88ecc48675325a5fcadfc0ef3ee07f723b474131b82d0d17ddd0e98ab8227c21f82e9c00eb4d09a9c8a334bb7c29debccfdec0cf355a360e2ea8789a35a1f056
diff --git a/app-crypt/tpm2-tss/metadata.xml b/app-crypt/tpm2-tss/metadata.xml
index bbde63a7602f..b774da17d883 100644
--- a/app-crypt/tpm2-tss/metadata.xml
+++ b/app-crypt/tpm2-tss/metadata.xml
@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="project">
-		<email>crypto@gentoo.org</email>
-		<name>Crypto</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<use>
 		<flag name="gcrypt">Use <pkg>dev-libs/libgcrypt</pkg> as crypto engine</flag>
 		<flag name="openssl">Use <pkg>dev-libs/openssl</pkg> as crypto engine</flag>
diff --git a/app-crypt/tpm2-tss/tpm2-tss-2.2.3.ebuild b/app-crypt/tpm2-tss/tpm2-tss-2.2.3.ebuild
deleted file mode 100644
index 7743ba624f99..000000000000
--- a/app-crypt/tpm2-tss/tpm2-tss-2.2.3.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit linux-info udev user
-
-DESCRIPTION="TCG Trusted Platform Module 2.0 Software Stack"
-HOMEPAGE="https://github.com/tpm2-software/tpm2-tss"
-SRC_URI="https://github.com/tpm2-software/${PN}/releases/download/${PV}/${P}.tar.gz"
-
-LICENSE="BSD-2"
-SLOT="0/0"	# sublot is libtss2-sys number
-KEYWORDS="~amd64"
-IUSE="doc +gcrypt openssl static-libs test"
-RESTRICT="!test? ( test )"
-
-REQUIRED_USE="
-	gcrypt? ( !openssl )
-	openssl? ( !gcrypt )
-	|| ( gcrypt openssl )"
-
-RDEPEND="gcrypt? ( dev-libs/libgcrypt:0= )
-	openssl? ( dev-libs/openssl:0= )"
-DEPEND="${RDEPEND}
-	test? ( dev-util/cmocka )"
-BDEPEND="virtual/pkgconfig
-	doc? ( app-doc/doxygen )"
-
-pkg_setup() {
-	local CONFIG_CHECK=" \
-		~TCG_TPM
-	"
-	linux-info_pkg_setup
-	kernel_is ge 4 12 0 || ewarn "At least kernel 4.12.0 is required"
-
-	enewgroup tss
-	enewuser tss -1 -1 /var/lib/tpm tss
-}
-
-src_configure() {
-	econf \
-		$(use_enable doc doxygen-doc) \
-		$(use_enable static-libs static) \
-		$(use_enable test unit) \
-		--disable-defaultflags \
-		--with-crypto="$(usex gcrypt gcrypt ossl)" \
-		--with-udevrulesdir="$(get_udevdir)/rules.d" \
-		--with-udevrulesprefix=60-
-}
-
-src_install() {
-	default
-	find "${D}" -name '*.la' -delete || die
-}
diff --git a/app-crypt/trousers/Manifest b/app-crypt/trousers/Manifest
index 69de7c626533..a6457c09cc0f 100644
--- a/app-crypt/trousers/Manifest
+++ b/app-crypt/trousers/Manifest
@@ -7,4 +7,4 @@ AUX trousers-0.3.14-libressl.patch 877 BLAKE2B 6416ecf1cf99678299e4ac39756920de6
 DIST trousers-0.3.14.tar.gz 1378438 BLAKE2B 3dc2824fa2ca1b1f1181f98d59e85276e7d38af4bfc07ee8246431d9ccb300a8e0820b318643d4cf5d757d2a49492c8686e2fe9de03484263d2189d4bbaa32d0 SHA512 bf87f00329cf1d76a12cf6b6181fa22f90e76af3c5786e6e2db98438d2d3f0c0e05364374664173f45e3a2f6c0e2364948d0b958a7845cb23fcb340150cd9b21
 EBUILD trousers-0.3.14-r1.ebuild 3009 BLAKE2B c0cf45bdd4222448ea82cf8c539908317da6ca42d3ab3efdaf0dc4ebcc10cf57c8ca8ee1962d31be21cadea2cd78de8525ea9b3980f650bc507fae4050e4e8e3 SHA512 14edff453cc4839ab014e4c22006c897f4873eb1949ae69155ec5693a4050590f5fca1be75c7773391f7f86102620d0cf11a76a073dd38c5b29cde66d201817c
 EBUILD trousers-0.3.14-r2.ebuild 2954 BLAKE2B 67d448c9c62f6d42697a69da984b74c68cfde09debbf35d8467c35100a25e41d0376a92d7a2d8d6b423d1135758f7690757955ce5f0b55f60ce7b398dcd4b947 SHA512 50ddb4573571095768267333c56ca0be2bb017f79cfbea5f333da37d9d6d0908b75d8945c4d6a335f02e755175de375df9ac45b5d2a605be00d76ab94a76eed4
-MISC metadata.xml 389 BLAKE2B ba31172c2d03711712dec442f87ef9af448357d14ea90f973284b7d142a052f83798e0ac48d76f35d94a2efce6f050b456b0401562a7fb9d05f055e2defa923e SHA512 82ef49bce01041185282168653e951f7fc2b68e6e00a2e604765640b7a5ab3f3f73244ee6837004415612358d89c7347cc7c19df333539b534d04308d8f1b4dd
+MISC metadata.xml 310 BLAKE2B 298d7b3d24553b2f5d0f9c2fa952521305ce1c73e78cc95fc354b3761f0dc1ccc6689e4b38ad99bd884e856593c966a06b01c9d8718598fd17df554a2d3b3e03 SHA512 073ee341a6756bd3857181b6da834e6e7d0d01db0127f6ff0313472b89b2de75ff9929d4d2b05a4a500a46e2199dc27698b4c51d5e6e0c3608d46487b462813c
diff --git a/app-crypt/trousers/metadata.xml b/app-crypt/trousers/metadata.xml
index 090e56fab7c0..96e4e5905066 100644
--- a/app-crypt/trousers/metadata.xml
+++ b/app-crypt/trousers/metadata.xml
@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="project">
-    <email>crypto@gentoo.org</email>
-    <name>Crypto</name>
-  </maintainer>
+<!-- maintainer-needed -->	
   <upstream>
     <remote-id type="cpe">cpe:/a:debian:trousers</remote-id>
     <remote-id type="sourceforge">trousers</remote-id>
diff --git a/app-crypt/ubuntu-keyring/Manifest b/app-crypt/ubuntu-keyring/Manifest
index aae80c841019..426887a62881 100644
--- a/app-crypt/ubuntu-keyring/Manifest
+++ b/app-crypt/ubuntu-keyring/Manifest
@@ -1,5 +1,5 @@
 DIST ubuntu-keyring_2018.02.28.tar.gz 30181 BLAKE2B 1dc1232aa3ddbbb4a908e2b0deb035fd2ae61ddad4ebba99cce43c636af30760a09bf46f05c35c8205ccfaf526ed8b0a3b9daa308ae5d7272da078903ee15557 SHA512 60f3a792d095206466f4c39672affb261b4520fb7b5b9df47487741e0d6613cd1076fde0e30120bcbe161b170c41f7ec1bbb2c36cddf13ee69a457df00c36fa8
 DIST ubuntu-keyring_2018.09.18.1.tar.gz 34263 BLAKE2B fa08e98d27875f1120b3a99127f7df38b6f5d1659d087d52bef23f29619a6cc2b5217302e8e4b1b5efefe7b946bab65a72b5a84a281dc1a6e18eafa5a1e9f8a0 SHA512 562221fc2cf4ff843e9fb16c40673e379ebaa82f12d092cff2454527a6e58ba5067abc5ef5950a82d089cad975de14cdaf01c9e29f98126da8e96a97168102f6
 EBUILD ubuntu-keyring-2018.02.28.ebuild 457 BLAKE2B c63cdf7150c404853160294e4b3230b4da99a9dafb17cbfc4ee72d940bda89ec6818a675b7a050b150cca3e02a0a6f1d5e832957663b3beec4daa987556becde SHA512 3f7744413a46f63430cc115b6953258fa3d1b7aeaf91b895a8a588901e096fb9da73ff19f750f0b83bdb98a257eef73e6dee840e0d096e254601a0e8f54da73b
-EBUILD ubuntu-keyring-2018.09.18.1.ebuild 489 BLAKE2B 53c436ce217a5e5347ef852519b94654a7a5cb499e017f637938205e2ec0cee96907f9619087a6d2e1d8812d78722a636623585e599560c5e52ad4d7eb00cb38 SHA512 9f1429a550f6633ca56cc0c5ca23e0ae0f7b3536cbb2a2dbe41f5e83cab215c8b8fd5d283570fccb3ecf3f74abac0b205e1919a1be3a753442d55b79741f9f3e
+EBUILD ubuntu-keyring-2018.09.18.1.ebuild 493 BLAKE2B 7b8fd04a1c7cc24970c40f533bee69145044cb61b99515b6a66c4968f64d6408dbcadae70724181fe61490fd05d0d880eeb74c72a336110c001f27903ed2c1d8 SHA512 a7349115b728ca3d57461ce6fc4b329cda40565a78fac2f047360878d20c97df0d766359486dc84dcb8b71904c376e0d3990e5f38d81f45052873150f346cf0f
 MISC metadata.xml 249 BLAKE2B 3647e2ef94ad009c86dc9d42c1396ad9420ade97042882b8d8f60f676c465cfd6ea3cea4b77caccadd99eb0cbe1ef83b18b799ec676da4ecfbff528d21bb5ffb SHA512 334ac61f9acc5c4917fd29afb3b420b1689b39be80cada419bed1db033e64130866d0995abe5f1c75eb1290f51734e9ad4c8d06fd8b49c288ecf617a0693d273
diff --git a/app-crypt/ubuntu-keyring/ubuntu-keyring-2018.09.18.1.ebuild b/app-crypt/ubuntu-keyring/ubuntu-keyring-2018.09.18.1.ebuild
index 27144165c204..61fde153e310 100644
--- a/app-crypt/ubuntu-keyring/ubuntu-keyring-2018.09.18.1.ebuild
+++ b/app-crypt/ubuntu-keyring/ubuntu-keyring-2018.09.18.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -9,7 +9,7 @@ SRC_URI="mirror://ubuntu/pool/main/${PN:0:1}/${PN}/${PN}_${PV}.tar.gz"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~ppc64 ~x86"
 IUSE=""
 
 S="${WORKDIR}"/${P%%.1}ubuntu1
diff --git a/app-crypt/veracrypt/Manifest b/app-crypt/veracrypt/Manifest
index 8ff0528c587e..f3c51628d30f 100644
--- a/app-crypt/veracrypt/Manifest
+++ b/app-crypt/veracrypt/Manifest
@@ -1,11 +1,14 @@
 AUX veracrypt-1.24-no-gui-fix.patch 1004 BLAKE2B 5a6d5a8537e284e5f8f3b18a271ed18f0719dff20fbe180c64289cf6841cb987db5132760d16329b0fe2a0d80be41647d7e5438d27b2b4991fb09940a955ae3b SHA512 6955a7c267bb4949e4873d436eeafb1009404dcd7eb6ebc5b7795a45aaf78f840eed44bad533d38775eaa416879f334c392dc2f42b3749da17fd4422b451d54b
+AUX veracrypt-1.24_p2-revert-wxwidgets-breakage.patch 3475 BLAKE2B 2401f507277a1496210359b65fced9665584457b4c5b94a8f69b95452f7a59747c0b90fbaed1d6f3f7cf2932efb76e78902d639f65f9a2976c185067ca00f5a1 SHA512 9390d6702a3e38bc2b79c5f6aeb9289fe20abd9fa5a5d451a6fad531970ea3adf41a64fa5a37558fa5b7d77c34af7f3a4754de3f4653e3369beed4029c371120
 AUX veracrypt.init 387 BLAKE2B 7f16dee40bceed81ca092a3be6a2cd71f24f5cc8b4e4b143bd6ddde046e1ecce0cd674f52e7adb406893ef57c5b73462157832ff279114a2079c0ff84839e0dc SHA512 986b52c454abd9a64a6e8eb93247983c48d9524c396f253bc16f68894fed0abe87614343ce9c9127f8fb180f12912b21f57063f8f3b43bdca5344c130eb6c72d
 DIST VeraCrypt_1.23.tar.gz 24941166 BLAKE2B f9760342678f771192434f88a9b6c3bcc348ef312197232346731f51e972c230a4627f92fd655f7a3c7582b1f728274b7f170f885cceadce6ad53c9b404cd8d6 SHA512 433e717403560fc4f9081f528168f346ed7f14f9621b78a176c6801f14caba3d57e3228b940fb746637de29893f278ade650cf5eca63490bc236987a9db4d48d
 DIST VeraCrypt_1.24.tar.gz 25046467 BLAKE2B e8535f981d898efd797ff736a03e4a65b75bd40ed62d75e3f159932e93d9684e8601da277839b40efcd9bdda801427468386f37e9c57cd81dbc470f23693cd12 SHA512 b4a3155ec8455c51044c2aabcc785a6974d9ee740e0c77bae934a017976e715d45701811405dadfbbd9ceb2a957acbefbe15a717003c86ea38d52735de4f2e56
 DIST veracrypt-1.24_p1.tar.gz 25052008 BLAKE2B 215af344a5e57e16319d6aec5f439517f774ee92b11d11060e98708d2e5390b54965eecda55bdc56e8e5f01a945b6782a8b695f24a747dd4e7ff2346b9af96e9 SHA512 2564c6b579bc3609d93fb3e6ec12c0e9e90b6b423ce06dab8870583d6b6ce0da9d864d64da67f4d1d6096e4dd750d335c66c0eed9199ec1b38c0690090f317a6
+DIST veracrypt-1.24_p2.tar.gz 25208374 BLAKE2B 2667fb93e6884d97a673fe793b5f83f73961c2362e7704199b5ed0163c03f19313843583f7f2a15e05ee71516e45db97752350d2c27d22f1f278668b7c07aff9 SHA512 f778b8f6288f6f9886a15fa582f6c7126d9eaea319e854ad11bd5d44105ad5a3cb8b750d410ed8fd531ec3b23f9bad83934e6cefedd1352603d4882d2ca0ad84
 EBUILD veracrypt-1.23.ebuild 2190 BLAKE2B a0130f46bda8cb06bab364f9f15214d77270c0b8e7806a81768c29dd511b9473c1783220024ff09007f3831aabb1127181f0815d1f02973e744e67da30870040 SHA512 199b1a0a34a4dc06aa27e77809d74bab09e7eaeeb63cb924504437f96c496b45678bd7c6b5133302ac55a244a3bd586ffc2f88c037db850a62d49bae1891c74b
 EBUILD veracrypt-1.24-r1.ebuild 2917 BLAKE2B f7f08b118d1c2f970c036077bd60b76268842a91372bd54cb7a1b6a8beb30e3f3cbc00ef27c550c45b9ed71ee5bdb5854f4883a761e983d5a5ac4ed8fa69d011 SHA512 a3406b7867e2169a945f73d7ec03c1e93120de0a0baea1e8cf844dc878cc696bba68dbc33f26f09b02773d449eb508886e9a9dced84119abff3377b8d09fea69
 EBUILD veracrypt-1.24-r2.ebuild 2922 BLAKE2B 60b5ddea54fb39c22fecbd52ec3d3a83fe92a85af62a02f33f4a1fca78f69ac7dacc658607621c5a2a1a364bc1f571594e3a30666cbb63abc713acf2ced524a1 SHA512 2ad016f3616a4d7e33f01830c1904f6c279a5febdb7896bb923c59728beede3e130a47def2a4b2e9859f42ef4c55b16956cf3fdc4f594abfe3bfc7dc8af9a193
 EBUILD veracrypt-1.24.ebuild 2471 BLAKE2B 66f9e985f34ddc76cfbc859348630f44b758ef9284c4052b3de80e60ae106b29edda99b0b2479730242d02136ead1c71847589f9a42836c8bdd7a6485bd52d57 SHA512 e1e715570d2d2f08d64877b4f7e9a912e6b21814215fbfe6953328b05d95693e3ba08cf5f43a3bc4e0cc1f0d84ac932f51c52e0e48a68da4527030a3bfe9fd3c
 EBUILD veracrypt-1.24_p1.ebuild 2951 BLAKE2B 8fb2b50f6be34fd1c3a724c04eb5e4cfaabfadc1c0a60691d71e9baaf4a48a84022a15709baeb46c8e2f7a4f25ef0b0b0b14483998fa22c22d6df5cc76e97984 SHA512 e84df844fc0f5190af231dddc0856d4637a94aafb70c8df8c1e979136caad49134fb419ff42d10386a6a727e64e5ebaf7d0e7c9d9ad14fb28b2fe08ed0cbea48
+EBUILD veracrypt-1.24_p2.ebuild 3121 BLAKE2B 7623df0b8beaf8c42e97b991cc884980af287e27f447305bcb87cae29d75e92a26fe128bbd50eef5d1a86fe59e7d1509fc4207c22e72dc5d4c9daebe95a7ad62 SHA512 cdcf197fcf34f85fcbbcd1ca0e6626096ebd36eab2bc27d5241bde98f4958f111e7723a6c031406c72aadc0d1a2a9ecc1ae2d7129a904f4ef10bcbb59044f2cf
 MISC metadata.xml 516 BLAKE2B 280399666a147f475b2a8558bb3cb47c69ea4f4ba9894ae7d61757e26262f9f618007d9a07ce41eff5e9de17559b56b173a04f6f0c81618f932249bf2794fd62 SHA512 093ddf9483158c1756586e918dcc171e3bd7ef078ef28613517e4b04017c3cff8d3ad2ca7fa44027395602ad8427314356c742c23d03083240d6446b704d87d7
diff --git a/app-crypt/veracrypt/files/veracrypt-1.24_p2-revert-wxwidgets-breakage.patch b/app-crypt/veracrypt/files/veracrypt-1.24_p2-revert-wxwidgets-breakage.patch
new file mode 100644
index 000000000000..029b683e7d62
--- /dev/null
+++ b/app-crypt/veracrypt/files/veracrypt-1.24_p2-revert-wxwidgets-breakage.patch
@@ -0,0 +1,100 @@
+From 6ab07ac9a30fe48839e31f9c374fd6a6ddeeb382 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?G=C3=B6kt=C3=BCrk=20Y=C3=BCksek?= <gokturk@gentoo.org>
+Date: Thu, 19 Dec 2019 17:04:37 -0500
+Subject: [PATCH] Revert "Linux: Fix failure to run VeraCrypt binary built for
+ console mode on headless machines (fix issue
+ https://github.com/veracrypt/VeraCrypt/issues/531)"
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+The build failure still exists for system wxGTK compiled with '--disable-gui':
+
+```
+In file included from TextUserInterface.cpp:27:
+TextUserInterface.h: In member function ‘virtual bool VeraCrypt::TextUserInterface::Initialize(int&, wxChar**)’:
+TextUserInterface.h:50:63: error: ‘wxAppBase’ has not been declared
+   50 |   virtual bool Initialize (int &argc, wxChar **argv) { return wxAppBase::Initialize(argc, argv); }
+```
+
+This reverts commit 737e1f126b8826ed02418266e590e195aebdd7c0.
+---
+ src/Main/TextUserInterface.h | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/src/Main/TextUserInterface.h b/src/Main/TextUserInterface.h
+index 95db02d7..78874b8c 100644
+--- a/src/Main/TextUserInterface.h
++++ b/src/Main/TextUserInterface.h
+@@ -47,7 +47,9 @@ namespace VeraCrypt
+ 		virtual void ExportSecurityTokenKeyfile () const;
+ 		virtual shared_ptr <GetStringFunctor> GetAdminPasswordRequestHandler ();
+ 		virtual void ImportSecurityTokenKeyfiles () const;
++#ifndef TC_NO_GUI
+ 		virtual bool Initialize (int &argc, wxChar **argv) { return wxAppBase::Initialize(argc, argv); }
++#endif
+ 		virtual void InitSecurityTokenLibrary () const;
+ 		virtual void ListSecurityTokenKeyfiles () const;
+ 		virtual VolumeInfoList MountAllDeviceHostedVolumes (MountOptions &options) const;
+-- 
+2.24.0
+
+From d168eadc536552fbf76fe86c8ad0fa77130081e1 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?G=C3=B6kt=C3=BCrk=20Y=C3=BCksek?= <gokturk@gentoo.org>
+Date: Thu, 19 Dec 2019 17:15:43 -0500
+Subject: [PATCH] Revert "Linux: fix compilation error when building
+ console-only version of VeraCrypt that is statically linked to wxWidgets"
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+The build failure still exists for system wxGTK compiled with '--disable-gui':
+
+```
+In file included from TextUserInterface.cpp:27:
+TextUserInterface.h: In member function ‘virtual bool VeraCrypt::TextUserInterface::Initialize(int&, wxChar**)’:
+TextUserInterface.h:50:63: error: ‘wxAppBase’ has not been declared
+   50 |   virtual bool Initialize (int &argc, wxChar **argv) { return wxAppBase::Initialize(argc, argv); }
+```
+
+This reverts commit 14bee5e6a227701e78c5fec04064c0494f6361f0.
+---
+ src/Main/Main.make | 8 ++++++++
+ src/Makefile       | 1 +
+ 2 files changed, 9 insertions(+)
+
+diff --git a/src/Main/Main.make b/src/Main/Main.make
+index 0cb4e15d..a154a846 100755
+--- a/src/Main/Main.make
++++ b/src/Main/Main.make
+@@ -81,7 +81,15 @@ CXXFLAGS += -I$(BASE_DIR)/Main
+ 
+ #------ wxWidgets configuration ------
+ 
++ifdef TC_NO_GUI
++ifdef VC_WX_STATIC
++WX_CONFIG_LIBS := base
++else
++WX_CONFIG_LIBS := adv,core,base
++endif
++else
+ WX_CONFIG_LIBS := adv,core,base
++endif
+ 
+ ifeq "$(TC_BUILD_CONFIG)" "Release"
+ 
+diff --git a/src/Makefile b/src/Makefile
+index 1b084421..f102a28c 100644
+--- a/src/Makefile
++++ b/src/Makefile
+@@ -70,6 +70,7 @@ endif
+ ifeq "$(origin NOGUI)" "command line"
+ 	export TC_NO_GUI := 1
+ 	C_CXX_FLAGS += -DTC_NO_GUI
++	WX_CONFIGURE_FLAGS += --disable-gui
+ endif
+ 
+ ifdef PKCS11_INC
+-- 
+2.24.0
+
diff --git a/app-crypt/veracrypt/veracrypt-1.24_p2.ebuild b/app-crypt/veracrypt/veracrypt-1.24_p2.ebuild
new file mode 100644
index 000000000000..b94fb0affbee
--- /dev/null
+++ b/app-crypt/veracrypt/veracrypt-1.24_p2.ebuild
@@ -0,0 +1,120 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit eutils linux-info pax-utils toolchain-funcs wxwidgets
+
+DESCRIPTION="Disk encryption with strong security based on TrueCrypt"
+HOMEPAGE="https://www.veracrypt.fr/en/Home.html"
+SRC_URI="https://github.com/${PN}/VeraCrypt/archive/VeraCrypt_1.24-Update2.tar.gz -> ${P}.tar.gz"
+
+# The modules not linked against in Linux include (but not limited to):
+#   libzip, chacha-xmm, chacha256, chachaRng, rdrand, t1ha2
+# Tested by actually removing the source files and performing a build
+# For this reason, we don't have to worry about their licenses
+LICENSE="Apache-2.0 BSD truecrypt-3.0"
+SLOT="0"
+KEYWORDS="amd64"
+IUSE="+asm cpu_flags_x86_sse2 cpu_flags_x86_sse4_1 cpu_flags_x86_ssse3 doc X"
+RESTRICT="bindist mirror"
+
+WX_GTK_VER="3.0-gtk3"
+
+RDEPEND="
+	sys-fs/lvm2
+	sys-fs/fuse:0
+	x11-libs/wxGTK:${WX_GTK_VER}[X?]
+	app-admin/sudo
+	dev-libs/pkcs11-helper
+"
+DEPEND="
+	${RDEPEND}
+	virtual/pkgconfig
+	asm? ( dev-lang/yasm )
+"
+
+S="${WORKDIR}/VeraCrypt-VeraCrypt_1.24-Update2/src"
+
+pkg_setup() {
+	local CONFIG_CHECK="~BLK_DEV_DM ~CRYPTO ~CRYPTO_XTS ~DM_CRYPT ~FUSE_FS"
+	linux-info_pkg_setup
+
+	setup-wxwidgets
+}
+
+src_prepare() {
+	# 1.24_p2 breaks the compilation against wxGTK[-X]
+	# See: https://github.com/veracrypt/VeraCrypt/issues/531
+	eapply -p2 "${FILESDIR}"/${PN}-1.24_p2-revert-wxwidgets-breakage.patch
+	eapply -p2 "${FILESDIR}"/${PN}-1.24-no-gui-fix.patch
+	default
+}
+
+src_compile() {
+	local TC_EXTRA_CFLAGS="${CFLAGS}"
+	local TC_EXTRA_CXXFLAGS="${CXXFLAGS}"
+	local myemakeargs=(
+		NOSTRIP=1
+		NOTEST=1
+		VERBOSE=1
+		CC="$(tc-getCC)"
+		CXX="$(tc-getCXX)"
+		AR="$(tc-getAR)"
+		RANLIB="$(tc-getRANLIB)"
+		TC_EXTRA_LFLAGS="${LDFLAGS}"
+		WX_CONFIG="${WX_CONFIG}"
+		$(usex X "" "NOGUI=1")
+		$(usex asm "" "NOASM=1")
+		$(usex cpu_flags_x86_sse2 "" "NOSSE2=1")
+		$(usex cpu_flags_x86_sse4_1 "SSE41=1" "")
+		$(usex cpu_flags_x86_ssse3 "SSSE3=1" "")
+	)
+
+	# We need to explicitly disable the GUI support when linking against
+	# wxwidgets, in case it was compiled with USE=X
+	if ! use X; then
+		TC_EXTRA_CFLAGS="${TC_EXTRA_CFLAGS} -DwxUSE_GUI=0"
+		TC_EXTRA_CXXFLAGS="${TC_EXTRA_CXXFLAGS} -DwxUSE_GUI=0"
+	fi
+
+	myemakeargs+=(
+		TC_EXTRA_CFLAGS="${TC_EXTRA_CFLAGS}"
+		TC_EXTRA_CXXFLAGS="${TC_EXTRA_CXXFLAGS}"
+	)
+
+	emake "${myemakeargs[@]}"
+}
+
+src_test() {
+	"${S}/Main/veracrypt" --text --test || die "tests failed"
+}
+
+src_install() {
+	local DOCS=( Readme.txt )
+	local HTML_DOCS=( )
+
+	dobin Main/veracrypt
+	if use doc; then
+		DOCS+=( "${S}"/../doc/EFI-DCS )
+		docompress -x "/usr/share/doc/${PF}/EFI-DCS"
+		HTML_DOCS+=( "${S}"/../doc/html/. )
+	fi
+	einstalldocs
+
+	newinitd "${FILESDIR}/${PN}.init" ${PN}
+
+	if use X; then
+		local s
+		for s in 16 48 128 256; do
+			newicon -s ${s} Resources/Icons/VeraCrypt-${s}x${s}.xpm veracrypt.xpm
+		done
+		make_desktop_entry ${PN} "VeraCrypt" ${PN} "Utility;Security"
+	fi
+
+	pax-mark -m "${D%/}/usr/bin/veracrypt"
+}
+
+pkg_postinst() {
+	ewarn "VeraCrypt has a very restrictive license. Please be explicitly aware"
+	ewarn "of the limitations on redistribution of binaries or modified source."
+}
diff --git a/app-crypt/xca/Manifest b/app-crypt/xca/Manifest
index 4bcc73a86290..5142e810ddcc 100644
--- a/app-crypt/xca/Manifest
+++ b/app-crypt/xca/Manifest
@@ -1,4 +1,4 @@
 AUX xca-1.0.0-desktop.patch 391 BLAKE2B 1cbec5681df8da9230b783c8ea048a199bd31a38fce6781dcd86b926e03b245de05b148d8df9034f5c7470dcf5823bd4a080cbb011a1a32fc0b96d8a8a5d950d SHA512 5dd62d8d2f4485b6155e466bb9a012f44104ff36c97bae61e8155880b937fc1271e94fb5b83627bd828e3cde0ab421a150458d050cb512d633d1c5c97f80f163
 DIST xca-2.1.2.tar.gz 1086563 BLAKE2B d48727fffad16d840633af6e0ee38a279978a5b865eb6f391a3d852a0105817254ea0a4780875f2956e1f7e9931e6930c6ffbe82b117dbf8ad0058ec9d6f5c88 SHA512 1f104a22b83b802576b4820b7139971da50f9b3dd70aca8e1199e996bad4379b8681bb31b197b84a3dfa49cef4ae093f6622d15fac9667547ff47af43c1e5f07
 EBUILD xca-2.1.2.ebuild 1455 BLAKE2B 1aea6cd367a144b64aba3439204e81d2afdbac0e506596eeb02731b439c4b4812a6e3b572f2b974a881a3765832edda9a87301eb593d7c1f569543425d55ffc9 SHA512 d3156e68bd839e5d332190389605759db233c00cb70485b2f8238b4c684473836e817f0af8da44c87d9ff6b736ac6464479b2216572594a5eb7a53881ceab5a2
-MISC metadata.xml 313 BLAKE2B 6e1376d870ee5ab083ed80dcc19c1acd60d487e285e9bdba7b92c13e97cb05a3a6fa8bc4c6107d5d54470e6ca93889fca15c1a2f7e690a169ca7aff64bd2499e SHA512 ebc38746afd94878384ef0e4d7933e2a7433216716b1854cfc0227c3f0abf0847d784d36de4b04a778743e442298abd3769329deecdc771003681ecd3dbf3fa1
+MISC metadata.xml 350 BLAKE2B 825e045b03a40c1b9a3c5af631d1748532ad4c84e83d0efd1d4866c5cc1284afab67f1e3e00a2c31a376a19d4e4608404a5830ab1a8a738079a3b6128f5c9bad SHA512 fd4e95bcd679b22bdfa620896e81e0a63bc6f084c60bf42caa853f9dcef2c797ff640801f206caceb6969ee4e347492200b37af4920c50c9764a3bac48910cf3
diff --git a/app-crypt/xca/metadata.xml b/app-crypt/xca/metadata.xml
index 27fe33dd45b0..d1bb33e0aab1 100644
--- a/app-crypt/xca/metadata.xml
+++ b/app-crypt/xca/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="project">
-		<email>crypto@gentoo.org</email>
-		<name>Crypto</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="sourceforge">xca</remote-id>
-	</upstream>
+    <maintainer type="person">
+        <email>ikelos@gentoo.org</email>
+        <name>Mike Auty</name>
+    </maintainer>
+    <upstream>
+        <remote-id type="github">chris2511/xca</remote-id>
+    </upstream>
 </pkgmetadata>
diff --git a/app-crypt/yubikey-manager-qt/Manifest b/app-crypt/yubikey-manager-qt/Manifest
index 5cd22839a05f..c2913a1b3894 100644
--- a/app-crypt/yubikey-manager-qt/Manifest
+++ b/app-crypt/yubikey-manager-qt/Manifest
@@ -1,3 +1,3 @@
 DIST yubikey-manager-qt-1.1.3.tar.gz 13316325 BLAKE2B 765634b05fff9efdd5ec5e91e0a5de7f04144476b83f7b3ba8a0c8a1bc95ca7132f25e193afca2bec17fe377c683063a14657efc24fb047a64a8f4498c7abaed SHA512 84bcca3f74967ba8aa470b8dd6c8699ff6a93a85ce942934a1d0cd674a4c507ba297d9a5ebb40bae3476ea713965a7bb3816dad1110a045c338f070eb249f02b
-EBUILD yubikey-manager-qt-1.1.3.ebuild 1417 BLAKE2B 34b9370be866b7fd7dfb2f9247ffb37146486c5071c8e598666a09ef3a8d0493303bf755998962b0c47734bad921cc1597bc63efef89a9765a0742418860852a SHA512 d18a91af7b9367def839eb2cb4227539c7680965af576a2472c2237b2a91835240ca41b5372a91cddb2468f81fb7dd1258b696c11464bc5206b9cf32ae50af1e
+EBUILD yubikey-manager-qt-1.1.3.ebuild 1413 BLAKE2B 0427d39f708ad538f85f0953a131c09a993eaf36236a149a5d9cda0d8652f9ef03f95fdae1cc6451d0fbbb23dade6e0a826cdccebef944e4925ab3fc20b0960d SHA512 d7bf4f802ce38d95b7aeea150ca7d119ac663371664aac5605cc269f1b51f677dcf36e23588708f0daba7d5451877e702c714dc25d3eb53238803f99ba3a3aa7
 MISC metadata.xml 371 BLAKE2B 1081e69aeb641c9d7de472bed98dfb336bc37e5374becbec4603316176419dcdb337f29b355b3395b778d250a99e32b181b84b42d4b7c10dedce7c47a6a187f6 SHA512 ed480648e967bfa3d95f71a5131963290e4265c487a345b69e34ad23c4ab18d82b08cd1e4a12f389533cc9690163fed90c05d471375fadd074c99a235105e837
diff --git a/app-crypt/yubikey-manager-qt/yubikey-manager-qt-1.1.3.ebuild b/app-crypt/yubikey-manager-qt/yubikey-manager-qt-1.1.3.ebuild
index 8efcc2e7e4ec..99fb80953a8b 100644
--- a/app-crypt/yubikey-manager-qt/yubikey-manager-qt-1.1.3.ebuild
+++ b/app-crypt/yubikey-manager-qt/yubikey-manager-qt-1.1.3.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python3_{5,6} )
+PYTHON_COMPAT=( python3_6 )
 
 inherit eutils qmake-utils python-single-r1
 
diff --git a/app-crypt/yubikey-manager/Manifest b/app-crypt/yubikey-manager/Manifest
index 798522511f9c..01aab7a180fa 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 1609 BLAKE2B d8d9e956a2f36d37815babd7aca13b030ebbc7244b153f361858dbf5c11865343bf8c6c6ad53b7946a25645c4f24887e652a4dabb5a27c80ab7da703932099b4 SHA512 cd464ea815f1dd1ec643b70b8b60cfe4ec557a256525aa4b6e6973287e8c74b8581081570e3a667564edc8a77bb79ae288e9600e4b1426928e187a42fdc035ba
+EBUILD yubikey-manager-3.1.0-r1.ebuild 1605 BLAKE2B 3bb21dfe6726689f5dc676175a3551c821eda6ab4ab67553d955ddad09789c5e736aa130a9f70ede9a0b65edfeb6df9c26b1c7adb0157986dfb1ccfbb5ac7592 SHA512 5eeb28cbb6d2dee877aa149ba9f55cb8ba14fa62617ea7b3b978988c58f6412c7c7f6c430c0c8e428fe607a23166760e3c4d5cd22cce1d5fcf949249e0c885bf
 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 64c32a219bbc..dec0828aa805 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
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python{2_7,3_{5,6}} )
+PYTHON_COMPAT=( python{2_7,3_6} )
 inherit readme.gentoo-r1 distutils-r1
 
 DESCRIPTION="Python library and command line tool for configuring a YubiKey"
author	V3n3RiX <venerix@redcorelinux.org>	2020-01-15 15:51:32 +0000
committer	V3n3RiX <venerix@redcorelinux.org>	2020-01-15 15:51:32 +0000
commit	21435953e16cda318a82334ddbadb3b5c36d9ea7 (patch)
tree	e1810a4b135afce04b34862ef0fab2bfaeb8aeca /app-crypt
parent	7bc9c63c9da678a7e6fceb095d56c634afd22c56 (diff)