gentoo resync : 25.04.2020

author: V3n3RiX <venerix@redcorelinux.org> 2020-04-25 11:37:10 +0100
committer: V3n3RiX <venerix@redcorelinux.org> 2020-04-25 11:37:10 +0100
commit: 38423c67c8a23f6a1bc42038193182e2da3116eb (patch)
tree: 04e2cf4bd43601b77daa79fe654e409187093c5e /app-crypt
parent: 623ee73d661e5ed8475cb264511f683407d87365 (diff)
64 files changed, 549 insertions, 285 deletions
diff --git a/app-crypt/Manifest.gz b/app-crypt/Manifest.gz
index 011dda74fd93..09759406d83e 100644
--- a/app-crypt/Manifest.gz
+++ b/app-crypt/Manifest.gz
diff --git a/app-crypt/acme/Manifest b/app-crypt/acme/Manifest
index 10d39ae8d106..e50459e711f9 100644
--- a/app-crypt/acme/Manifest
+++ b/app-crypt/acme/Manifest
@@ -1,4 +1,4 @@
 DIST certbot-1.3.0.tar.gz 1362945 BLAKE2B bb36a7737275332f018d7f2283286e07e041892cc366f79e68df9eee7e57ca2186d36895d1923b032068a365878d09e49e17c1399a7418dbd8607c9a7efc1c26 SHA512 4205cdd1f3ddf500b9b952744db234636c086a856df80acd2d776305f4501eed07995e453e5c9b2c711fb0d1f1987d2bb8baaa13fccce8e000a38f486cfdc5d3
-EBUILD acme-1.3.0.ebuild 1744 BLAKE2B 4dc4d69eee70fead7baf6cdc811510fe7b6e5f49deb84b765223555b8a9ac29fdc299c35ab260cd05ce5447b3b6cfe152ef110e2a0c18ebd9c34dd78ad5fce4d SHA512 b69c7b8a952c95415894c299e49c26cbf1a6bb5929f52f10d23f4e297b6cf6a6c7f1427a94834536416518245899d498395574f46b6dd0a015c626d01c75994c
-EBUILD acme-9999.ebuild 1746 BLAKE2B eb09320774e53a3f6b2b0c9cf229ca86b40f98c1cac803a359d5ba4310556afcc223d54818fac64bb34bddb9033676a5fb6321376874da73e8cf01024a14019f SHA512 c87f8c6be501bde475a17525f6cb5b1f26e627590fc393b06f62ec0d211952f4ab146a66718cb37e4e275d7bbd2fd861eadfae814035b5a2b81b59d8574d1670
+EBUILD acme-1.3.0-r1.ebuild 1770 BLAKE2B dd2b344dc9157631cadafaec85f9bf220444917e71be0166a513d2eb0ac9d863aa3369f2c61c11bf4b9fb9054a1a0e59b28fe6b92aa0c686133fb4b8cbcefc71 SHA512 caba8e15d9e396d9707cf868cc1ec76be17b462d5be08508df8f02ef16c093b55ae770e8f68e97a0d19cd030a8ac087c3e980829eccb8458f5e1bf770a86d947
+EBUILD acme-9999.ebuild 1772 BLAKE2B fd15cbcf90416ad182432bbee91d262fbcc5b3b3304fe226b61a6ff368c9ecdeea8d554a2b57ccf3d280da9cb0d8bcd4a32de5c8fe5b2b53a890db6084bc7544 SHA512 e905702e2cf1f89e453876a828d377c2c50cb5f157b7fe538501a24ade7306bcf9be160b8bd748156d6769a15c21d363a02be0c90517a0d89c7082c7fefc1e42
 MISC metadata.xml 384 BLAKE2B 55780995cb61c11ca859c9f1de17b1c22c9c92902f551ccd1ee6f030df9d513bb5519a2c62bf33bc6a5872790d033ba966e5ed137d84a4f66ab4ba7636a88887 SHA512 cf8393b25aa363bc1db4ebd23274affd1eaf999a4c2ab8d359730f421961dafd5c96fcf14c247f3f5419616116e2351d72fbf0e29301ea44ac522e865c7b0fa1
diff --git a/app-crypt/acme/acme-1.3.0.ebuild b/app-crypt/acme/acme-1.3.0-r1.ebuild
index db4f214816dc..279b634c1750 100644
--- a/app-crypt/acme/acme-1.3.0.ebuild
+++ b/app-crypt/acme/acme-1.3.0-r1.ebuild
@@ -52,6 +52,7 @@ DEPEND="
 
 src_compile() {
 	python_foreach_impl run_in_build_dir default
+	distutils-r1_src_compile
 	if use doc ; then
 		cd docs || die
 		sphinx-build -b html -d _build/doctrees   . _build/html
diff --git a/app-crypt/acme/acme-9999.ebuild b/app-crypt/acme/acme-9999.ebuild
index 4aaf884c944a..baec59de4e1e 100644
--- a/app-crypt/acme/acme-9999.ebuild
+++ b/app-crypt/acme/acme-9999.ebuild
@@ -52,6 +52,7 @@ DEPEND="
 
 src_compile() {
 	python_foreach_impl run_in_build_dir default
+	distutils-r1_src_compile
 	if use doc ; then
 		cd docs || die
 		sphinx-build -b html -d _build/doctrees   . _build/html
diff --git a/app-crypt/ccid/Manifest b/app-crypt/ccid/Manifest
index 833904ccdc12..036a434c7770 100644
--- a/app-crypt/ccid/Manifest
+++ b/app-crypt/ccid/Manifest
@@ -1,6 +1,8 @@
 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
+DIST ccid-1.4.32.tar.bz2 657200 BLAKE2B 9598b010f2eb085d1d02d9363136b294dc30ea1cf9256d398838461016fae5572926d5f24e3065384c9a349b0a9783670c8cb9d4f59bf50171c7f5501b963d82 SHA512 80fc3bac547ee7c37ff0e72cc650d0a5e1102720698bdc1278581ec53ff1407e0e719eb0345775fbc76c0d56d9271dcb07a9ddc98450bba2ff37823f23a8adbf
 EBUILD ccid-1.4.30.ebuild 1537 BLAKE2B 40302bc90b107dc00e626678b0b575d5a8f3b6a6844d4058826a0d7875429ac32eda12785f77275fece433eabb265d001490a0745841bdf0568666e24359f073 SHA512 559a21ea87990de3d17158ccc24fd666929826c8de604f19dca8e41921d2f3d5ebcefb90e02c4c1acda08dd4cdbca3e3aabdd43ee447a87f6dc15ec470c84f31
 EBUILD ccid-1.4.31.ebuild 1545 BLAKE2B 5627cd4bdb7e5d743fe0f4a176ee60dfbeb6f59d702aff09ea3537859f134696d84750ef926d2451fcc6e8e3980fa18c0a21b0fae58cc45ca511006bf0da7f1a SHA512 08c9b5ca0996e28865c109da5d289b45f2dd55e5773a6b96dd59d68e66152466ac87b35a3f5cd032b68c7ff75d8d22ac27910644c3923c27911d31820ffbbaa9
+EBUILD ccid-1.4.32.ebuild 1545 BLAKE2B 5627cd4bdb7e5d743fe0f4a176ee60dfbeb6f59d702aff09ea3537859f134696d84750ef926d2451fcc6e8e3980fa18c0a21b0fae58cc45ca511006bf0da7f1a SHA512 08c9b5ca0996e28865c109da5d289b45f2dd55e5773a6b96dd59d68e66152466ac87b35a3f5cd032b68c7ff75d8d22ac27910644c3923c27911d31820ffbbaa9
 MISC metadata.xml 404 BLAKE2B e9f39e817f575a3412bcf79c42aa58c22547d4abe41272151ea3147cf08d2ba413b2840281115ff1f84bbb90ab8f5e5731d7b2daa2c0887dc3b07466680e0dcc SHA512 5710a9f296257aa374fdabf1745b11e351eb1f92cf635918d73a5293afcba490d3eea9785587e4212922d94aa2e079496ced99853f0ff2ad891e41c6e1c816f8
diff --git a/app-crypt/ccid/ccid-1.4.32.ebuild b/app-crypt/ccid/ccid-1.4.32.ebuild
new file mode 100644
index 000000000000..a47b8bea185c
--- /dev/null
+++ b/app-crypt/ccid/ccid-1.4.32.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs udev
+
+DESCRIPTION="CCID free software driver"
+HOMEPAGE="https://ccid.apdu.fr https://github.com/LudovicRousseau/CCID"
+SRC_URI="https://ccid.apdu.fr/files/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="twinserial kobil-midentity +usb"
+
+RDEPEND=">=sys-apps/pcsc-lite-1.8.3
+	usb? ( virtual/libusb:1 )"
+DEPEND="${RDEPEND}"
+BDEPEND="kernel_linux? ( virtual/pkgconfig )"
+
+DOCS=( README.md AUTHORS )
+
+src_configure() {
+	econf \
+		LEX=: \
+		$(use_enable twinserial) \
+		$(use_enable usb libusb)
+}
+
+src_compile() {
+	default
+	use kobil-midentity && emake -C contrib/Kobil_mIDentity_switch
+}
+
+src_install() {
+	default
+
+	if use kobil-midentity; then
+		dosbin contrib/Kobil_mIDentity_switch/Kobil_mIDentity_switch
+		doman contrib/Kobil_mIDentity_switch/Kobil_mIDentity_switch.8
+	fi
+
+	if use kernel_linux; then
+		# note: for eudev support, rules probably will always need to be
+		# installed to /usr
+
+		# ccid >=1.4.11 version changed the rules drastically in a minor
+		# release to no longer use the pcscd group. Using the old ones in
+		# the mean time.
+		udev_newrules "${FILESDIR}"/92_pcscd_ccid-2.rules 92-pcsc-ccid.rules
+
+		# disable Kobil_mIDentity_switch udev rule with USE=-kobil-midentity
+		if ! use kobil-midentity; then
+			sed \
+				-e '/Kobil_mIDentity_switch/s/^/#/' \
+				-i "${D}/$(get_udevdir)"/rules.d/92-pcsc-ccid.rules || die
+		fi
+
+	fi
+}
diff --git a/app-crypt/certbot-apache/Manifest b/app-crypt/certbot-apache/Manifest
index ff75d929c7b8..974a5ef343c6 100644
--- a/app-crypt/certbot-apache/Manifest
+++ b/app-crypt/certbot-apache/Manifest
@@ -1,4 +1,4 @@
 DIST certbot-1.3.0.tar.gz 1362945 BLAKE2B bb36a7737275332f018d7f2283286e07e041892cc366f79e68df9eee7e57ca2186d36895d1923b032068a365878d09e49e17c1399a7418dbd8607c9a7efc1c26 SHA512 4205cdd1f3ddf500b9b952744db234636c086a856df80acd2d776305f4501eed07995e453e5c9b2c711fb0d1f1987d2bb8baaa13fccce8e000a38f486cfdc5d3
-EBUILD certbot-apache-1.3.0.ebuild 1096 BLAKE2B f211cb5ca409a472f7ef37a52ec3691632680140832ebff70265b213888c45c4ba07e8c6e81a4a5ecc8791d185e6ae22c652ee6a8815f62997f11677269b085f SHA512 c9d67683aa5be99edf4e657f75a8de3fe598f11416991cf1006475b9a45033e02f85433c429c5047568d9789c3f6a870ece93ff02a571b2da1d56551d354c076
-EBUILD certbot-apache-9999.ebuild 1098 BLAKE2B 48134461ad6db972453423f9d57c4d3bbb0c4823015f2ae8f36c2059a75124d105e7fa6594eb7a313e3220f07d0fed8f56cfe99d0a37df64b66e8e14dd3c67ad SHA512 0f276ad597397a20050801349dfd03782ad40a414f13a28070594468484e9761a629a3c8e4889d36a8cf8c58f3b0b2ca61b98761ecf8d2a7b66a80584eb65a73
+EBUILD certbot-apache-1.3.0-r1.ebuild 1103 BLAKE2B b5e48f218836b1d6ed67a7c752fba68f938cfda74e86472eaf7e518857948d091a80d8516e3459fd550252c5366082a2cf0246550145ca27cb680c303bc76815 SHA512 3a139f0e9430e2bf0fb6bb5efc4bdd055bb12a66a48f5ab19a2d540267922317cba30a84dd12d90d34b26ccecf79066fda61df0330266f7a7c1f8f1352407e2d
+EBUILD certbot-apache-9999.ebuild 1105 BLAKE2B 80bb99718096bc436534a7baefd6253e99b331e8313d59176a8c316b1c90fc9b7fa78128ca16f6dbff29830a25c13caafb4ae24f1da669821b6c9e549d1877bb SHA512 4ed9707a48eb0bf8350e00f73de4504a5e1d0dd9cfa29874f46a37d8f09d645fc0c6d9f0aaa8f7486fc748734ded2ecd04b44ad209681e55c57b8f48ed683bc8
 MISC metadata.xml 334 BLAKE2B 4adbd04c0edcc84925da47b32fee63d4652bf2a1bf5222a56e0e1c7cfe8aaa34275a2652c4416f8a80de11fd88217d8626d610fa857f0615f18bfd773a279e55 SHA512 e3d6dda6c44557523fd48b464b6d39fc45b90ba2ecbe03fb300a655973c1b2e654a24d8d381b769eba00d0d80fb5881e1dfec1694e223cd83047abba9f01a44f
diff --git a/app-crypt/certbot-apache/certbot-apache-1.3.0.ebuild b/app-crypt/certbot-apache/certbot-apache-1.3.0-r1.ebuild
index d454271a63c7..3ef09260e724 100644
--- a/app-crypt/certbot-apache/certbot-apache-1.3.0.ebuild
+++ b/app-crypt/certbot-apache/certbot-apache-1.3.0-r1.ebuild
@@ -31,9 +31,9 @@ RDEPEND=">=app-crypt/acme-0.29.0[${PYTHON_USEDEP}]
 	dev-python/zope-component[${PYTHON_USEDEP}]
 	dev-python/zope-interface[${PYTHON_USEDEP}]"
 DEPEND="test? ( ${RDEPEND}
-	dev-python/nose[${PYTHON_USEDEP}] )
+	dev-python/pytest[${PYTHON_USEDEP}] )
 	dev-python/setuptools[${PYTHON_USEDEP}]"
 
 python_test() {
-	nosetests || die
+	esetup.py test || die
 }
diff --git a/app-crypt/certbot-apache/certbot-apache-9999.ebuild b/app-crypt/certbot-apache/certbot-apache-9999.ebuild
index 56e71bffc582..499084cf93b1 100644
--- a/app-crypt/certbot-apache/certbot-apache-9999.ebuild
+++ b/app-crypt/certbot-apache/certbot-apache-9999.ebuild
@@ -31,9 +31,9 @@ RDEPEND=">=app-crypt/acme-0.29.0[${PYTHON_USEDEP}]
 	dev-python/zope-component[${PYTHON_USEDEP}]
 	dev-python/zope-interface[${PYTHON_USEDEP}]"
 DEPEND="test? ( ${RDEPEND}
-	dev-python/nose[${PYTHON_USEDEP}] )
+	dev-python/pytest[${PYTHON_USEDEP}] )
 	dev-python/setuptools[${PYTHON_USEDEP}]"
 
 python_test() {
-	nosetests || die
+	esetup.py test || die
 }
diff --git a/app-crypt/certbot/Manifest b/app-crypt/certbot/Manifest
index 112ab4ec9212..2fcde050d00a 100644
--- a/app-crypt/certbot/Manifest
+++ b/app-crypt/certbot/Manifest
@@ -1,4 +1,4 @@
 DIST certbot-1.3.0.tar.gz 1362945 BLAKE2B bb36a7737275332f018d7f2283286e07e041892cc366f79e68df9eee7e57ca2186d36895d1923b032068a365878d09e49e17c1399a7418dbd8607c9a7efc1c26 SHA512 4205cdd1f3ddf500b9b952744db234636c086a856df80acd2d776305f4501eed07995e453e5c9b2c711fb0d1f1987d2bb8baaa13fccce8e000a38f486cfdc5d3
-EBUILD certbot-1.3.0.ebuild 1478 BLAKE2B 88cb65acdf7e41bb4d415a6831a055f61aea97854f34f065b24f417b4fdabb15fa0293aeacf50434d3c56e37391dbe0bca1aaf3e1b68927ba63204508e168bd7 SHA512 2069c1f49f2122736d4c2351f598c5f0682de87430c664fb046292d14fa38be1938abdd47fcdb77c26cf25dab6e91c8f1a7aaacd90547535a7b6044b14752e2d
-EBUILD certbot-9999.ebuild 1480 BLAKE2B ba986a8752ea1a113425338c76a6c2c2928af3f7b33cbc49cca872bb61b269e541dc01709c0f29b6994760a15eaadff2da97a5d5d128f086af105e1b6c44e93a SHA512 a8039218848544651e80e11215e6f5cfa75ed2f244a9db61108b573a082e499f70cd4f358573f7a4aa423635755338b627ea212d8ef0e9f16338bce5ddf43412
+EBUILD certbot-1.3.0.ebuild 1482 BLAKE2B c937a391b768757ed01f31fa96596da3cad08ea7394af1b5f5a9a828ef97a4a948b9315a3fc499742eb95dd3370f2d303b52886dcc6df75d2d502801a18aa62d SHA512 e7081e69f95c7d2aec45938ca6cc7e3da6dc00d038cb3d9167e1e33102b84d06e6a7a3ff13c5734c933c0b062d1e07203d6002a3a3f1609c14874679d2b3d077
+EBUILD certbot-9999.ebuild 1484 BLAKE2B ec9e79981e59a16061161afacfbb68e889bbcc2f39874914af18f9442c762fa617c05132779b84ae8df5fc96680a3b96b7773cf7e82e6ced118d5a21c7c6eba6 SHA512 df7ebbc90d3f07e67507936ceff7f346dba3a8f91f6fa7a94bcf69fbff2c817f85df0da336c5bacc97643b32cdbde781fa0e66ac29df8ca14c4cf71856c23f24
 MISC metadata.xml 334 BLAKE2B e7b28e7d3e7c6fdce0c5120b29fbf5aa607408e2add6c0ad42e921fb1add9def38c6cb191129a5a6e1f0e3ea119caa6cdc74955b572e5d2c6f854d0b7c7c521a SHA512 a24ccf633fc9c2670dcd35801d95bd8ca0f4ea4d3d53b6651f2e8e3e280b95ec8a464d99f5423942c14b0777ae4551f46c1ff285caea460bc91cbc417a7a5b70
diff --git a/app-crypt/certbot/certbot-1.3.0.ebuild b/app-crypt/certbot/certbot-1.3.0.ebuild
index cf2fc8bb8922..7d648b678ea2 100644
--- a/app-crypt/certbot/certbot-1.3.0.ebuild
+++ b/app-crypt/certbot/certbot-1.3.0.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=(python{3_6,3_7})
+PYTHON_COMPAT=(python{3_6,3_7,3_8})
 
 if [[ ${PV} == 9999* ]]; then
 	EGIT_REPO_URI="https://github.com/certbot/certbot.git"
diff --git a/app-crypt/certbot/certbot-9999.ebuild b/app-crypt/certbot/certbot-9999.ebuild
index c81039179f59..5bbead32041e 100644
--- a/app-crypt/certbot/certbot-9999.ebuild
+++ b/app-crypt/certbot/certbot-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=(python{3_6,3_7})
+PYTHON_COMPAT=(python{3_6,3_7,3_8})
 
 if [[ ${PV} == 9999* ]]; then
 	EGIT_REPO_URI="https://github.com/certbot/certbot.git"
diff --git a/app-crypt/envchain/Manifest b/app-crypt/envchain/Manifest
index 9fe052ceeff9..8addf2ca800d 100644
--- a/app-crypt/envchain/Manifest
+++ b/app-crypt/envchain/Manifest
@@ -1,3 +1,3 @@
 DIST envchain-1.0.0.tar.gz 8252 BLAKE2B 5b4e07421d47eede180ddbd1968090050ec4b25e887d235f2714604ed0d4439f1a36b72f0d277c53e3b9f010ee9c6bb61f598daec330641384c21b00802feadd SHA512 0c7e129509fa60adbbedd995c30a11e981171b85dfce60385a0fd4a3d8264f1a2d65300f882e45075556490dfff0255eb6a6688066455809653b81e83d29c514
 EBUILD envchain-1.0.0.ebuild 476 BLAKE2B c424c556f180f755c75db9bb650be9e375f94950bac6f83c114d3f14667f5c0818bf35c98c4c94c3fce098f51c65f1a42791605109ddf279a519a6446994fe7f SHA512 09f8a61e03ad2115a5db8005f4fbd90bb7599c51e6d8bcbda7baffe399116e36a89b07ee7176a13039ff67548a9ae5f51a19967701ef37dc0c7220e5d0f30e2a
-MISC metadata.xml 766 BLAKE2B 671428041ffadfe0fd1df8655d476e8f29912786cf8dd7fed354b04a40295335e04dbbb381f8affded0b3ca91d9f86bb8d8912f8cb60f4686fa802f1187faf4f SHA512 d9896d24c0ba5a9b7750d907277946a3b592e9dafe4d162544a8f202ed6b01aa936159f5520d7eb79e01d169c2cde04db9e84d91164c2dffade31785f4102839
+MISC metadata.xml 563 BLAKE2B 2bd37267ec48793d16ed8f7bc8a2c27a5e68bbc9aa3c98ddfb84f2f9bd34c60421bc7627bb193762641ef72ddca078ae7a4d4c1ca0013d5544e2f4eb7e6ea29f SHA512 5643beb6d2bb34e30f3f671a08f7a648e071f70100f7ccbd081976c026f761e1774825eb634fff3a4ea656dc270b2342d9284c026a2dda8edaa14aa3c138ce3c
diff --git a/app-crypt/envchain/metadata.xml b/app-crypt/envchain/metadata.xml
index 9cbc0acedef6..103ed877db34 100644
--- a/app-crypt/envchain/metadata.xml
+++ b/app-crypt/envchain/metadata.xml
@@ -1,14 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
-    <email>her@sorah.jp</email>
-    <name>Sorah Fukumori</name>
-  </maintainer>
-  <maintainer type="project">
-    <email>proxy-maint@gentoo.org</email>
-    <name>Proxy Maintainers</name>
-  </maintainer>
+  <!-- maintainer-needed -->
   <longdescription lang="en">
     Set environment variables with OS X keychain or D-Bus secret service.
     Envchain allows you to save credentials in a secure vault to use as
diff --git a/app-crypt/gcr/Manifest b/app-crypt/gcr/Manifest
index dd67393bf8ee..d248946582c3 100644
--- a/app-crypt/gcr/Manifest
+++ b/app-crypt/gcr/Manifest
@@ -1,6 +1,4 @@
 AUX 3.34.0-fix-desktop-files.patch 2102 BLAKE2B a733e4c0c62d8d80229663efe81d5d563404c3dc428838ed5a1515fada5a1e4da92eee38f37918d80ffd3121603e4ce1e4dab82ebe433d838bf0949794a88fa2 SHA512 9967470ccaeea405ad55fc16f699ac5048bf803eb9043258c2f532ff36fbf252d683b45b6f0fd1a19d9f48f5f0ace60fff50881dd8ab1e13c5c1a9170d5eff6a
-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.28.1.ebuild 1868 BLAKE2B 487566371ddfce2fa03d83ddb8aefe35c56aedd0b7a050df34c4e8bab8b2c126635fae1f8d5d505d3594d98b3706176b17b1f2c1a28c35b63e4db8ef84faa733 SHA512 d56c5430a10f2f10f96bc9ffef09c715223a5f9faf3b034a0b988d8bd1220934572cfefb371e5c4f625fa6e8cecec4efc707e96d5bd398c271a14276f63024cf
-EBUILD gcr-3.34.0-r1.ebuild 1893 BLAKE2B e71db3fb7ba87fa7d52f03eedd8607a46e3c17cf94f34a1649c9960aab15ed45e210b57f3272d1d4565384c44fb89284ac38ee5864e043b976cde58745c6688b SHA512 d20e714fd82c72ded233a5b79f76b01c43242488eacd4228265c6142c46f987ea2789ad76a473d4a7ac73dd220c07fa0add9a7452812c59e5dd6be6e60314781
+EBUILD gcr-3.34.0-r1.ebuild 1892 BLAKE2B 99121cf56e5e2c42105e70e0211c5e0df823bad896b28e786ef79f771f4a5a56f23648cc520044e8f8340ef9ce583efdefde7736c1be09ab4ed3920e59fd7b7e SHA512 31f67170d9129e9133607b6b0f3d16c5bb6e1eda2cbfe9571a40b0b02b97a93d03155ec04ff3bbb825c6efb3fa087a4d0286bbaa259ea0063c16049f486d93fa
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/app-crypt/gcr/gcr-3.28.1.ebuild b/app-crypt/gcr/gcr-3.28.1.ebuild
deleted file mode 100644
index 5b681cec74f7..000000000000
--- a/app-crypt/gcr/gcr-3.28.1.ebuild
+++ /dev/null
@@ -1,78 +0,0 @@
-# Copyright 1999-2020 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://gitlab.gnome.org/GNOME/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 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.34.0-r1.ebuild b/app-crypt/gcr/gcr-3.34.0-r1.ebuild
index 06e322ad55da..5bc0674f0a90 100644
--- a/app-crypt/gcr/gcr-3.34.0-r1.ebuild
+++ b/app-crypt/gcr/gcr-3.34.0-r1.ebuild
@@ -18,7 +18,7 @@ IUSE="debug gtk +introspection +vala"
 RESTRICT="!test? ( test )"
 REQUIRED_USE="vala? ( introspection )"
 
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris"
 
 COMMON_DEPEND="
 	>=app-crypt/p11-kit-0.19
diff --git a/app-crypt/gentoo-keys/Manifest b/app-crypt/gentoo-keys/Manifest
index f498a45048e9..785859b54543 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 549 BLAKE2B 806a71650511f61fb6006f11ec107fbc9a504ebc0f3bc6580aab162596fb77333a71aef0bb405979f053a109935e343bc3dde9aa07c6b188b483063db8f2c146 SHA512 2f7bbef3e80223fa643f1d12319d91a8b340eac396b256ba847a02a1bd5a4d0e48d6ee78f8bb1443009eb1b8b1272f2aebbc2e575419c27f1cde22631f047ce1
+EBUILD gentoo-keys-201901130136.ebuild 550 BLAKE2B e25eef3da6f77936f24927569a5a2a4b4e992a738acdcbc719b8ffa95434b5e74611fb5c3c4b4ff08995eb5828f969de5d3808bb4367a061dbef2376b47d29db SHA512 6df025d1af65509e7e2227923b69f9f7a536d74dc564a080dd5261c066187b743fdaed660c6eddce4dcd55957f74975a4d9f115a4b591b0ce37071edc7450a78
 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 f96bdab7b54a..8b7661e76d87 100644
--- a/app-crypt/gentoo-keys/gentoo-keys-201901130136.ebuild
+++ b/app-crypt/gentoo-keys/gentoo-keys-201901130136.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://dev.gentoo.org/~dolsen/releases/keyrings/${P}.tar.xz"
 LICENSE="GPL-2"
 SLOT="0"
 
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 m68k ~mips ppc ppc64 s390 sparc x86 ~x64-cygwin ~amd64-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~x64-cygwin ~amd64-linux"
 
 S="${WORKDIR}"
 
diff --git a/app-crypt/glep63-check/Manifest b/app-crypt/glep63-check/Manifest
index 447324c8258c..e55c12cd9bb7 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 656 BLAKE2B 1066fcefbad0d38fd6038e9017f1565a5b4882ec21264dbe24f0029b4d7b4898c1d45ea8e233c624afc4f7a246d52d470cea6c990ed8a87ee70f8236f16ee06e SHA512 34ee34b8d6307718d66485ca0143a6fdee84fe2d07b924b0374fe5dd72c08b43bac52c0ed02392f5995d1ccc225ce87bffe42198f03c463739d3a7b8baf312db
+EBUILD glep63-check-9.ebuild 684 BLAKE2B 4a1ef24181f792a75e48a22301cc8d4d56ceec40175c7952b776324ddf72d2e9592c87537cbbc30bbf8e184965a0a742fc1bcc5652d85bf2c8db1b5cb8087617 SHA512 09858c4dba91d8d219fbb214b504d00b62a6a354862f710c8d93b30656b62b4c1bc9ad18f2a588a4303fa844d6471a51d1300feb5035f918fbb540544ad01c5e
 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 3e013ca5ed36..19655a3b7bc2 100644
--- a/app-crypt/glep63-check/glep63-check-9.ebuild
+++ b/app-crypt/glep63-check/glep63-check-9.ebuild
@@ -4,6 +4,7 @@
 EAPI=6
 
 PYTHON_COMPAT=( python3_{6,7} )
+DISTUTILS_USE_SETUPTOOLS=no
 
 inherit distutils-r1
 
diff --git a/app-crypt/gpgme/Manifest b/app-crypt/gpgme/Manifest
index 4cbd2546e5e7..ebebb82f838d 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 2671 BLAKE2B 847b922272a880fb192d9573f70e51e576b04ca106ca6d2d2ddc17dfc62986b8735be9c43d3133f27e3bf45ce4ae38082bfc713c941c4989368a15288458a73f SHA512 c43038ae65064cd0732e16be1a5cde5aa7f5379bcc3c7bea41ce217612260c1cb936e073a92ffa620d8aa658cdb5616ca67bb4ce28a8b573f5920a79aef612b4
-EBUILD gpgme-1.13.0.ebuild 2665 BLAKE2B 53568bff7ddc1b082c34b1b90c1d1c5a08bcffd6be53576e7d42dc15c5acd9c8284a48308f194b9b39889a2d8cd5787c04ce34d93a07a73f7d3bce46120c20a8 SHA512 5c0ec36e716642576e161482404b39e02006f193c40e739ef336555ea18caef99325c461943615bdab8166fedce2757c671032efc8181e5c0081ee39091df250
-EBUILD gpgme-1.13.1.ebuild 2673 BLAKE2B e64826465153cc45763b92b1cc3c14722a1e6b482ef6ce9836ab8d9a61bd647dbd0134cba1336f0878dc7fab96275004a9d19f11fa5360b93a3f6184be72a09e SHA512 550752badc923cc321b6efd81b21320070a9333275e3b6cb00bb206bfe5cb44128172805d6692eb4e68fcf1945907e87e68ec02e599ad94ca31cf1f20bc874be
+EBUILD gpgme-1.13.0-r1.ebuild 2673 BLAKE2B ff54cdd1d4b54b3c63d7beca5a05487fabb712f319c47608ac5d7d083d0e924c994cba1b895bab2b6114127415a534564d04e0906ee54b8e0e33bee9b18e9402 SHA512 5b6bda8a932698ed5995acc705c5a565bd9414cf0f04bfe17abac3833f3aa85036ca762dd85dd209610d4f100c42dd47f552569a0a438d8507cce4e6dde51ac3
+EBUILD gpgme-1.13.0.ebuild 2667 BLAKE2B 2a6a8ecc4e3dfa56a2f8fbc7a57b9ffa122eef195aa282a1d39acf604c5919e0cf8799eb428f541e549e567b07407bd06f3edfab6b6c0281a514da9124e39c5e SHA512 46cd9d29817cf74edc9e4b55696851cc3723ae8b718edeae012515e7be42c1cd91bc711a7b7255a792c1f4369931b5f3b5c52240fe5af2eaf86d5f2c32574b0f
+EBUILD gpgme-1.13.1.ebuild 2675 BLAKE2B 01bdd7bda6982fa4c4ad37f5a18c5b6c36fd8abc66e2905557abeb85dd3cd4d48368e8632789bbd0969a9831e6bebcff679674353e0d045ce9d1693958467e5d SHA512 212e51b8c18150a14ad83a547fa98153d7368da321e28d2b2b6e97a1f49437bda6072d9919d8c01b593fdcd44a0a813b6a5314cf92736a34a98c1e28cc4ef473
 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 124db5b26b6b..cc0b184d2efc 100644
--- a/app-crypt/gpgme/gpgme-1.13.0-r1.ebuild
+++ b/app-crypt/gpgme/gpgme-1.13.0-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{6,7} )
+PYTHON_COMPAT=( python3_{6,7,8} )
 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 4f9a829ea5eb..f4c1a7f81805 100644
--- a/app-crypt/gpgme/gpgme-1.13.0.ebuild
+++ b/app-crypt/gpgme/gpgme-1.13.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{6,7} )
+PYTHON_COMPAT=( python3_{6,7,8} )
 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 18f3e6fe6efe..ebcbbf49ad9d 100644
--- a/app-crypt/gpgme/gpgme-1.13.1.ebuild
+++ b/app-crypt/gpgme/gpgme-1.13.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{6,7} )
+PYTHON_COMPAT=( python3_{6,7,8} )
 DISTUTILS_OPTIONAL=1
 
 inherit distutils-r1 flag-o-matic libtool qmake-utils toolchain-funcs
diff --git a/app-crypt/hashalot/Manifest b/app-crypt/hashalot/Manifest
index 995330588739..8b4c9f827a05 100644
--- a/app-crypt/hashalot/Manifest
+++ b/app-crypt/hashalot/Manifest
@@ -1,3 +1,3 @@
 DIST hashalot-0.3.tar.gz 80284 BLAKE2B 1ec902f917a1e3e5babb24ea8763360fff8d41ab0baa6fac8053313c2115bc03187fb805f6ae6c013eb7a4f8eb4111bc781d5ac04c275fdba87658f0346aa8fd SHA512 c9ee39cefce5cc73b9a3a67b240616db9b66cde94fa351e6ebd4d13fd0f9195de9021c07d223809107e50b0a091d0d55e4caf2f71bba93f6d0da86af10632145
-EBUILD hashalot-0.3-r2.ebuild 387 BLAKE2B a5a523fa9803c379aee77c2d4de7701eebff51a412a494f22b2e861f112ef7f3c4ededcdabd828ea08983818fc2c62bfc0931127f678d47bd75bf3b0aa09fa4a SHA512 9efaa54429bd67dedf47dc2b10ea9e3bca38f249e8050002cfbb67a012f8e3cfc498d59a46c2c9a0a6738bea9553e83d6ade92ad56c499109681b7812a08d64c
+EBUILD hashalot-0.3-r2.ebuild 388 BLAKE2B 36b1da313fc7321b6783439c0e5b44e92970eda3e984a08d8259770f87561f506c057963724c1f6a0bd264a3aa00216f8a90a4c098a2b9e3e0fb59e8dd35ddd7 SHA512 2df1ff180866e8940ea45906c55b1ae69dea4c14592e4727589af6457add24fb04b4945aa9e19fab7f7891b983f0682959158c06beabd7326c426f1dd5d89cf1
 MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555
diff --git a/app-crypt/hashalot/hashalot-0.3-r2.ebuild b/app-crypt/hashalot/hashalot-0.3-r2.ebuild
index 5f2c1648b3b0..dc6b1d37b001 100644
--- a/app-crypt/hashalot/hashalot-0.3-r2.ebuild
+++ b/app-crypt/hashalot/hashalot-0.3-r2.ebuild
@@ -9,4 +9,4 @@ SRC_URI="https://www.paranoiacs.org/~sluskyb/hacks/hashalot/${P}.tar.gz"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ~ia64 m68k ~mips ppc ppc64 s390 sparc x86"
+KEYWORDS="~alpha amd64 arm hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86"
diff --git a/app-crypt/heimdal/Manifest b/app-crypt/heimdal/Manifest
index 11d437df5d1d..36fb1c7d9113 100644
--- a/app-crypt/heimdal/Manifest
+++ b/app-crypt/heimdal/Manifest
@@ -16,6 +16,6 @@ DIST heimdal-7.5.0.tar.gz 10071281 BLAKE2B 917f5855248c333e5ec35bf992973d8b5fb84
 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 4337 BLAKE2B eed76284c29cd994cf7b208f9520b3300335368095ad50b4086bb09715456b40a34cfe80f91672162373ffddb94d5ca7491c16cb2131c5179cfdf609a18dceef SHA512 af7a2e146e416a62088a1ab1d5c752b1245ae9b0bb5b5b9a923feec0325ef6ef4e9d1fe85f90d351a21e6453ef0a6ab3e2d03c598290304ed0eaf872aa4292f7
-EBUILD heimdal-7.6.0.ebuild 4544 BLAKE2B 459aabf1378e1f3082c7e0e21fb01396cd69521a1f0e74cbc816ed6cdf62cfe12736fdf73b85f1335754ecfcd3cb0f4c75c52025535f082113bf9506825426e2 SHA512 85c99b710ea3753e8209ede53004a25f2181635e32934384a80c5c8bbc5e006e473958b34afef59c0c42c9527198c8be4f048728c620c51d532d6f80fda19a56
+EBUILD heimdal-7.6.0.ebuild 4543 BLAKE2B e4120775ab6ce389acb2c65b21e3a57fffd6d2791379aaad2217fc5a928ccea8ebf5253073360d7d37ef535566bc095a9aa2a583a40cec0205b05574f148f77e SHA512 36f6afd2112ac21d71fe2519a55efdc70566bf66b2bf9a58ac4fc654c9a179bb6fd80cad2dd1ff51eb6e87f20bb63c0e876bfe25764dbd941924ee89ab1b06da
 EBUILD heimdal-7.7.0-r1.ebuild 4541 BLAKE2B 88c0f5e9c5052bbd6d4debbb088a4909a61469d34869a056c79e4d9518b14855b12d70d5c5e7934191c2c031fe54a21ff39942be43908082c505016ab3317271 SHA512 5b8a07e38ba068c8f18b0be0a90b8d2907e5af36e5dd0a0352f4960b8375cd9503122c41da39494d0c4b670e9e818f57fcd1666b43f6d22d65149ac3d2edb1c1
 MISC metadata.xml 722 BLAKE2B 9ec2bb074bf4932b0bb2f949eb3c33c8ed8b82305d6641a6954084120c658005cecc2cac57ad85a1df520f5bfd115deef57f80d874ba850d857a813b5a87c139 SHA512 5f3c28c222eb668e3c1d3b7fe24ae3622c82f94b6008a4c3458aa76afac9508d6e7f150de0f06e4845a5b0653ea04112fe0c2b421f199b5feb9ef771ab0b0b28
diff --git a/app-crypt/heimdal/heimdal-7.6.0.ebuild b/app-crypt/heimdal/heimdal-7.6.0.ebuild
index a4b03f644ada..648f2f91ecff 100644
--- a/app-crypt/heimdal/heimdal-7.6.0.ebuild
+++ b/app-crypt/heimdal/heimdal-7.6.0.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://github.com/${PN}/${PN}/releases/download/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ~ppc64 s390 ~sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ~ppc64 s390 sparc x86"
 IUSE="afs +berkdb caps gdbm hdb-ldap ipv6 libressl +lmdb otp selinux ssl static-libs test X"
 RESTRICT="!test? ( test )"
 
diff --git a/app-crypt/libb2/Manifest b/app-crypt/libb2/Manifest
index 5c94c76b98c7..a6fac6950a3c 100644
--- a/app-crypt/libb2/Manifest
+++ b/app-crypt/libb2/Manifest
@@ -1,4 +1,4 @@
 DIST libb2-0.98.1.tar.gz 280826 BLAKE2B aa8c3dee3032f457410479be12d00c79a6ca6a7c0376a5c70265d30ff25b50663171f7096141834d4faa4dd5027f38b23b774e59be63475a3ecba855337fb1aa SHA512 a666fdbd1efa9cfff3028e953c62f21ba092c6733ccd12d4d04f1f836fc9747fc90053bc9166510d251d332b91e133853d2cc9b61c279517bd65b05e8483250b
-EBUILD libb2-0.98.1-r1.ebuild 1743 BLAKE2B 3d5fe2fc4bf898a1ac1b602a018fd349dd340b630b89e13e1dc1c69f6fc410c1e74d8cf411d4c0c63b53238256706ac01a42dba472bb3855a59c2805febfbece SHA512 71ac7dc54e280cbb24fbec00b19091b36285ab3ceabd899f82f52e9e0a4673cec84805d4059d32c655be5f85d7b3a18d9ef5f1d5adf5da3dd4c21345ca2eaa23
-EBUILD libb2-0.98.1-r2.ebuild 1807 BLAKE2B 42a069e307970638781f70b4be944a6e2bcb9958ff90b628d944de6c8ae48568f4364929a69250f4ab1e0cbc07e5d64d4508ef282371453ca177506a59f678e2 SHA512 123100dc5fc647861e72f1d95d9a7e9e3c589020e3d1194f4017d1d827d5e7046470b3835d760ab3f43f5ba73b46ae7847625cdcdaa883a0275e043ed2d84004
+EBUILD libb2-0.98.1-r1.ebuild 1744 BLAKE2B 21d757b2eb0d5d61620abd2a268389757cb38cbbb7e08953cdbf9070b588fba7ac59bd21121f4ab393fd482b25e82f5d2fefeae239d03e1066be295a1ab82d81 SHA512 69296789036f4d5e403f2d17c054c439a680ec8eeca1b483d88c24f27e13d44606ad7595d68fa9f5eeba1c9212f0f2553bf5c37f05484aa0b65bcec9f9e289d1
+EBUILD libb2-0.98.1-r2.ebuild 1808 BLAKE2B b20f743e0ec0edd966ec8c1687a811c91c46c67dad1b066ac081ac9a33ef95ade63e7aea60719cf5717a1248eae926b074847f4ce4b0d03aeb8901538533142a SHA512 98e6f77472310acf180d7aae0bcd01881ac5c38147fd3839fdfa9c3b9d9a29fca8446094c40fdd2c40d5dd421825da0d5dffc9b2ca126580918a65ce11c75452
 MISC metadata.xml 688 BLAKE2B dafb52bda4cb5c27bbbb4cba85c178ce11e9511f0dedfed4ff3afe40789a28e4a8c9c275a1be7e86568419c29011c1a4ae5c67f7b778ece3c750d8a919d5d930 SHA512 a98e96312724a3af5d104e4adbb9f60cac16124c9beac2622045985c1b0c2276ff1d56561d59cfb5a24b57d29577312c7e73bdfe73bbe735c1c320b699065b11
diff --git a/app-crypt/libb2/libb2-0.98.1-r1.ebuild b/app-crypt/libb2/libb2-0.98.1-r1.ebuild
index 629aa938e865..a27fb95fcee3 100644
--- a/app-crypt/libb2/libb2-0.98.1-r1.ebuild
+++ b/app-crypt/libb2/libb2-0.98.1-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/BLAKE2/libb2/archive/${GITHASH}.tar.gz -> ${P}.tar.g
 
 LICENSE="CC0-1.0"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="static-libs native-cflags openmp"
 
 DEPEND="
diff --git a/app-crypt/libb2/libb2-0.98.1-r2.ebuild b/app-crypt/libb2/libb2-0.98.1-r2.ebuild
index 4e56249a80aa..db16f672175a 100644
--- a/app-crypt/libb2/libb2-0.98.1-r2.ebuild
+++ b/app-crypt/libb2/libb2-0.98.1-r2.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/BLAKE2/libb2/archive/${GITHASH}.tar.gz -> ${P}.tar.g
 
 LICENSE="CC0-1.0"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="static-libs native-cflags openmp"
 
 DEPEND="
diff --git a/app-crypt/libsecret/Manifest b/app-crypt/libsecret/Manifest
index 70d05df61bda..340b223a1b6b 100644
--- a/app-crypt/libsecret/Manifest
+++ b/app-crypt/libsecret/Manifest
@@ -3,5 +3,5 @@ DIST libsecret-0.20.1.tar.xz 528416 BLAKE2B f9e1b089c46e066abf06ba11d0cb49762599
 DIST libsecret-0.20.2.tar.xz 526224 BLAKE2B cae93962480f65d2c91b1c26a23321d19c256692754ef37c658e346a6cb6b91cdebe134516c3c8652c5ee502b8f7a070a8d519ed878b2f6dfc124ea7b032613f SHA512 89143c8ccc8f6fa0cda2c98baef92e8cbf9b319a984826a09c527125e14712023ee65cada42a2c9232524528da8c1c3d2235ecbcb93e2f06e94121a601c22857
 EBUILD libsecret-0.18.8.ebuild 2652 BLAKE2B 07cbecd0bbef05c9c5538e5a212b7533ab61a39e563e5a7cec21ff75b98d61802ed66512f282ce368f5aba6093b775c00afcf48d29618074fdfc175d7667c83c SHA512 e42f531f040f7600bcdc4af20f6cc3db23a7e886e683c6202de97484fe52876e763f75b8ecb3b1a67436ca84a04fdc97625bb456b9bc414fa5ab81da54d4d54a
 EBUILD libsecret-0.20.1.ebuild 2663 BLAKE2B d52f33a3a7aaba917f8ac2ca6949beebbf4cf1c9f6ce4493513030a7cdad5cb4448b904cc71a5813c28ccd518ec720d86c92665421bf9b9f3636e7644970afea SHA512 065315ebe759bb893f7adaaee0c13fe44d22d6d0b5f43023e1c9e5772d2c485d8d6ec1e3a36989ec47b0a00bf11bf17cf444a8b86d55f2b198da00367477cfe9
-EBUILD libsecret-0.20.2.ebuild 2663 BLAKE2B d52f33a3a7aaba917f8ac2ca6949beebbf4cf1c9f6ce4493513030a7cdad5cb4448b904cc71a5813c28ccd518ec720d86c92665421bf9b9f3636e7644970afea SHA512 065315ebe759bb893f7adaaee0c13fe44d22d6d0b5f43023e1c9e5772d2c485d8d6ec1e3a36989ec47b0a00bf11bf17cf444a8b86d55f2b198da00367477cfe9
+EBUILD libsecret-0.20.2.ebuild 2658 BLAKE2B 2e186b496513d243af36dcf5df4da4601a2dda8579572f73ca8af7f996fc880844a888385b470f5210514a45eda0b8044616e7857ec356684e6cef34d6b7562f SHA512 f5e847b7a183c6b8dfbcee7ddad0f2b673363d4b82ff821ec64f5422b1bf6d3511f3ebac13a5ca2cd1249093f233e927348aba46d4695f952a55029c1367212c
 MISC metadata.xml 253 BLAKE2B a1efbd3751efaa83ee173f557ec1c8a4497a90b60896cf5a7a07da40b4f94a7a299ca0385477e82b2f5e5dbdf9afa482ccbe21f35ef44214e9c451d764b65529 SHA512 8d59f413993268ca783f7407b676900bb2d964754bf705d4175e2bafbe058a52af74f3928e4bd84d292518f8cf13fab7051486ab7cdc61d02fae6e0188d44442
diff --git a/app-crypt/libsecret/libsecret-0.20.2.ebuild b/app-crypt/libsecret/libsecret-0.20.2.ebuild
index 28696c25eb4b..a7358da205fc 100644
--- a/app-crypt/libsecret/libsecret-0.20.2.ebuild
+++ b/app-crypt/libsecret/libsecret-0.20.2.ebuild
@@ -19,7 +19,7 @@ RESTRICT="!test? ( test )"
 REQUIRED_USE="test? ( introspection )
 	vala? ( introspection )"
 
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm ~arm64 ~ia64 ~mips ppc ppc64 ~sparc x86"
 
 RDEPEND="
 	>=dev-libs/glib-2.44:2[${MULTILIB_USEDEP}]
diff --git a/app-crypt/md6sum/Manifest b/app-crypt/md6sum/Manifest
index 027816b4442a..808d6ae5606d 100644
--- a/app-crypt/md6sum/Manifest
+++ b/app-crypt/md6sum/Manifest
@@ -2,5 +2,5 @@ AUX md6sum-1.0-cflags.patch 791 BLAKE2B 9db97a022d784d0e1dce6090f3d9e9831b57609f
 AUX md6sum-1.0-format-security.patch 620 BLAKE2B 5864e943d0ba267c5e9995d2572d0e8663b94c3d17acfbc6f85cd1cb9474df26091bb2727968cac73a06a558b27b569040cea11fddbc2fb5324a78d0eedfbdf1 SHA512 b1ec3b1479ce58e9e2aa4a43982b61932d7ed099d1246dd00e7d6f183b1087dda7c446a63ceea06006ee905a167bd3cb7485d208d95a7860768b680670f0fd88
 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
+EBUILD md6sum-1.0-r2.ebuild 506 BLAKE2B 84ea96bb816b68a1254d92eb61a781b4b013804419de62a756e8a22db4d015a478392124d1d6ca5880c6320d6a570d0bcb1401cd1d838ebecefb6ae2028aca9e SHA512 82e3db73ab805b7ec2bed703194c9318be11e75d1993ab91555ffc458dd903d6e0a045f9ce8e8e082c942f7c152e4fa0e9f2505ffb38a1e2b50800cfee9120c4
 MISC metadata.xml 243 BLAKE2B fd9cf8a384e75cb82f3f4bd4c4ef9a74bbe96865d8df8ea99a6eeae82a678596cd9c23394dadf0d18a12adf4e85d1d46e24534e7cbd95e7f57303907f332cdd3 SHA512 0e850d698f6655c9674b73ef8aa9f2ad2ce90f6843b9cca4550b7f92b355c4c43984f1fa767f646498ac1c281fceaca4dbeed3c3725797f38351be1dc3459fe0
diff --git a/app-crypt/md6sum/md6sum-1.0-r2.ebuild b/app-crypt/md6sum/md6sum-1.0-r2.ebuild
index 631b65b9a6e8..5859b5ca9af3 100644
--- a/app-crypt/md6sum/md6sum-1.0-r2.ebuild
+++ b/app-crypt/md6sum/md6sum-1.0-r2.ebuild
@@ -1,7 +1,8 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
+inherit flag-o-matic
 
 DESCRIPTION="A C implementation of MD6"
 HOMEPAGE="https://groups.csail.mit.edu/cis/md6"
@@ -16,3 +17,8 @@ PATCHES=(
 	"${FILESDIR}/${P}-cflags.patch"
 	"${FILESDIR}/${P}-format-security.patch"
 )
+
+src_configure() {
+	append-cflags -fcommon # bug #706780
+	default
+}
diff --git a/app-crypt/mhash/Manifest b/app-crypt/mhash/Manifest
index dc8984738e83..3891df131ab4 100644
--- a/app-crypt/mhash/Manifest
+++ b/app-crypt/mhash/Manifest
@@ -7,5 +7,5 @@ AUX mhash-0.9.9.9-alignment.patch 579 BLAKE2B 2865e4d035a145f84de68730fb86929e33
 AUX mhash-0.9.9.9-force64bit-tiger.patch 537 BLAKE2B b37015b12eb213cd91207163b6eb922e3c9956081505066a01ac64a3cceb8d5eaf802a125168f2f6c5d7c3d2a0e18cb6913a33a66d66edfe1e1336edf3bca173 SHA512 7ca2118569ad28107672f081fa4d06758bc78da48612ba31d6655e91ebf4928055b1643a012d60538b915b05d906adf23a8aeb3d7b9f5d8c12eaf1058b9f5454
 AUX mhash-0.9.9.9-remove_premature_free.patch 464 BLAKE2B 89569b1addc287dc6ccce15142ca2d7f228b78ff0fa3412482dbe1aa98e3dd20c1e6e360934018cdf605330b9c0480989bf898ff110d9a9236fbe3ae63e4e226 SHA512 f8f9814c39890f14e760c6600998b628db27ca52efd864be123b646425be1edd106179840d8720c36948cfe509d2b320fd98c2aee0b3fcc7ae1fac8ccdba792e
 DIST mhash-0.9.9.9.tar.gz 931437 BLAKE2B 2daed92b731148c388d4340e67d99959f71783e68617614c9be797dae655ba1aeb087d4f604015edb752dedc2d69add305510996a06633ef26fd997ab7601bed SHA512 82ad8b8e9b0463c5a14f5c0e572badc42c4697bac5505443b144287b3f8510b1410721b4277f092a0d6045c4342e997831011cdfcbfa8f1dae6edd5d9e3cefee
-EBUILD mhash-0.9.9.9-r2.ebuild 1420 BLAKE2B 8eebb23762271c34c72f3eafeb8dc468048e6a3c1fb2cedaae67c2ee50cb36c306c4419da45cf0d09232b990111c738d9e20263f3a667de7d7f14fe3204d3c77 SHA512 b1ae034927e5cf1f939c43479037485925c87a981a8b9023688ae7b572f95b0531cb5628483e429cf7b354dd611f9c6f8113d1dbcff9d74d076d2242f3f2915e
+EBUILD mhash-0.9.9.9-r2.ebuild 1421 BLAKE2B f31786522a2ed7df411312a7beaca704fa0a24f36ca720e6a32c7a9991628bd62aaea4ae500f60040ebf50b34867289cef46dffbd3d61ec3a45dc1040c4bee7c SHA512 91b82ec7b584d7eb440fe024a8b5a73933765aac3fef6ed07166510819434e18369522a8c9e7b4ddd430b81e07b65e006690fbe9ad7f37234db6b89b65f84311
 MISC metadata.xml 240 BLAKE2B 930f7f4d63cd589f337e5fb82f0fd568e7b12917c1fbb663af43acb523311b683b7bd3e144af0673749143a5d7fa86f57e8bed96f87c32e054c28ae6bf8d768f SHA512 46b4040c549d189f732ec0752339b86521d8351f8d5529f272050722cb466e161772e5fd05db097e29a528786150aea5d78d80232d84cbf99521f4ff697d7a4a
diff --git a/app-crypt/mhash/mhash-0.9.9.9-r2.ebuild b/app-crypt/mhash/mhash-0.9.9.9-r2.ebuild
index d76e983833a3..f65cb7282db5 100644
--- a/app-crypt/mhash/mhash-0.9.9.9-r2.ebuild
+++ b/app-crypt/mhash/mhash-0.9.9.9-r2.ebuild
@@ -9,7 +9,7 @@ SRC_URI="mirror://sourceforge/mhash/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="static-libs"
 
 BDEPEND="dev-lang/perl" # pod2html
diff --git a/app-crypt/mit-krb5-appl/Manifest b/app-crypt/mit-krb5-appl/Manifest
index 1f79f764b1ee..ec3375c5f0bb 100644
--- a/app-crypt/mit-krb5-appl/Manifest
+++ b/app-crypt/mit-krb5-appl/Manifest
@@ -1,5 +1,5 @@
 AUX mit-krb5-appl-sig_t.patch 1411 BLAKE2B c2a34ada3f811459d006c1be6e79cb0811b0ab6ef7a1eb2fa6372db5b52b7db06e1cb94d7cbcd9b883fa14d9e0cf704ebfde7a441e7348728be9511ff2b6dae5 SHA512 a25ca113d8cae969ef370aa28b274dc4573964eb78e340a86ff4e3b130c6f7a73c97a41e657a5fabb634604a3bfb8f5a04c8925a248a8f9e45a22979fd8395f3
 AUX mit-krb5-appl-tinfo.patch 575 BLAKE2B e79cbae98ea7848bbe11f0aeda1f192d51bb1b9440952d0b8606d91b0fb8dd6d1057c4eece722112a3a3bcd26596868cf534d49f4bf5dbfeee227b16f8adde19 SHA512 076f34d70f43ae34fa6bc5e23171b2b31f579812527b7f78ba40ac3fca0cd92000b8caa40b8773bd2f9cc3ce0f6bcc6815f83422d5f8d320d34c4feb580231ab
 DIST krb5-appl-1.0.3-signed.tar 634880 BLAKE2B 0341ce0f3845bbf49ac2c43dea95d1bf196a9e6fb07a1bb4e8d1eac9ef74765f4b02b7f6e2794cf55ce6c7a7e2623bd325457dcb60f94b7e30bdc65a370751ad SHA512 1d85be6eb39a01c21308f6b159a375ae4ee331de8052c3990c9252f708d717b8b518f92c424bd6beebe344d940b4813e6ea11dd18df5d7caa4b5effc2513dd23
-EBUILD mit-krb5-appl-1.0.3.ebuild 1638 BLAKE2B c7dc66a58556f92276e547957c3a3a3b947ad6f52d7572e4a31e5043e37ab1a5e98be1f703bf897b85ced69db5ae69fd09346c5e4e409ec81ca6513dcbd00092 SHA512 010f2d2abafabc88462afe1e784abf7da6adc4b39ec1ac54f3256e380c58fcfbb91c585e595e36458feef8fe370360dc33af7b41061bf4a73658d2c48af443ff
+EBUILD mit-krb5-appl-1.0.3.ebuild 1639 BLAKE2B 70ac99cb842b5868542fda3db627bf948d928041c14e3827e7a4f69df5776eb75e3d77c2d3559df3bcfa7d835e9c027dbb8672463fec179aab2ebd54e30e3568 SHA512 3a110a77ca241205da721b47b721d41799296762c958197cfc5226147b45b92f8980cd36631aaea09a55fe00e4e40435b24f0fee8df562a47f2692070a098b50
 MISC metadata.xml 240 BLAKE2B 3a20174df7c37c40098c716b97f64079f86d511e3740e43865ba8e1b1fe52de971091ee51a510543cb2a49373cff87e790f71fe397975f61eee2b308b0729e66 SHA512 57354970f719cd4e3a27f6024addadbb81919a5eaaefef094d3d2b362c44b5ab5cec740090ffce89730cc52f469bc93957c129865a71a4583e0309a93e6f970d
diff --git a/app-crypt/mit-krb5-appl/mit-krb5-appl-1.0.3.ebuild b/app-crypt/mit-krb5-appl/mit-krb5-appl-1.0.3.ebuild
index 0f5de6d76dae..73a6522b4699 100644
--- a/app-crypt/mit-krb5-appl/mit-krb5-appl-1.0.3.ebuild
+++ b/app-crypt/mit-krb5-appl/mit-krb5-appl-1.0.3.ebuild
@@ -13,7 +13,7 @@ SRC_URI="http://web.mit.edu/kerberos/dist/krb5-appl/${MAJOR_MINOR}/${MY_P}-signe
 
 LICENSE="openafs-krb5-a BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ~ia64 m68k ~mips ppc ppc64 s390 sparc x86"
+KEYWORDS="~alpha amd64 arm hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86"
 IUSE=""
 
 RDEPEND=">=app-crypt/mit-krb5-1.8.0
diff --git a/app-crypt/mit-krb5/Manifest b/app-crypt/mit-krb5/Manifest
index 6c4bdba102ce..2ed3535c68b0 100644
--- a/app-crypt/mit-krb5/Manifest
+++ b/app-crypt/mit-krb5/Manifest
@@ -17,8 +17,10 @@ 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
+DIST krb5-1.18.1.tar.gz 8711772 BLAKE2B 98ea02b686760d1e080e1b038601fedcb85ceb4c61dbbba717c300f54a784e8494ff0fc7c0139e95fffd6b1cbe2a65158c9a3af71ea76c1b86905642c29cd93a SHA512 c96c9ed676c8ccb9b65d17bb1d982c266228c75030a2d8fd5d7952ee8cdf362a22d202e93018d1011a5e7bd9a9fabe69aa1578d1d2e4839a78b9916d8b8019ce
 DIST krb5-1.18.tar.gz 8706395 BLAKE2B d2b700c2f869733a7fc9ac735ec27e3973868efcf62c6b130fb5ff33aaaed0571816af519123e9077fc0bc240ee71a6179e87a4f724ae06dba8a70fd1d594b9a SHA512 36a01ea310b4b3d0a3d209b641739575239e1ca5e93b3de99cb1fec83e82f9a70ad0761dd6eb77cda5c18c53044ab80168b00725642a0c2dfde0e492c42af6a9
 EBUILD mit-krb5-1.17-r1.ebuild 4312 BLAKE2B 2ddf3073cc5e7c8f5e811a065a9d1ba7d55defcded9800090b32c31bc591d37d720ee1efbef20fe92605bbda2eb5ee938af6e5277bef1bdc24e498994577c19e SHA512 1818e9165f0d0f3afb60579351ff723aa9e8d6705fae6a52c921c71de3e89922c714b7e15432f98e7ffb789d79c7458599b39bf5b44dd947a813e0b566c23986
 EBUILD mit-krb5-1.17.1.ebuild 4348 BLAKE2B 21649609464816912876ee382b330fe8beb2ff6f63ce77e35bef5c983bc2e5a81eac9db78b2a0915487a735252f8a7bb98150cdd91655cfd21988b7f94836c53 SHA512 b4341d509c5b0ae46dfdc751f6494aa4ae9288bcb5fb5cb604cf16bd8940f2a1eaf831a50553d084ab7a68bc34493258c8ecde4d904555f1bcaf8b0ecc87d644
+EBUILD mit-krb5-1.18.1.ebuild 4338 BLAKE2B 22ec1538e980d8e590cfe65ec64e5350eca7c883c2e278c238e535080ae01a8246c343f899528111a92eb7733ab5d61807944ab127e62fd3b4659071e6c29fe0 SHA512 a9317837e3f5f80b3a602f6483632055b2337d6742be8fca209ea138ad9f8836168da11b2cc7de505721892c6db641067c88fc49eb4d1bd3940e474084ba1042
 EBUILD mit-krb5-1.18.ebuild 4359 BLAKE2B cca19a22d28b67765aa56c3c63e858312892d12053f114b34583b9330125f841bdccc2529276a8f45fb92bf0cf57c877a98c3bd4fa3e14b5c015f190172482d5 SHA512 7da11ab4c00e5551c17a1a442829a71a7e0ac01175255c22bcccb658564dad312a8f55dfb4900ab5c69e26bf549d4f3a7fc88ae364a1895fde5a43a8c290075c
 MISC metadata.xml 903 BLAKE2B 57a48ed1fb3f046b8a4a6a80ae6223bc923f30ddf350b8ee0f5769c78b28c0bd14c35539d9552bfca02901e054332a4dc22f88c48d4eb4db4d143a7f0b938d74 SHA512 44909c99698b78ad01f72cd1d74ad6807f12154c8675b7fe31f4bd95744d8e7dca53446875c57408a294e5f87fc5aa038e6f869d3ff957cab870cd75f8e45464
diff --git a/app-crypt/mit-krb5/mit-krb5-1.18.1.ebuild b/app-crypt/mit-krb5/mit-krb5-1.18.1.ebuild
new file mode 100644
index 000000000000..e830a8bea5d0
--- /dev/null
+++ b/app-crypt/mit-krb5/mit-krb5-1.18.1.ebuild
@@ -0,0 +1,165 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8} )
+inherit autotools flag-o-matic multilib-minimal python-any-r1 systemd
+
+MY_P="${P/mit-}"
+P_DIR=$(ver_cut 1-2)
+DESCRIPTION="MIT Kerberos V"
+HOMEPAGE="https://web.mit.edu/kerberos/www/"
+SRC_URI="https://web.mit.edu/kerberos/dist/krb5/${P_DIR}/${MY_P}.tar.gz"
+
+LICENSE="openafs-krb5-a BSD MIT OPENLDAP BSD-2 HPND BSD-4 ISC RSA CC-BY-SA-3.0 || ( BSD-2 GPL-2+ )"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+IUSE="cpu_flags_x86_aes doc +keyutils libressl lmdb nls openldap +pkinit selinux +threads test xinetd"
+
+# Test suite requires network access
+RESTRICT="test"
+
+DEPEND="
+	!!app-crypt/heimdal
+	>=sys-libs/e2fsprogs-libs-1.42.9[${MULTILIB_USEDEP}]
+	|| (
+		>=dev-libs/libverto-0.2.5[libev,${MULTILIB_USEDEP}]
+		>=dev-libs/libverto-0.2.5[libevent,${MULTILIB_USEDEP}]
+		>=dev-libs/libverto-0.2.5[tevent,${MULTILIB_USEDEP}]
+	)
+	keyutils? ( >=sys-apps/keyutils-1.5.8:=[${MULTILIB_USEDEP}] )
+	lmdb? ( dev-db/lmdb )
+	nls? ( sys-devel/gettext[${MULTILIB_USEDEP}] )
+	openldap? ( >=net-nds/openldap-2.4.38-r1[${MULTILIB_USEDEP}] )
+	pkinit? (
+		!libressl? ( >=dev-libs/openssl-1.0.1h-r2:0=[${MULTILIB_USEDEP}] )
+		libressl? ( dev-libs/libressl:0=[${MULTILIB_USEDEP}] )
+	)
+	xinetd? ( sys-apps/xinetd )
+	"
+BDEPEND="
+	${PYTHON_DEPS}
+	virtual/yacc
+	cpu_flags_x86_aes? (
+		amd64? ( dev-lang/yasm )
+		x86? ( dev-lang/yasm )
+	)
+	doc? ( virtual/latex-base )
+	test? (
+		${PYTHON_DEPS}
+		dev-lang/tcl:0
+		dev-util/dejagnu
+		dev-util/cmocka
+	)"
+RDEPEND="${DEPEND}
+	selinux? ( sec-policy/selinux-kerberos )"
+
+S=${WORKDIR}/${MY_P}/src
+
+PATCHES=(
+	"${FILESDIR}/${PN}-1.12_warn_cflags.patch"
+	"${FILESDIR}/${PN}-config_LDFLAGS-r1.patch"
+	"${FILESDIR}/${PN}-1.16.3-libressl-r1.patch"
+	"${FILESDIR}/${PN}_dont_create_run.patch"
+	"${FILESDIR}/${PN}-1.18-libressl.patch"
+)
+
+MULTILIB_CHOST_TOOLS=(
+	/usr/bin/krb5-config
+)
+
+src_prepare() {
+	default
+	# Make sure we always use the system copies.
+	rm -rf util/{et,ss,verto}
+	sed -i 's:^[[:space:]]*util/verto$::' configure.ac || die
+
+	eautoreconf
+}
+
+src_configure() {
+	# QA
+	append-flags -fno-strict-aliasing
+	append-flags -fno-strict-overflow
+
+	multilib-minimal_src_configure
+}
+
+multilib_src_configure() {
+	ECONF_SOURCE=${S} \
+	WARN_CFLAGS="set" \
+	econf \
+		$(use_with openldap ldap) \
+		"$(multilib_native_use_with test tcl "${EPREFIX}/usr")" \
+		$(use_enable nls) \
+		$(use_enable pkinit) \
+		$(use_enable threads thread-support) \
+		$(use_with lmdb) \
+		$(use_with keyutils) \
+		--without-hesiod \
+		--enable-shared \
+		--with-system-et \
+		--with-system-ss \
+		--enable-dns-for-realm \
+		--enable-kdc-lookaside-cache \
+		--with-system-verto \
+		--disable-rpath
+}
+
+multilib_src_compile() {
+	emake -j1
+}
+
+multilib_src_test() {
+	multilib_is_native_abi && emake -j1 check
+}
+
+multilib_src_install() {
+	emake \
+		DESTDIR="${D}" \
+		EXAMPLEDIR="${EPREFIX}/usr/share/doc/${PF}/examples" \
+		install
+}
+
+multilib_src_install_all() {
+	# default database dir
+	keepdir /var/lib/krb5kdc
+
+	cd ..
+	dodoc README
+
+	if use doc; then
+		dodoc -r doc/html
+		docinto pdf
+		dodoc doc/pdf/*.pdf
+	fi
+
+	newinitd "${FILESDIR}"/mit-krb5kadmind.initd-r2 mit-krb5kadmind
+	newinitd "${FILESDIR}"/mit-krb5kdc.initd-r2 mit-krb5kdc
+	newinitd "${FILESDIR}"/mit-krb5kpropd.initd-r2 mit-krb5kpropd
+	newconfd "${FILESDIR}"/mit-krb5kadmind.confd mit-krb5kadmind
+	newconfd "${FILESDIR}"/mit-krb5kdc.confd mit-krb5kdc
+	newconfd "${FILESDIR}"/mit-krb5kpropd.confd mit-krb5kpropd
+
+	systemd_newunit "${FILESDIR}"/mit-krb5kadmind.service mit-krb5kadmind.service
+	systemd_newunit "${FILESDIR}"/mit-krb5kdc.service mit-krb5kdc.service
+	systemd_newunit "${FILESDIR}"/mit-krb5kpropd.service mit-krb5kpropd.service
+	systemd_newunit "${FILESDIR}"/mit-krb5kpropd_at.service "mit-krb5kpropd@.service"
+	systemd_newunit "${FILESDIR}"/mit-krb5kpropd.socket mit-krb5kpropd.socket
+
+	insinto /etc
+	newins "${ED}/usr/share/doc/${PF}/examples/krb5.conf" krb5.conf.example
+	insinto /var/lib/krb5kdc
+	newins "${ED}/usr/share/doc/${PF}/examples/kdc.conf" kdc.conf.example
+
+	if use openldap ; then
+		insinto /etc/openldap/schema
+		doins "${S}/plugins/kdb/ldap/libkdb_ldap/kerberos.schema"
+	fi
+
+	if use xinetd ; then
+		insinto /etc/xinetd.d
+		newins "${FILESDIR}/kpropd.xinetd" kpropd
+	fi
+}
diff --git a/app-crypt/moolticute/Manifest b/app-crypt/moolticute/Manifest
index d743fc3ec6f2..3756d197201b 100644
--- a/app-crypt/moolticute/Manifest
+++ b/app-crypt/moolticute/Manifest
@@ -1,6 +1,6 @@
 AUX 50-mooltipass.rule 84 BLAKE2B 574568b60d33216a8de4a90866f2dd4a53d5369fb7e112c6125b8492e8cdaff51067dffe4e36e07fa24cf8a9aaaa77a388f3217ad039a51d7ba0781239020a43 SHA512 26f8a9f2c5fb2f3a87a486f91d5fae7069955dc528eacb8a37a833d393be38b70e3a9784024287cdfeb93a90abad83400395bb803e82a091100bd44cb7b2c28d
 AUX moolticuted.init 309 BLAKE2B 1f967b7e497e7e2d5547baf3e1b18127590997d8221ed34da1b4b4b2843bb1590fbb0c4153cb89d7f68b4fc0852e66f38879362fdd482414e4b6ba6862f06e30 SHA512 bbb80cf14d3adf744538f03513b461eb8bd2b633ef314f9e935e919f288f629aa8d84ff856e3aa104a2933e16143fbdbff90d9df8651473c39907f5aff580ed0
-DIST moolticute-0.42.1.tar.gz 5647992 BLAKE2B 0e99e16d7c09320ca5a97cc7ed16f348245efccf9c1e4755f7e6ccfb66c293b878e200ffe5148c203fae300d41e9b44d9489d8e067cd39b475215393a991d6d5 SHA512 a5a9ade4d09711030c299fcb7ba42eb351d711a351caeb663d765e394860a45179a3f3852db4f2315082e759762f7bf66c888cba90cb520169dc869ce60b8a68
-EBUILD moolticute-0.42.1.ebuild 1234 BLAKE2B 1eb30c66363b678fe65906aeb0818dbd9a7dffe2e851d13ce62b71da58185e06be623db0ab0cc1368eea4d90ae117771b16d62f3d5f1d5edd6f183b8c7d10902 SHA512 75b781007c139ab687ee02af561afdcf890c0e6888949235d371bbc5e2017b65df275ef4f68a2bdd53a5c9baa5c79635585ad6b1bed08918f31daf8b8f342ebb
+DIST moolticute-0.43.3.tar.gz 5667511 BLAKE2B 7509a7e84979a4bd4d36728f67b9d4cdf5df74255f4f8091a647d2d7c9a3e6dc2ef1c72fe1cadcdab47ac99a7a682287c629e0e077c031ad27acde66c53ceb6d SHA512 4ea61da5068079e01ba6e6adacc87714f3fb28a2f231fad3359d88c8697b0a804005bf73b5ca9c3e48acb9cf72b21a3791752c8d747869b48b02c1b651a92f19
+EBUILD moolticute-0.43.3.ebuild 1234 BLAKE2B b084b0e2a94b272d775823e64336de19f8aa377c44aabe733866fa9eb80bccf8ab366a29b0c2d9bfb094ac28d3ce2fb0d0b47138eec8d2c20667ff9183a4a511 SHA512 67b55d0e56e7c96f45af9cf41487fc4aa40cdbc700e03d10a4441cee5b376df51986ecb8f6433e5c905f99eb93986692d582dab9477ff396dcacf04d50a4f30a
 EBUILD moolticute-9999.ebuild 1234 BLAKE2B 1eb30c66363b678fe65906aeb0818dbd9a7dffe2e851d13ce62b71da58185e06be623db0ab0cc1368eea4d90ae117771b16d62f3d5f1d5edd6f183b8c7d10902 SHA512 75b781007c139ab687ee02af561afdcf890c0e6888949235d371bbc5e2017b65df275ef4f68a2bdd53a5c9baa5c79635585ad6b1bed08918f31daf8b8f342ebb
 MISC metadata.xml 530 BLAKE2B ab8901536d9ea0b2841cc0cb604cb7e0eab2765079d1964e561bcc61d10ba780cbce831eec8532cc5ed6866df98d0580ff9294ff10d571910bb67d10f065947c SHA512 8551a8d709f3a2fd054a948839518383d3d8f7187b507bcc275d5daa601e53fe1cc1cf3eb7c13c61f6318055964a0a1afba525726e65cd1e3f025b0266997d0e
diff --git a/app-crypt/moolticute/moolticute-0.42.1.ebuild b/app-crypt/moolticute/moolticute-0.43.3.ebuild
index 08512b4847b9..b4fd0cdb9d53 100644
--- a/app-crypt/moolticute/moolticute-0.42.1.ebuild
+++ b/app-crypt/moolticute/moolticute-0.43.3.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
diff --git a/app-crypt/nitrocli/Manifest b/app-crypt/nitrocli/Manifest
index 5d0800e3bcda..a0aa70aa45a6 100644
--- a/app-crypt/nitrocli/Manifest
+++ b/app-crypt/nitrocli/Manifest
@@ -1,58 +1,59 @@
-DIST aho-corasick-0.6.9.crate 25979 BLAKE2B a1bbec11c322d20d435d8683151b144e31f04b07ca47fc1c8128464533256f4004c8d346fe59a1e1c41be5609fdf768fad5f1afa5df94d1a02ced5c4f02c4bac SHA512 8dfc817b435d8a44fb4ca79bb20e283659c2fe9a75a4892389958f5880acc436bbe32552098429f15585ee025d064fdb5806b814f0e9d67a4261ffd23852172b
+DIST aho-corasick-0.7.10.crate 111039 BLAKE2B 69f984dbe528ece5ce4345bc0f39c122507a88e781d7c2d5c9175d1788aeef8d21e0487c7c449e28fbbdaae8203fe68627d23ac0a58d30dc70befd26ac9af32f SHA512 e8a1cb252015435009883662ca23408f1491d8f01461f3a81082feabeeff72ec61beb4f1f3271fc8a87f1379899ecfc38036ac208dca17889f70ddaca2406a9b
 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 bitflags-1.2.1.crate 16745 BLAKE2B 0fa6d3ce44aad7616d5cd02aad8c1d0b0fed4022650eb43067c4a72e6fc88da05442674fa51826e4858a47c9de233e1ba2229820af094197cd11bb416ceffb2b SHA512 ad89b3798845e23737a620bba581c2ff1ff3e15bac12555c765e201d2c0b90ecea0cdbc5b5b1a3fa9858c385e8e041f8226f5acfae5bbbe9925643fff2bf3f0b
 DIST cc-1.0.48.crate 49885 BLAKE2B 98bc13fca4b9b39f61916c4cc6a0e4123f5805263a633dd329e0c943d6a3dc8e0572d5b382d61e207ef0e7ca96a66e4720fb7f1a817fd61b1ed842ecf09f5f08 SHA512 4392c4455195dabfefc920e3692dc41fc763f7ca9e7163be395d7acefdcd1cf4f5e7a2356a9d8be367d43cb3e4320ad8e7513e5532118a418cd38e98748fe165
+DIST cc-1.0.50.crate 49792 BLAKE2B 25ec14fd42536c381babcf697cf96fe8be61417a61ba5875a2461bb40bf3ffd9c9d03e1d9df83e2dabfc9472de3db97b08fdffb710e89b868a5e115d0463a9cd SHA512 34a721d9352f8b59cffb8cc0b9c520b972b65d6c23e83d9c6f6e88d6a6845c53ec89350a4aacd0444a5d6b03b867b97aedaf418b483afead209a7ae6d3885f5d
 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 clap-2.33.0.crate 196458 BLAKE2B 3bb62d817afc77b421a6282746b9b61367d224de6b614c7ed66bde452ce1046728077dab3368a46635b5c74d82ba3196586d87c0201478ce5b89638910dadb1a SHA512 f1075031414d48e4340bfe308904a95a31b72460724773c52a0bc8c004e625a04c904a39fc5420cb8c26a633321f9b5f4f69019c7aae5ed89900b63ed8c21a91
 DIST getrandom-0.1.13.crate 24581 BLAKE2B a61df4369526f860eef6952a021c3f473562cc4171c373c105d8944c305370592cd98a6c28cc0f8d00496f6b47cb900a4498dad942d0b6f60b4d8163d8904f14 SHA512 534b01d28bc9e69a5ad1e84f34aa4154939c27d70c5f557f15e669fa8894c375486ee945a6a6d8adaf1b6b7accda0e24963f70e77dd51ee0638a6ae6daa38925
-DIST lazy_static-1.2.0.crate 10840 BLAKE2B ab0adcf0421131ddd35e95a31a0053e2ffccb03dfc0f46ca4bbb6341f40bdd56d01aed0987489e5e73aa5f7289f3c323d1de0db353a30bb0a75acf53ce8436f8 SHA512 0d80334da99292d68fb2ea9879540676fd45788547b7170b6df1b0a606c1645a07188837f9414196eb44ac63010a3c84fe5c4319478f6fc2cef837295a255edc
+DIST getrandom-0.1.14.crate 24698 BLAKE2B 8139227951eb65cc2bb7bba29291c0e8ff0b8d9a8e2d7eabb01682d1683c989c44b6195952ec7d087c338538c1d6858c45514822625266e0996829e8c50f3d17 SHA512 b5cb78ae81f31fffd7d720f9ea2b5917b4eac103711faf656a3a3fdd24ae5a2e671016d39309cdd11f902de919187311401dd8fe9e6ed68c29b83987de77c957
+DIST heck-0.3.1.crate 54666 BLAKE2B 99f7ceb44ea6af445749989730ce1e14156018ff046a136be2e6474b285088e1d90d6f8af9352affbbde5bac7e5a32971dd99f249f968105e9793b7de76def07 SHA512 134722192c46fd64b38d2fbec3a2511c560916e906491a72c4ec9d99b9f716dc58942fb99cac99b9a6ef2de5b5ad1d1c1155f292d091401b6873347d80c086d6
 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 libc-0.2.69.crate 472393 BLAKE2B 41a9cd242ccc994c69da10f091061b2c31ed6a9c52cadb8e82fc7c5b7b5dd61c81ded5cfded098721500c87b021d5d79766571a7dd6fcde319c826e2e4244d38 SHA512 2addfd505e0904e18a600caa4e695536d2f95292af25906925066616bd588de9ea9abaae45bc8427bc6857c3b9fb6c4288e4cb48e3f1ba69ee1d7be8f3b3bcb6
 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 memchr-2.3.3.crate 22566 BLAKE2B f952070b98ef30f0d2780a6efbeb36d295710734f678517d913a8002cafebbd3cfc38975fc4546d306efc11bc815764d14320af3b7a2360bd46fc2ab3db9efa5 SHA512 922e05da920d0d94226857788878ee5e31518cd80d95ae57e1d7ecd233942c37d01565525db2f1dfdfd5b3b1f81b2c73eee058cbfd745cb4e1519518318df248
 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 nitrocli-0.3.2.crate 88594 BLAKE2B 8bbc50222724b674e2f76b6b945bf82fc86e4c7bfaa78eaa5806db69db3c324c9ab432f83425caa67a4e7ee275cf6404e9ed2d9ca9243ac05de53612333b5098 SHA512 48ee29dcadab938546bdb9c5d5a053e88d0860d6be6f27292db53fe304d32597a6c415fd61a1c69755e4f60b192a527de99fb603afb27b762a377e2a01bc0d9b
+DIST nitrocli-0.3.3.crate 89987 BLAKE2B bafa15d8d696d5899ac7d1a9af907d77e6ecf62cf09f7a9af5b01a9947926eb1544f2862322d912e283869067bea722e99693513d30ee367809de69ea54c32e2 SHA512 9bc58ea6d1d60985a0f7a8e07eef6a620805be6fc0284c8a43ecfede69e0421c40716812896609cb8516855900f8ed6017c4e693b5be422b00701b0c2437779a
 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-0.6.0.crate 42218 BLAKE2B 09410ae8c5bbfd76b216e4ab6c1156dbc3840e9d0f09ab5727ef91bc54b58aab22bb3b54c42f5bc6a9e95936de8c2424449ed61d7cfd4a52ceb749eb6fa4306b SHA512 924c40ad43296538a49f58051d7fa72f6df2ebbeac4b91e416a9e2b017e60b867827352bab0975d1ed5828052572b719b7caf419ec611323b0b5fb8319d0d9e3
 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-macro-error-0.4.12.crate 21979 BLAKE2B ccd12d75d8381dfaa15ae1a8f3c820a46e47ef34c49b6f21ca0df77a1e3e5d83b93b0c9d9c99485df6fd35d362b4df76dda222bf80f05ec42593161491b196b3 SHA512 3ba24e96100f859adfc67c25e98c0ded94c5e08e313fbaa0222e9ecc7860219c61dcfc4e0671ace0e684319a43b8b3a92918353fb7d1ade2ced5b01fc45552f7
+DIST proc-macro-error-1.0.2.crate 23699 BLAKE2B 2d8310300002d1dc3fa68391190c5536e1faf6be05f1dd2ed1429d530dc527f431bdb93a994f2e68ff6120523b0d10a4a2ab35a0703f3013b404d0b82ab68372 SHA512 a9ec65c02f853f05f6adbfd398a82e84dac5bc376f041ede65a47b510914f5def1ae480c1a7e68aa6fab836efb6bda0d712d45243472b73c12d1ce7cdf8c3583
+DIST proc-macro-error-attr-0.4.12.crate 6934 BLAKE2B ff7431bfe63ac865ed4facc2b86764179630a98b1949e8c45d4a739d7e7fef2a16919afed749bc3dfce8de4ee0b365ea5fa548d64fceefe0f2b418d4c5135854 SHA512 5927a8ec73e062e836403d9beb98de443a813615538855e40f574e7a82977d55466db191660f97d863efa7a3643ad6e2724759221ee30553b805c9cb7f5849fa
+DIST proc-macro-error-attr-1.0.2.crate 6974 BLAKE2B 4b8fb0c70873eb487dbfbcd37d5a5dae6d877a910f3523d9985a511ea97795082548f03bef926ca91028340dada954217926e7b9d8cc70765343f6d86c1e7c01 SHA512 1fe7ea1e005ab4d6b777b2caa4a5c2ad7655b5375fa987b0b2cfbec6a0673d844aee2dc273dd327687dcdf21a165261e78175eed69e881dfbe1f2992eb505c78
+DIST proc-macro2-1.0.10.crate 35622 BLAKE2B ebd141862796e8f0660608ef884ace446fa5158ed1a3f3491f5e5d4ab6b866f19652fe6ccce4432b3bcdbe5467d0a59af688c00fb97249045bf5a2bb5511f2f6 SHA512 a40e6422c26cb8171e5f2d9d7d3b4b2d99a444ff650a8dd8e22bbc7103bf3f9247fc2b2b57ff7da4ce65fb1d293f55c5ef56a5f60ecb5122991d9d2002395eef
 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 quote-1.0.3.crate 22939 BLAKE2B c50e47b647fe1ac1930544d20b2b78ad98e6398a32c98460701d93f93fa1437c6d12c632386ab9eb733cbe64cad57e02dd201686885d0a951cb013fc10a95a9c SHA512 b4867554b86d119251db67f9d0949bf8c3cd7c64f006c76531398ebb7478cb93805b9bcafe159d921ba1a32e92773853b56685cff0e1ebdc6aadaefd3b932ef3
 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-1.3.7.crate 235600 BLAKE2B 15370ec0cc9f37c6a7092eaf78a731740aae3d79ec6d385244f4568395cac8947860828ff585aba9f35ccae684bb19e214120f39e7f4998350ff2890a43f2466 SHA512 59090515860c26551ce08e8b37cf1227712944844148b79dcc7348f430e5c3c70767c20807cb1affb242686e7e8f885224c4c9fb9ae890b57f766fec96e2aa69
 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 regex-syntax-0.6.17.crate 294004 BLAKE2B 3d203b06b8b1a5bdb42d50d395ce117ad92e41a7d36e5cb5194014eb7af1b17f944ae493041b7e9a2a9ea929381b4c1cb513c895747beff97aafef524ea2ced5 SHA512 bd9a165bcac207ec3bb87a81ae644be98d9b5ea0053b3bcc69efb334e3ebfeb85021aa372bafc3575758200640cbaaa67d372950fbb3ab210d8ec62b336d147f
+DIST structopt-0.3.12.crate 50273 BLAKE2B 9d7493700cfed14a8f20cae73c807fd103623ec6502a76ec677ff6bdd5385a88d5d20a395394fa28be580ac2fac34aeb19a8fb0ffb8dd23a50e9551ce973e7a5 SHA512 a71f4cb68ff3cfdacc4600350e35ab040e7fb5c929f3e9649fc0d93f9ca74c6a6efc46e1aecaadf3690106cd281118a1c7c03dd7b265d532e033d437f5ec2e7d
+DIST structopt-0.3.13.crate 50324 BLAKE2B 0c2060e87219437f036772e7457b6273c756c8ecf686bfd24273b713cbcb8410bff5d394e5c6effd12fa222fd0e7510cf16966ad6aafc9196d9d0c646e3a2445 SHA512 b22cf51caaa46c0ad07ad58709e024d615f2f8688db2414acce4f1abd677adb61f1dbdbf3318e194172c475781150da6bcf3c149f6acc60cc195ec598874db5e
+DIST structopt-derive-0.4.5.crate 19402 BLAKE2B 921dd4dcd8d19556351afa37d6ed4b1f6f3d1e847a6a33d80ff32e8fb0674d595f467cdb0d2949ffdcb95d36d6ac12db7fa37ff6a4088b9622519619ee75af1d SHA512 34205ba32a30bda80a06ca8c0cad3b17dcfdccfefec027b95769c08682736fb1462c161bbecf047ccb5f8d1ec02dcee6313dfad4fb61ef910deb1b65665b419a
+DIST structopt-derive-0.4.6.crate 19398 BLAKE2B b8bc319693dd46e77a3229ecee3a6b41e2e479cd6b86d76ad1e0fa33895ef79a21640c09d3fda5bfc6d2e181f37f66d8ada3eedae49f7be3e2774d4a2680313e SHA512 842507f9ac3172c48700d1ba350d93fe087eef37903fe71b15b39f21ada56dded638077dadbaa109869f9a0e65ab7e4a049504505e1d3e2736f779846ba6330c
 DIST syn-1.0.13.crate 195242 BLAKE2B c6889e24927ac5ebc1248be2d1dd1512b888e67ecad686dc67d29ff517aac2035cd4a8bf6dc87db54532eed72608f3a06ace41989bc7f47789c20041841a99e8 SHA512 234b470f432c1981f13e63e37334e200cd872d288f0ca10fb849281a5fe13c077eb9d41e75933a296f8c3d4e71ca8cce8724ef8c3d98bd9972146fab3d010663
+DIST syn-1.0.14.crate 195286 BLAKE2B 8311cdc0eb8ff69d65c250eb95706cd1e74a6ba899fac02ffc0a288e978c40a03fe5a7c18e3116a767eb6e5e08299d27f5ae04021b224d71d7b492a6b87d67a8 SHA512 7b2b7562ac89d719060b35bf89f21330c02a3c1f34270e864053feba9b0f7a16b5cfd11c57d57eab7c60df8663d8ae76709ca1c48ebab960db168d2836f57340
+DIST syn-1.0.17.crate 198158 BLAKE2B 7093cc8aab4ae2f435aa70a54c8c2b8e4f6928ea76186059942bf5c74e2ad25d73608f469cb0f1d97071a5dc2e3d048a155084bbc28647ca39032f06bcd5a3a3 SHA512 5acf5bafb32f780e08495e1e0782c170eae54baabd72c45a1d350aa41aa4ff2e5fa84b23d088fbb8522f430526e938c459087f89e3372690bde7bd0cb8c4750f
+DIST syn-mid-0.5.0.crate 14149 BLAKE2B 87170d072ab6f5ffc6d7f4dc1a08869d4e5c0f505b9130d9b5778a55e206a488b048e47895a524e117ed58b3d45907c8877c897d1d88536a06c9319826b596e7 SHA512 759e29a2ca984eddae3c091be036ad630fb985408be31d838af3bb04fe1f26a3d2b7ef597c1ffb61a72c96383cbf39d8fe83cfe0d79ed4bc3250a585156e637b
+DIST textwrap-0.11.0.crate 17322 BLAKE2B 257428908342774593bbd3528fcdae710712ff54e8a711393a24356d8ba0e16e466a4b20c05f942c48ca76b3b5b5aaa90ec202f782cad892caa8b71ccf124da6 SHA512 f5c0fe4f28ff1a3a0931e8e235b5157a45f67967985bcc752418c5ec3481fca44a8ae4800088889b37e8cd0533f53d3c456d5ffd19b767b3f83a87b49a2e209a
 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 thread_local-1.0.1.crate 12609 BLAKE2B 34206b5232262cda9cc0fb970e20f154d43ff1c4477a5ad5ff9200e6d874a6c7b2bcd99a2dae75a984b54574281e049ad35307ace0dd188f44c9a95fa93139cf SHA512 f2bfca4eee32a8fc88a01ff5bf24518c12142228d95916d13aae35ed6addd0b7da2235359f15220049ef197555344ac31a8833775e7a5bd49144db9c54b3165b
+DIST unicode-segmentation-1.6.0.crate 90703 BLAKE2B b7d63bb8b62cabc604084957aaff021df24a1291f0ebdcddc424cceefe10ad399ed53152211c3e7557e39e21255166f922256f9f8e1fb488d3bae368b49a378e SHA512 80c6f92d9b39602a05809dc63a7cb05a305441689b6056801097a882a36c9795aabd660f884f707daa7e7fe6ad4983f6e245c226962cc982dbfeea2ddfddf41e
+DIST unicode-width-0.1.7.crate 16644 BLAKE2B 8cc5ee2dfeeda8ffe3405a0d4f1576d2b3b8ede1a42cbefb0ba3bd0d71b53a92ceade86c4a06e9d5b31382955dc6e1152ae5cd279dc26dbc51f478dad1d0f64d SHA512 39b8a539c9009d0421f54ae68b139f21456c9cb03d743b58535a977f98bc9655cf42eaacfadbcff796c187a6f315ae16259ee22be9c2da5aa042172c6b464d84
 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 version_check-0.9.1.crate 11459 BLAKE2B 72f002c00504f635b7d2d7ee7137e07ba9c182d2e41d32a51851896f6bf6742c5524b7f66946437ba581ccf80b9c9a57280dd4b02df0918569ac710511940fc1 SHA512 b9cf363169df2022a961f5bed4fb7da07513e0283a85aa69752f6ac567e942611ed2216ac61799db1a199e2bdf0fd9b994e35d4a40c6cd80cd26b97cbfe977cf
 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 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
+DIST wasi-0.9.0+wasi-snapshot-preview1.crate 31521 BLAKE2B 716bdd2ec46d0bc9911c5e5e29fc783840559931b2563d8619675fc11da9527ddbe653a0f1ce0b782ee0c5f7a3131aba2b0867d415f003aa9c2389357569e7dc SHA512 dbe641f796ee3a5daafcaafc911ecc6dff170340f477c2df7a61fb4858a85aefc2637c9e61973ecce66a987aa8e08a736273a4aad3ef47eaf61ed4268dbf9c47
+EBUILD nitrocli-0.3.1.ebuild 1196 BLAKE2B ab663b4fcba810d44b70f78f3b6eb9fc31287993a1c4fc78be8a0ce5c074078bdd4a2d472429cc6f748617536d514eddcdecd5e12e417c4a69de70f8a54114f1 SHA512 e955f82e18565d4373bccfe4439e4770e16e5c87cd3ea06221f130e4da7a97a81e2096be96608295b8e329ab3a3f5c43035be5e8dca557ab67b6ae239b204f85
+EBUILD nitrocli-0.3.2.ebuild 1402 BLAKE2B d98f0e19b8bf677f299131b7419401425bf5715a6deff8e01e2c340fcb3e2e4fd23c21d0a25411bc357c89c2b5807a48f0f10790341759e2147706691df67af1 SHA512 f873c00e2e2e0da275ab94ab05dcd62acb8ab652a968f722ab05baca8c596862dfa9327d7d635a575ad91b43ef038f7466d1d7c8ee2b187a8404c6b0cdd92223
+EBUILD nitrocli-0.3.3.ebuild 1548 BLAKE2B dc3ae38f16614a564f4d6c3893e7bac3c6469ba61d64e93468b9a5adf105fac05ad0db0d88a4841f87911c9acfec14c4cf7e984a7171a6a1c3ebe831cf75a838 SHA512 8e2255e1849411617ef7e22b187c368336394f52f3e91f9da6c194c556f82200a248859f123c55bbc5dabfc19ccdb26ecd1132a5014c0f58f41fa06cb31ce643
 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
deleted file mode 100644
index 8003f3ae49a4..000000000000
--- a/app-crypt/nitrocli/nitrocli-0.2.4.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# 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.37
-cfg-if-0.1.6
-cloudabi-0.0.3
-fuchsia-cprng-0.1.1
-lazy_static-1.2.0
-libc-0.2.57
-memchr-2.1.3
-nitrocli-0.2.4
-nitrokey-0.3.4
-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.0
-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 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
index c12f84a33627..9d51dc07dddc 100644
--- a/app-crypt/nitrocli/nitrocli-0.3.1.ebuild
+++ b/app-crypt/nitrocli/nitrocli-0.3.1.ebuild
@@ -32,12 +32,12 @@ 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"
+HOMEPAGE="https://github.com/d-e-s-o/nitrocli/tree/master"
 SRC_URI="$(cargo_crate_uris ${CRATES})"
 
 LICENSE="Apache-2.0 GPL-3+ LGPL-3 MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~ppc64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/app-crypt/nitrocli/nitrocli-0.3.0.ebuild b/app-crypt/nitrocli/nitrocli-0.3.2.ebuild
index c8cb63260fed..443257457f3c 100644
--- a/app-crypt/nitrocli/nitrocli-0.3.0.ebuild
+++ b/app-crypt/nitrocli/nitrocli-0.3.2.ebuild
@@ -1,56 +1,55 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 2017-2020 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
+aho-corasick-0.7.6
 base32-0.4.0
-bitflags-1.0.4
+bitflags-1.2.1
 cc-1.0.48
-cfg-if-0.1.6
-cloudabi-0.0.3
-fuchsia-cprng-0.1.1
-lazy_static-1.2.0
+cfg-if-0.1.10
+clap-2.33.0
+getrandom-0.1.13
+heck-0.3.1
+lazy_static-1.4.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
+memchr-2.2.1
+nitrocli-0.3.2
+nitrokey-0.6.0
+nitrokey-sys-3.5.0
+nitrokey-test-0.3.2
+nitrokey-test-state-0.1.0
+proc-macro-error-0.4.12
+proc-macro-error-attr-0.4.12
+proc-macro2-1.0.7
+quote-1.0.3
+rand_core-0.5.1
+regex-1.3.1
+regex-syntax-0.6.12
+structopt-0.3.12
+structopt-derive-0.4.5
+syn-1.0.14
+syn-mid-0.5.0
+textwrap-0.11.0
 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
+unicode-segmentation-1.6.0
+unicode-width-0.1.7
+unicode-xid-0.2.0
+version_check-0.9.1
+wasi-0.7.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"
+DESCRIPTION="A command line tool for interacting with Nitrokey devices"
+HOMEPAGE="https://github.com/d-e-s-o/nitrocli/tree/master"
 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
 "
diff --git a/app-crypt/nitrocli/nitrocli-0.3.3.ebuild b/app-crypt/nitrocli/nitrocli-0.3.3.ebuild
new file mode 100644
index 000000000000..132dfa4a321b
--- /dev/null
+++ b/app-crypt/nitrocli/nitrocli-0.3.3.ebuild
@@ -0,0 +1,77 @@
+# Copyright 2017-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+CRATES="
+aho-corasick-0.7.10
+base32-0.4.0
+bitflags-1.2.1
+cc-1.0.50
+cfg-if-0.1.10
+clap-2.33.0
+getrandom-0.1.14
+heck-0.3.1
+lazy_static-1.4.0
+libc-0.2.69
+memchr-2.3.3
+nitrocli-0.3.3
+nitrokey-0.6.0
+nitrokey-sys-3.5.0
+nitrokey-test-0.3.2
+nitrokey-test-state-0.1.0
+proc-macro-error-1.0.2
+proc-macro-error-attr-1.0.2
+proc-macro2-1.0.10
+quote-1.0.3
+rand_core-0.5.1
+regex-1.3.7
+regex-syntax-0.6.17
+structopt-0.3.13
+structopt-derive-0.4.6
+syn-1.0.17
+syn-mid-0.5.0
+textwrap-0.11.0
+thread_local-1.0.1
+unicode-segmentation-1.6.0
+unicode-width-0.1.7
+unicode-xid-0.2.0
+version_check-0.9.1
+wasi-0.9.0+wasi-snapshot-preview1
+"
+
+inherit bash-completion-r1 cargo
+
+DESCRIPTION="A command line tool for interacting with Nitrokey devices."
+HOMEPAGE="https://github.com/d-e-s-o/nitrocli.git"
+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 --bin=nitrocli
+
+	target/release/shell-complete > nitrocli.bash || die
+	newbashcomp nitrocli.bash ${PN}
+
+	einstalldocs
+	doman "doc/nitrocli.1"
+}
diff --git a/app-crypt/openpgp-keys-gentoo-release/Manifest b/app-crypt/openpgp-keys-gentoo-release/Manifest
index 7e509d1d3d79..844e27952d14 100644
--- a/app-crypt/openpgp-keys-gentoo-release/Manifest
+++ b/app-crypt/openpgp-keys-gentoo-release/Manifest
@@ -1,4 +1,4 @@
 DIST gentoo-release-test-sigs-20190224.tar.gz 3235 BLAKE2B 924c69a62d5321716f536144f0607bd3ec4a65d76be492adc729864fd9bef82df0086541ae13034a83152ea0c8dc3cbd168be6cff111a3484128a22cbc8ef1d4 SHA512 f8cc2e84bedbdf14ace6abe4aacf8f0c9810c77ff6ae0fac301829d9d4d5cf0c128a76516c773ac993879215bcdb0aab097e1e7e747d8e1a7c4cfc815bd4d3e6
 DIST gentoo-release.asc.20191030.gz 23981 BLAKE2B 307ceab69e309a53c2db191cf9d7a484318e852af648d93d9ad4bb2422737ab8de9257b457e5f201d86d226b348447acfbe57d259ce436150f75ccfb9f6ed60e SHA512 f3fbe0198f80f37784613c2a390c29f55e5b6291c44ee64d676806a26745017f8a9168573e13f6fc2fe93910927846c584b9f5cd017c4eac1cc875d7ed30cb8c
-EBUILD openpgp-keys-gentoo-release-20191030.ebuild 1156 BLAKE2B e3cf64507cf6faf296d329da28b4fed903357552a045d33563c1575f7ba536f0ddad6375fcee37b73488e63c48c359a5ef0a15674beaff6f2fdd1f75fb7b1fc5 SHA512 0784774028758191340ed14900f570926e54522c2706ce67cd98f887f3fc1275a0951941f60ea5ece5dea84b1b3cf76d7b5d18219c2360b177f017af6fcb887a
+EBUILD openpgp-keys-gentoo-release-20191030.ebuild 1157 BLAKE2B a78923498b264e3b4451db7c2ddba9c04de0787ddc2c3b4befcba441d07c0ed1207b0041d34dca1ea5870317a9745bb3533c5ff306ffd95e2dd89f067ddcb700 SHA512 3c7ad1a6af681007e1647cbef2d8956ed9aa15067d3d7d15edaa056c85331c6525bed0b01729eae598924ba6ad1a4c755f91d238e532ceec72321b7734e81ad0
 MISC metadata.xml 247 BLAKE2B 1750cec57189e711ca5eba89a78e1d317f0839fa53564fbd39b4e955c28d98f4ae04caf9069afc20a18536cdc92b30fe7b15eb086767c742bad07d9980cfd24b SHA512 d6e2ea8a9d74791bcbf3d6311a66bafc20b8f4db3a576d9a8d54b86d7afb231122b8d87f71f3f46360980adf8d815c633b6d5041f9a30fc8656e8fb66057a282
diff --git a/app-crypt/openpgp-keys-gentoo-release/openpgp-keys-gentoo-release-20191030.ebuild b/app-crypt/openpgp-keys-gentoo-release/openpgp-keys-gentoo-release-20191030.ebuild
index ae597c7d966e..b98ea9aebcf8 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 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/app-crypt/pius/Manifest b/app-crypt/pius/Manifest
index 4a94704e5e82..f70cb0b534bb 100644
--- a/app-crypt/pius/Manifest
+++ b/app-crypt/pius/Manifest
@@ -1,3 +1,5 @@
 DIST pius-2.2.4.tar.bz2 40578 BLAKE2B e7989631813658ff888c72b825269482ff33296abf0b9780ecb24df4628c499087a7591372ef96449b4899b1bcd730b0c75411bcd3c8839c57d3d4b5de374862 SHA512 3a178d30d98d0ed7ddf6819578a54ccfb9719f77c1f6385e3b254e28cd890817f328685c02cc464d4d592961c28ba314ca3175056b412dcdb301b851d874eb60
+DIST pius-3.0.0.tar.bz2 46643 BLAKE2B 18abe6a93bd719adf50fa4bcbf5128845d732b598d611e716a536f78f4930e6e63e7f60d7444775fbc32072935c13b1828377a9e843114255a4101f4e3199f98 SHA512 0c906574ac703f45e3318ae3e7994fe6580fd172849b2956d9084033d6fbfd69fec942b95bc2edadadc223fa0685ff0b9799ad03570b712b9cdb09d69491cc91
 EBUILD pius-2.2.4.ebuild 491 BLAKE2B 8be85b57f3f5c6f15d5202cec3171208b1b2c14c8fa70695a340806a714aa689cca203f935f7b54a737db2217ada4e73c61555f5f40de207fb399db0891040e4 SHA512 20a051fd9360c4b4f97bf945ec48a1dfb6096178b73e0ea01472647e9eec27d0a8a09db139196498dec872c67bbf545847853a1f4c0ac7da21f064c9558355b2
-MISC metadata.xml 616 BLAKE2B df1c92cdf11a6fb8987f60694d736086727e4c0dbfe9240011b4850d753b154b15cfbe323bd4ccc250227d8be76a855b1026cc8b172bd14fd124f374f5884e8b SHA512 fe8cde51d90fc53518b9c85c654a7bff3066fa3171d8f3b721b2ad840691d669450d3741806c46b1303e94ce7a9f598ca29cd04eadc2d716b3e0c3c297ec0191
+EBUILD pius-3.0.0.ebuild 655 BLAKE2B 5b122560970340facc2c025cd8fc591d3c3def90aacec82d3eaa392e2af4e0891be3eb17389f00d9368e0e8ac5f9f0f2d1cddf0c3df19c056230dbdb7f9afcac SHA512 b709be3e97e9cf34062199d6d741e6d78b9831f4957f30687acfadd6a0ee1513883a9d943b40ca193051123da797809984c368eb7540ab50196fa231ea323ad7
+MISC metadata.xml 822 BLAKE2B 5dc5796afbb5b5e3f070db3884adc17d0e6e73c568bd747d1ae5585416219305a48d3a7d53bd3f30761262b232e737e1f6633c7ba1dc0834cd95b3fe50b903cc SHA512 49833d454ceb01c9af3010643ba78da1c49152e2502a522fadcc13ce83e9e26f2bf24cc6b06c88cee42f1ee15ab5a18e8d3bf50b3e18b0bde7d1d64fa2211fcc
diff --git a/app-crypt/pius/metadata.xml b/app-crypt/pius/metadata.xml
index fdb742f14987..0be0c7e0c49f 100644
--- a/app-crypt/pius/metadata.xml
+++ b/app-crypt/pius/metadata.xml
@@ -1,7 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<!-- maintainer-needed -->
+	<maintainer type="person">
+		<email>nickaristocrates@gmail.com</email>
+		<name>Nicholas Meyer</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 	<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/pius/pius-3.0.0.ebuild b/app-crypt/pius/pius-3.0.0.ebuild
new file mode 100644
index 000000000000..f7f3745afd4d
--- /dev/null
+++ b/app-crypt/pius/pius-3.0.0.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DISTUTILS_USE_SETUPTOOLS=no
+PYTHON_COMPAT=( python3_{7,8} )
+
+inherit distutils-r1
+
+DESCRIPTION="A tool for signing and email all UIDs on a set of PGP keys"
+HOMEPAGE="https://www.phildev.net/pius/ https://github.com/jaymzh/pius"
+SRC_URI="https://github.com/jaymzh/pius/releases/download/v${PV}/pius-${PV}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+DEPEND=">=app-crypt/gnupg-2.0.0"
+RDEPEND="${DEPEND}
+	dev-lang/perl"
+
+python_test() {
+	${EPYTHON} -m unittest discover -s test/* -v || die
+}
diff --git a/app-crypt/rotix/Manifest b/app-crypt/rotix/Manifest
index 675794618449..17d8964cb84f 100644
--- a/app-crypt/rotix/Manifest
+++ b/app-crypt/rotix/Manifest
@@ -1,6 +1,9 @@
 AUX 0.83-respect-CFLAGS-and-dont-strip.patch 623 BLAKE2B 62cff4d1566fbb9263142404e495de64c8fa5cca8c1a1b4319a7d677ed930c02a6147e71f90f9a9ff0be4e80049c8540148191df170d7124be62f43c1d2c5515 SHA512 1b1fab8bdcfac682d0927075a0614ae888a1b23382ce8484b2ab9eac316f46a907bbd872615553201c5ccbf1d8f677491612956075bffacced0d408defad9e07
 AUX rotix-0.83-interix.patch 252 BLAKE2B 319f34ee0d874d5a608259d4fd3f018ec085ec28f96b8a620b4b1606b844acec7d3b665e62b5c032bbe2d928f924d1dcbc519628a8ccde9e0ac259be2f485871 SHA512 4c3862c22fb6c39f8f9653d7415414f28c31f91eeac284fa277c2527abe0a4d549f1eda141a5409b9ba171bbab3c4a2b9c66ecf438413e542682a85b2c549b8c
 AUX rotix-0.83-locale.diff 256 BLAKE2B a7564979a38ff517bbe0592ba12e2aab92c44fc828180c2587ec4b5db3acf4ffbf71feba959625faf93b9fd997d39c9330e4255e8c875bbc1653b66fe140e1c9 SHA512 7b8c82bac78c48f5d43c0246c41e7a7910f0119cc7b56500789d722d87f00e9d2356150063e07ae281435d5af60f9e15956c5bc0b236ea5f225435886117c4b0
+AUX rotix-0.83-locale.patch 206 BLAKE2B 98f179037eaebee3ca2c1f41d543dba29fc61209518b3abec238473a38da0d3140aed50ed5a33ed1d0656336df2f3a236cd0f8ced9f0795d807710f1978f881f SHA512 caa6430c0bf96fccae2547524c7eb81170e27ef2adb054671db0f1d8f88ed6a4960b827d1781af4adbf5216c00e007a48071b1b4237f5a691bd46e45bbd599a0
 DIST rotix-0.83.tar.bz2 14685 BLAKE2B 296e094dfef2b35db39041e92d350befc970f3594c7aa2962b4dba0215e99b50ea887d3d636dc2e38ee570b60462bcf8304a6f7ee005315fa115b821ee0f29ad SHA512 1f318e15bd51cc197d9d9fc36e37b29c18fe7a8e8c40654c69ccf97d32b896afa7cc517c562750f6c1262baddbb451bd8a29ada994176e442630d8ed56ccf572
-EBUILD rotix-0.83.ebuild 809 BLAKE2B 09fa63b75f2ab6a01ad0319cee31b9a9d000670317bbc9da7fccf5c6585906b724e11afbf8a35189c35d9c54431d1b1bc37089669fce3fc25a732072e4538965 SHA512 0028e6eaf608b80fed4accdc65fb173c03666f16c0dc7d7c79f500d9802811b54e47df11d6621f4bbe8b2cfecccfc8ae49dd389b67950095f1cd38c0293c4ab3
+DIST rotix-0.83.tar.gz 15412 BLAKE2B 4a0db309fa23af3e15a63263e40a2b27e2ebf1e0cf162f2776ebd5237621207eee3a41374170c2e0441104704bde4aff8f929fc5ad8994dfcf4fd1cb5a461696 SHA512 bffe527714f35a99f3322e87d1e2fcbafd38f3a7677e2ca816988df2ce1567ce064f0ab7a543fab3dc2d73f148675fe069c398a5d9c7bb285cb6b1658c3fbffb
+EBUILD rotix-0.83-r1.ebuild 828 BLAKE2B a38db350e29de43e47005c789fca18d942a05a3bfe6840c2f72d02a01704837db742d36cf657cdf38341ee966308cf116c9ac7e89ea88a5a28df0e5be18b78ff SHA512 90d9b906e84f2729aff186ce7f95a76b7ebcba9a889ef4d83aeafbe0a74d277de4442cb76347031251e80cb0cd9f7854c342344b8b9a347dfdd6c9c41b2b8602
+EBUILD rotix-0.83.ebuild 803 BLAKE2B 8c7b1cc3aa763d66ecab9a9082b72040e0c91734dad8701387f2e296d7d300a98bc6074af1e8da7bad0eab7d7a2bb4d562f0cd48efd8c7f61cf4aea712ccc352 SHA512 d1f06b48dfef707e1753f035763a02a4f8032d6255c86d8b79ad0cdfd5a2c5f42f4008c658d7c4ab01539b96882da4948ef865b08d3eadd6dfb679ec0481b3cf
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-crypt/rotix/files/rotix-0.83-locale.patch b/app-crypt/rotix/files/rotix-0.83-locale.patch
new file mode 100644
index 000000000000..460a75da9a48
--- /dev/null
+++ b/app-crypt/rotix/files/rotix-0.83-locale.patch
@@ -0,0 +1,10 @@
+--- rotix-0.83.orig/rotix.c
++++ rotix-0.83/rotix.c
+@@ -38,6 +38,7 @@
+ /* I18N */
+ #ifdef I18N
+ #include <libintl.h>
++#include <locale.h>
+ #define _(String) gettext (String)
+ #else
+ #define _(String) String
diff --git a/app-crypt/rotix/rotix-0.83-r1.ebuild b/app-crypt/rotix/rotix-0.83-r1.ebuild
new file mode 100644
index 000000000000..659781528a35
--- /dev/null
+++ b/app-crypt/rotix/rotix-0.83-r1.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit flag-o-matic
+
+DESCRIPTION="Rotix allows you to generate rotational obfuscations"
+HOMEPAGE="https://github.com/shemminga/rotix"
+SRC_URI="https://github.com/shemminga/${PN}/releases/download/${PV}/${PN}_${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ia64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
+IUSE=""
+
+DEPEND="sys-devel/gettext"
+RDEPEND="${DEPEND}"
+
+PATCHES=( "${FILESDIR}"/0.83-respect-CFLAGS-and-dont-strip.patch
+"${FILESDIR}"/rotix-0.83-locale.patch
+"${FILESDIR}"/rotix-0.83-interix.patch )
+
+src_prepare() {
+	default
+}
+
+src_configure() {
+	use elibc_glibc || append-flags -lintl
+	econf --i18n=1
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+}
diff --git a/app-crypt/rotix/rotix-0.83.ebuild b/app-crypt/rotix/rotix-0.83.ebuild
index 2b181e720891..725b3796bad1 100644
--- a/app-crypt/rotix/rotix-0.83.ebuild
+++ b/app-crypt/rotix/rotix-0.83.ebuild
@@ -5,7 +5,7 @@ EAPI=5
 inherit eutils flag-o-matic
 
 DESCRIPTION="Rotix allows you to generate rotational obfuscations"
-HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
+HOMEPAGE="https://github.com/shemminga/rotix"
 SRC_URI="http://elektron.its.tudelft.nl/~hemmin98/rotix_releases/${P}/${P}.tar.bz2"
 
 LICENSE="GPL-2"
diff --git a/app-crypt/shash/Manifest b/app-crypt/shash/Manifest
index 65315f7a41bb..2563abceb0b2 100644
--- a/app-crypt/shash/Manifest
+++ b/app-crypt/shash/Manifest
@@ -3,6 +3,6 @@ AUX shash-0.2.6-binary-files.patch 898 BLAKE2B 892a6bed771a8906b5b00a47b1b13df37
 AUX shash-0.2.6-format-security.patch 413 BLAKE2B 4bcb4a803b8a69c7568d89dfbb900687627f1f51ddefd60b814aa1195daeb6c8026ad1dd55f17fa78ef54fc592b94e9704440f66a47a1c7a70fea0172167e0d7 SHA512 295e5d147c6b66814fb5b863ceab39bec87cdca0d3f1ff3e9d10e59b090a171d96efba080447f1520358ccc4daf8e926c3403e69f966cabdb33722d030ba1b04
 AUX shash.bash-completion 856 BLAKE2B 259204c4579326baa2b68d32e87bb8d6bcb4bd25646d851a68efe28927dc4c61e409092581036a777cddcf4941c12ff51e53f97c30b361cde05f4e89b65abda8 SHA512 1d6f57c5d1d75a576bb2536dc9a7518263e2c34da127f0450e1c7900038a8c9e4a379533ff34ddccf0c62cb53284f0fdab41510f71a05a337e39bcab578ed2b8
 DIST shash-0.2.6.tar.gz 105641 BLAKE2B f7421aa9ed7b242e14a585461e96f44e35f1acf38cba358807ec06e6678c82f7f3b070a218de71cccde9f18a1e7e13f8dd4cf66b48e9d6626f16b2e1fc33757d SHA512 340a59bd16b3e5069a076b56f8fe24d2306a6ddd5e6ad564c5e17a992d8e279a7109ba39bd5caa8438a0e85b4f94cb0878228f7aefe38221ff6efa80df64086b
-EBUILD shash-0.2.6-r2.ebuild 869 BLAKE2B 9ffb82e7a880d0749facf5e87a159dfcbc0cf09e50beef5f8ca4619a3312781d43415cc2a38984393dc35c648311509107da5bc104acebec09bddb1cfb884447 SHA512 8bc47f3e78107d041e5d19738d710a75a47ef8ab0095d0a733b7cde93678c7829425a09d79ad664b7676d364be23b0751431d77c655e6896402b8ef97254ac4f
+EBUILD shash-0.2.6-r2.ebuild 870 BLAKE2B 395e230748d12a013bb5c4c2ad51e307c14d45d861a9ef8dbce3d75c5fa0891f0f142091d970b38485c07538af187c2d2cc974e354cae752de46bff3610c536b SHA512 fe1de7d66a9491423a672f12771f44f91e6127a8e1e804cf65712b9002dd3566630f2d3b0afa867d28c0416594a7bbecec35daed425bd4db38648e731101fde2
 EBUILD shash-0.2.6-r3.ebuild 937 BLAKE2B 89412a67cd61f33d382d312e8daa5dbc60e77b835ae368e6eff27407878582bcd294d8d40edb155b4b561f0896ad8140925e71037ae287b1aed9da0d24c82b7e SHA512 19ff1da2920d3b2142b7188f138a5718a1588d5d8a94b011bc9fa72ac926bf0aaef019f6161bb718574f0329ebecf49b841cbcaa1b7fc991e911db2656fce6ce
 MISC metadata.xml 389 BLAKE2B 0f19c78e6c95b99b0de3da4896ded3dbfcd482650294efb1a7b0961a6ea884e30241bfe431fe9c85ced61c45cc0e123f52847953b4e4a2bd86e4a14894190d2e SHA512 dfecd29a48ac51dfbb2d4ab6bc71d4538da61541b7ca3beb34edc4d321a97d881044e4f5815d8cb1a4715dc18dc5a9b58520e3d8697b8cbf35a6f795c13c87d6
diff --git a/app-crypt/shash/shash-0.2.6-r2.ebuild b/app-crypt/shash/shash-0.2.6-r2.ebuild
index af5408c0c764..98f92bc76d3f 100644
--- a/app-crypt/shash/shash-0.2.6-r2.ebuild
+++ b/app-crypt/shash/shash-0.2.6-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="ftp://mcrypt.hellug.gr/pub/mcrypt/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE="static"
 
 DEPEND=">=app-crypt/mhash-0.8.18-r1"
diff --git a/app-crypt/swtpm/Manifest b/app-crypt/swtpm/Manifest
index 62b42c410204..138f7f0f8688 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.3.0.tar.gz 308472 BLAKE2B c6b93303c77cb3de0917b219b7e8e216864a11cd7c584d85409b457bc36db9b0515639ae972f8ef39ba60f52506075a2cc697519bd18da9fdb12031e716c9e6e SHA512 e1e62367966224b3fc6edb80a883c5e3d6a698f437032e0b4b71558ebd7e24e5b92e7d843ee15ca29edd96710bbac51cb435956ac535b10a5f2b2afd65e748a3
-EBUILD swtpm-0.3.0.ebuild 1417 BLAKE2B dfcf8f0024e9677269a841e2a62cc45eeb15de7d647da257812eea22c76af426786a0f63d192c148a041de6aadda2a040f3aa56aacd1d3f91f09963ae249ef0f SHA512 c1636ad8734fdf739a06f33ab111703c2553fa48c29d2e2bb002311d270a9fe76d9929ffce4052fb55b2d5afd4d3fec27c86eaf4c560cc973d6802a3524cd1e4
+DIST swtpm-0.3.1.tar.gz 308576 BLAKE2B 96c44654b92d453d91594aed6fdd4cb56853973c1215bfb131e750d38a3ed1e64e3283647e54ad9ad84747406f53d7ac4f221fc5b319d7fa80bab758fed04062 SHA512 4b3e58048336ee82a87d17905a7d0dc5fbe13160ebb8f072b91410e782dae7fafc72e572a2f6aa2b1d9f4377074c01afd30505b9e71d92b8d7066365811d3e3f
+EBUILD swtpm-0.3.1.ebuild 1450 BLAKE2B 05dd73fc1d56d910be37d1f919792294aca40a03f00e8065d2f8ca76dd749634b6039f08bf0154adfd2b4c87eec98e5a612e5d194f6d5282307cd5a8d4828247 SHA512 0034a03fa8c529d49d8d5ca47bc9bd22bbcec7c5118d6f9a66a42f4b34998720f5b1b8a786190ed92f9e9751a02deb1181dc515475a5f764a86d42e78a2eecc1
 MISC metadata.xml 457 BLAKE2B defc06c2642823aa760cafc22e90f891f9337358bfaa446778e1f4107f6e295ec21b5987f49bdcee3fd7b68084be1b864d7569e74bd729345e4886b08c617a06 SHA512 c80e24dc4ec41e5aae1e7fe67208c945e62c02f469164d0a76445269e3e0204674cd593956f99fa1539505e1a70a15bbf6c02afcf6b38592f04f3c4d3f275e08
diff --git a/app-crypt/swtpm/swtpm-0.3.0.ebuild b/app-crypt/swtpm/swtpm-0.3.1.ebuild
index eeb7c5075a97..20d0ca3946c5 100644
--- a/app-crypt/swtpm/swtpm-0.3.0.ebuild
+++ b/app-crypt/swtpm/swtpm-0.3.1.ebuild
@@ -10,10 +10,12 @@ inherit autotools python-any-r1
 DESCRIPTION="Libtpms-based TPM emulator"
 HOMEPAGE="https://github.com/stefanberger/swtpm"
 SRC_URI="https://github.com/stefanberger/swtpm/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~amd64"
 IUSE="fuse gnutls libressl seccomp test"
+
 RESTRICT="!test? ( test )"
 
 COMMON_DEPEND="
@@ -44,6 +46,8 @@ DEPEND="${COMMON_DEPEND}
 "
 
 RDEPEND="${COMMON_DEPEND}
+	acct-group/tss
+	acct-user/tss
 	app-crypt/tpm-tools
 	app-crypt/trousers
 	dev-tcltk/expect"
diff --git a/app-crypt/ubuntu-keyring/Manifest b/app-crypt/ubuntu-keyring/Manifest
index 426887a62881..fc8e1701abad 100644
--- a/app-crypt/ubuntu-keyring/Manifest
+++ b/app-crypt/ubuntu-keyring/Manifest
@@ -1,5 +1,7 @@
 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
+DIST ubuntu-keyring_2020.02.11.2.tar.gz 39180 BLAKE2B e87e491bb7e22217fa9085edf77f833a3ee59cc7defe5690d343fe418795e4ca494d5db5df97684444906f4417f89b2730268599f3115c01fe8bcbc49e540558 SHA512 e717699a6f85a07e87cb3362550ce8a0db1271d2efd85f97405c0e9139516fdf8ca473a37035b5e6e38aca9e1a29e92f4a948d51def076f9c25961c5a1d91ce1
 EBUILD ubuntu-keyring-2018.02.28.ebuild 457 BLAKE2B c63cdf7150c404853160294e4b3230b4da99a9dafb17cbfc4ee72d940bda89ec6818a675b7a050b150cca3e02a0a6f1d5e832957663b3beec4daa987556becde SHA512 3f7744413a46f63430cc115b6953258fa3d1b7aeaf91b895a8a588901e096fb9da73ff19f750f0b83bdb98a257eef73e6dee840e0d096e254601a0e8f54da73b
 EBUILD ubuntu-keyring-2018.09.18.1.ebuild 493 BLAKE2B 7b8fd04a1c7cc24970c40f533bee69145044cb61b99515b6a66c4968f64d6408dbcadae70724181fe61490fd05d0d880eeb74c72a336110c001f27903ed2c1d8 SHA512 a7349115b728ca3d57461ce6fc4b329cda40565a78fac2f047360878d20c97df0d766359486dc84dcb8b71904c376e0d3990e5f38d81f45052873150f346cf0f
+EBUILD ubuntu-keyring-2020.02.11.2.ebuild 461 BLAKE2B 1ffb83d3447ff326ba3092ced56f73aee1b0f445ce204ccd51560eecbc7713eebffee3352370ce2a63ebd504d3f479d163ac653c2a7cea01fce75891b437ba1e SHA512 598c17f9f8adb5b3467e58ecd362d04ce07dc5bb8231726de5483e37f03a8546036adc6b6aa8a312751671f2e0f33e3d45aa76e47d50f4295ba2e8d361a29103
 MISC metadata.xml 249 BLAKE2B 3647e2ef94ad009c86dc9d42c1396ad9420ade97042882b8d8f60f676c465cfd6ea3cea4b77caccadd99eb0cbe1ef83b18b799ec676da4ecfbff528d21bb5ffb SHA512 334ac61f9acc5c4917fd29afb3b420b1689b39be80cada419bed1db033e64130866d0995abe5f1c75eb1290f51734e9ad4c8d06fd8b49c288ecf617a0693d273
diff --git a/app-crypt/ubuntu-keyring/ubuntu-keyring-2020.02.11.2.ebuild b/app-crypt/ubuntu-keyring/ubuntu-keyring-2020.02.11.2.ebuild
new file mode 100644
index 000000000000..f1aca22151bc
--- /dev/null
+++ b/app-crypt/ubuntu-keyring/ubuntu-keyring-2020.02.11.2.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="GnuPG archive keys of the Ubuntu archive"
+HOMEPAGE="https://packages.ubuntu.com/cosmic/ubuntu-keyring"
+SRC_URI="mirror://ubuntu/pool/main/${PN:0:1}/${PN}/${PN}_${PV}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc64 ~x86"
+IUSE=""
+
+src_install() {
+	insinto /usr/share/keyrings/
+	doins keyrings/*.gpg
+
+	dodoc changelog README
+}
author	V3n3RiX <venerix@redcorelinux.org>	2020-04-25 11:37:10 +0100
committer	V3n3RiX <venerix@redcorelinux.org>	2020-04-25 11:37:10 +0100
commit	38423c67c8a23f6a1bc42038193182e2da3116eb (patch)
tree	04e2cf4bd43601b77daa79fe654e409187093c5e /app-crypt
parent	623ee73d661e5ed8475cb264511f683407d87365 (diff)