gentoo resync : 20.03.2021

author: V3n3RiX <venerix@redcorelinux.org> 2021-03-20 14:27:17 +0000
committer: V3n3RiX <venerix@redcorelinux.org> 2021-03-20 14:27:17 +0000
commit: 5bb9ff1ee56d2b5e75e01a7f066d8b0cec84ec02 (patch)
tree: 66e860a5099bcad013f1cf667255dc372a7c11b3 /app-crypt
parent: 7218e1b46bceac05841e90472501742d905fb3fc (diff)
97 files changed, 291 insertions, 849 deletions
diff --git a/app-crypt/Manifest.gz b/app-crypt/Manifest.gz
index 3751f3c49309..8e761ad0f51b 100644
--- a/app-crypt/Manifest.gz
+++ b/app-crypt/Manifest.gz
diff --git a/app-crypt/acme-sh/Manifest b/app-crypt/acme-sh/Manifest
index 6884cc86a591..33456b62d5da 100644
--- a/app-crypt/acme-sh/Manifest
+++ b/app-crypt/acme-sh/Manifest
@@ -3,4 +3,4 @@ AUX acme.sh 63 BLAKE2B 50c3284c0172ff0a0dc57fcfbaba57a6518d7c043b5d052f2710b2822
 DIST acme.sh-2.8.8.tar.gz 218582 BLAKE2B bcd2fbc0ff984d7bbcf4e0ee4c1f08f868ebc4b31a5d217587cdeb5810b8991698de52dd082219194c762ef245324e981eb2a044b213e2713c0d12370be1c19b SHA512 cf601965cd5542dbd11668330d0a4e428e89ccc3af92d4d04ea3936c8a31979a5c00aa8e18a31fde07812242dddcebbfdbc06f1c29260b917dfa19f88d12fd72
 EBUILD acme-sh-2.8.8-r1.ebuild 1206 BLAKE2B 99e8c88d8a6f2cf8a189ec22d85cfb93397d50767873575a5e517de688820e2e52a0c50b31265e99b413ca8cf98490260dfaf59129d22cd6c16d005f1a45af42 SHA512 c9974da53271607ab45e1101f12ee7f8c0f731cc167fadff65c4fd14e2bb5d3075a20b688c6aecaf6aed7b462cfffc1f8b8d8ebeb8098f887a1eef3818483d61
 EBUILD acme-sh-9999.ebuild 1098 BLAKE2B 25a97db2f6e8cd0fafc2c07de5312ac8dd3bbfbd4e17cdfbd7c3cb11504137cc705d8ad8f286620e9d72e88bd6cdc2a10e50a53333ea6b43840ed137ac5d6c7d SHA512 2f29bda15f989b61b66bd311e0a34772db242881480e6f34dfb2056aaa5bbe92f1c26cc0eb2c7d7ac218e47088c11c5a8e2eb80f52bb6b5e2a34da3e7a0b0f3f
-MISC metadata.xml 646 BLAKE2B a06db1267cdb5269401e4493ecd5e7432eac110f5554d7627dd718b35c90320be8b9f1310c0bd6ee985023efbc3b99c8314c4ebc81cb3f39db2d5b7f4b9a1ebe SHA512 9959d771b4bd98c6fe3172150d905766b2b4d30c182b2d3cac3cbc5f3a95ef71ca7fc8930c3f42cd9907cacbb28511a40331257f68f7383f806aaf07ac4ee38c
+MISC metadata.xml 676 BLAKE2B ff6e0af7a7e7ff2a4571e5a3bda9a8b300c74e2b5b526a364c920372d7be42ec1986c7dd464c539905d8cba59e73645e0d1079fd0129919d53d1c0c833ec86f9 SHA512 94d61b537880bffcfe15e79a1bd82d96ad7f39e180a19d61a0fc0c1e2489e1f48f378ac8683bc8e790d2edc7fcb761a0e5498885b7ae4deeb9e2165e4534e45a
diff --git a/app-crypt/acme-sh/metadata.xml b/app-crypt/acme-sh/metadata.xml
index a02acbd86b57..bdd5ec3c0608 100644
--- a/app-crypt/acme-sh/metadata.xml
+++ b/app-crypt/acme-sh/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>spiderx@spiderx.dp.ua</email>
 		<name>Vladimir Pavljuchenkov</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/app-crypt/acr38u/Manifest b/app-crypt/acr38u/Manifest
index 2fce15df7112..125d26c42f2b 100644
--- a/app-crypt/acr38u/Manifest
+++ b/app-crypt/acr38u/Manifest
@@ -2,4 +2,4 @@ AUX 1.7.11-bis.rules 590 BLAKE2B 8604b9d067bac53501127f7d6ed8b6ef226e6faee64cd89
 AUX acr38u-1.7.11-build.patch 6299 BLAKE2B 4c18a2c36f980d1ab381373b0312b0049b94d7a8568827f44bde3381018998ef4ad059e3cb8e355da55ec539ce9c303569c1fb29364b0fe06a730c326c4871c7 SHA512 9979ca060a4dc4da526e0a0fbbe45a09e5e261cfde4f928f0dbc514af7d799796a2edf2f81d4015f512d9a374aeab57e971ce34f62cd7b0ac024ec2662c4a029
 DIST ACR38_LINUX_100711_P.tar.bz2 274137 BLAKE2B 0087cc63ee3af898824fd7cfe31f8b1f922ca4dded22215196b2bdaf1296cd50319d4923735fd2ecdb3cc329dee0df7f288a70e875417b02eb0803d19b1613af SHA512 c5d0e71ae383de515718d24110b825efa84cf1a150ec7249f80070446331fb4df4d157f5f4e96d45588346e51ab8e2012530edae92575b66891c7ee596d8d3f7
 EBUILD acr38u-1.7.11-r3.ebuild 1359 BLAKE2B cf9aba09624788656de556e54fb893d1a2642ba77ad74f73f605a83f510cbb2a06bd312310cb59768939d3f1677da17f8b8b45cb8646f0990f242b030b16f6eb SHA512 f269e951002756ab3bd10c21f70388e55f89a9934676cd486a0d83dbc4ce1eda13a7f4fa3b3f995b37a846ab369f0a1a9a955340ef486f5e02fcf0b806081981
-MISC metadata.xml 353 BLAKE2B 4aef7e7e65d23cecbedd5c4d52f225650925963fba206f9cb114bf286c73bd1c500ac101d87699ec23f5e7c3c4145ee564f082d355e9885077262753d5796884 SHA512 7af033f383bfc83c36c8699eae0aae7fd0b46047dc01ef3e7a75bef9020e985adb3bbc6c232f37a4c77e8c971855c47c387efa5987aaa86b32b849605d4258c3
+MISC metadata.xml 383 BLAKE2B 3f9fb5d79817d59137554b2c24e8b69bfceaafb5803ce62d869e4ed47b616bcabfc607483612f3ccfaad25c35d620712026ddab4c13c60a032002c4f528c031a SHA512 e534cd5ee46cb74aa286fcef59093dbd9b41ce9e902769c5521dc5db16dd2bba230e6bd08981bd6f72e70bd34780bdeee603d7fa0d9d33050c76beb62a02a9f7
diff --git a/app-crypt/acr38u/metadata.xml b/app-crypt/acr38u/metadata.xml
index 98b6f5367fc0..53e89c0e0f3d 100644
--- a/app-crypt/acr38u/metadata.xml
+++ b/app-crypt/acr38u/metadata.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
+  <maintainer type="person" proxied="yes">
     <email>vincent.hardy.be@gmail.com</email>
   </maintainer>
-  <maintainer type="project">
+  <maintainer type="project" proxied="proxy">
     <email>proxy-maint@gentoo.org</email>
     <name>Proxy Maintainers</name>
   </maintainer>
diff --git a/app-crypt/aescrypt/Manifest b/app-crypt/aescrypt/Manifest
index dba3f74cc4ce..bebc7430d9c0 100644
--- a/app-crypt/aescrypt/Manifest
+++ b/app-crypt/aescrypt/Manifest
@@ -1,8 +1,4 @@
-AUX aescrypt-3.0.6b-build.patch 1711 BLAKE2B df5eccdc516e0314a137b1c51e5ae05fe5e66c8defe892599b295d5720e26b3a5cde9e262b7f09faf9db0a57bc0479f3be1481b65c0f62ffcdb404db90051e5e SHA512 b19e4eba11753bb8929d14eddc4ef391c8ec62b2bb57cf63b1a74b9a27250b4719ece8f1a6b790c1f662738b92bb37da96c973dd38cdf059c7482edb3dbd0f0e
-AUX aescrypt-3.0.6b-iconv.patch 1096 BLAKE2B 91d6e74ea8b760e81887a799ee5e8709ea7afc7f499842879091dcffdca76f24cc9191ac438c03b9f7f4970f55beca1586d56f3262e5d0f1de53366464141c2e SHA512 bf8d564493ae9396f024c1e33a775a53833da9d984ff059f714362a2cc112c3e6bd575c5d64fc0f7118fd578af645f386d649483ab56c2a0cb8d9b0795161409
 AUX aescrypt-3.14-iconv.patch 1104 BLAKE2B a6b9a8f41e86c9ac6fe16427752ae20da7177e5c1aec9f42373f94606954732632d84dc06a1425508115b3fc94f54f895c671eca691442c4d3d3b9163a27934e SHA512 fb3dd6a459e1378c44ffcd6a5b109f4bd178ee2e3190eed334bbfa4387fb11c4d070105598b4f0b989428f00a28f2064cf5f5064b71c49db269f4f4b55283960
-DIST aescrypt-3.0.6b.tar.gz 28272 BLAKE2B ce5347b77d974c76dadaa820b5b90a56015019f846bbc61560c33032adad08576d5e5ddd7d9e1020878e35b40173a2c5e29578e2f6e98631725442beac6f19ac SHA512 4c88abc9bff50ae5d310be7dad8f29843941843f9b484d9846b08dc76c605940adbb375f7e8ffefd6e8236f35ff860a745f89226e9c171bfa70c28c16aa6626a
 DIST aescrypt-3.14.tgz 38742 BLAKE2B 7122cb0246e28fd1301c58c13145c47ea3e20c8af61efc4115eec8a7ade720ecf2093f2e0156c05eb6cbb6e403bbeb3624745609f0ec1f2fd477edbd876e3373 SHA512 ac06604e2121f0c0f098e87d43c493b7285c58ac7419c284e6a93218dfa7381d4ca69ee775842fde89226092e05978d662eddefe734afe38f67b28df68d87b68
-EBUILD aescrypt-3.0.6b.ebuild 607 BLAKE2B 1a411ecfc29f0de364a6d16ff86c8e9ad486cdb42d1a8137c3391bb14549a76df170140eea42d317b1d16301bbcd38a5076f8447c403a4f01d149debc3641fe4 SHA512 0fdc84b108ec79790601d14444543b5e3821e64fb02dc8bac46ef4e763d11c09f2f2181a38b2da255935ad068b86206a0e0214db98f836a48c1b999bae2201ea
 EBUILD aescrypt-3.14.ebuild 1605 BLAKE2B 1464d3609f29b7d468b5419691d917fa52847cbb734a7eaf771a2ccb9cf47111445e4080855edc5e2b95d828445003eacad75abc0d5ca8acf88a385149a1ce31 SHA512 0743249ceede209664999891de2f5652970d08d7b7bfea2fb703555ea036a0d71c36fc2c7c0f661e9bfe767ccd11716971dc8f66b841963971a201411b461189
 MISC metadata.xml 167 BLAKE2B e4dadf27fd344484f2bccb5b904909c89aac568c32e5b3c44bdf139eacefd4b4fae74419f503d2b7da0dccc1b68ba05d777d11292c0f89270d1ac5c9c703e8ca SHA512 7c8decb24ee3a850e38186cf3c7f8933a28017426806870ad6ef9ceb2533be147a2681fc789b535a81cb528af8c29d90d3006e4f250aee23bd7dea4561294e33
diff --git a/app-crypt/aescrypt/aescrypt-3.0.6b.ebuild b/app-crypt/aescrypt/aescrypt-3.0.6b.ebuild
deleted file mode 100644
index 39d2ef7cf78a..000000000000
--- a/app-crypt/aescrypt/aescrypt-3.0.6b.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit toolchain-funcs flag-o-matic
-
-DESCRIPTION="Advanced file encryption using AES"
-HOMEPAGE="https://www.aescrypt.com/"
-SRC_URI="https://www.aescrypt.com/download/v3/${P}.tar.gz"
-
-LICENSE="BSD GPL-2"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="static"
-
-PATCHES=(
-	"${FILESDIR}/${P}-build.patch"
-	"${FILESDIR}/${P}-iconv.patch"
-)
-
-src_compile() {
-	if use static; then
-		append-cflags "-DDISABLE_ICONV"
-		append-ldflags "-static"
-	fi
-	emake CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" CC="$(tc-getCC)"
-}
diff --git a/app-crypt/aescrypt/files/aescrypt-3.0.6b-build.patch b/app-crypt/aescrypt/files/aescrypt-3.0.6b-build.patch
deleted file mode 100644
index 8dac5b4e6f47..000000000000
--- a/app-crypt/aescrypt/files/aescrypt-3.0.6b-build.patch
+++ /dev/null
@@ -1,62 +0,0 @@
-From ab74ea544739ab044af1e9b398770d31add3b435 Mon Sep 17 00:00:00 2001
-From: Alon Bar-Lev <alon.barlev@gmail.com>
-Date: Sat, 2 Feb 2013 01:16:03 +0200
-Subject: [PATCH 1/2] build: respect CFLAGS, DESTDIR and permissions
-
-Signed-off-by: Alon Bar-Lev <alon.barlev@gmail.com>
----
- Makefile | 18 ++++++++++--------
- 1 file changed, 10 insertions(+), 8 deletions(-)
-
-diff --git a/Makefile b/Makefile
-index ac661a8..abcdcc4 100644
---- a/Makefile
-+++ b/Makefile
-@@ -17,7 +17,8 @@ CC=gcc
- 
- #The below line is for debugging
- #CFLAGS=-I. -ggdb -Wall -D_FILE_OFFSET_BITS=64
--CFLAGS=-Wall -D_FILE_OFFSET_BITS=64
-+CFLAGS=-Wall
-+EXTRA_CFLAGS=-D_FILE_OFFSET_BITS=64
- 
- LIBS=
- 
-@@ -27,10 +28,10 @@ LIBS=
- all: aescrypt aescrypt_keygen
- 
- aescrypt: aescrypt.o aes.o sha256.o password.o keyfile.o
--	$(CC) $(CFLAGS) $(LIBS) -o $@ $^
-+	$(CC) $(CFLAGS) $(EXTRA_CFLAGS) $(LIBS) $(LDFLAGS) -o $@ $^
- 
- aescrypt_keygen: aescrypt_keygen.o password.o
--	$(CC) $(CFLAGS) $(LIBS) -o $@ $^
-+	$(CC) $(CFLAGS) $(EXTRA_CFLAGS) $(LIBS) $(LDFLAGS) -o $@ $^
- 
- test:
- 	@$(CC) -DTEST -o sha.test sha256.c
-@@ -48,15 +49,16 @@ testfile: aescrypt
- 	cmp test.orig.txt test.txt
- 
- %.o: %.c %.h
--	$(CC) $(CFLAGS) -c $*.c
-+	$(CC) $(CFLAGS) $(EXTRA_CFLAGS) -c $*.c
- 
- install: aescrypt
--	install -o root -g root -m 755 aescrypt /usr/bin
--	install -o root -g root -m 755 aescrypt_keygen /usr/bin
-+	install -m 755 -d $(DESTDIR)/usr/bin
-+	install -m 755 aescrypt $(DESTDIR)/usr/bin
-+	install -m 755 aescrypt_keygen $(DESTDIR)/usr/bin
- 
- uninstall:
--	rm -f /usr/bin/aescrypt
--	rm -f /usr/bin/aescrypt_keygen
-+	rm -f $(DESTDIR)/usr/bin/aescrypt
-+	rm -f $(DESTDIR)/usr/bin/aescrypt_keygen
- 
- clean:
- 	rm -f *.o aescrypt aescrypt_keygen test* *test
--- 
-1.7.12.4
-
diff --git a/app-crypt/aescrypt/files/aescrypt-3.0.6b-iconv.patch b/app-crypt/aescrypt/files/aescrypt-3.0.6b-iconv.patch
deleted file mode 100644
index 616e87e38d61..000000000000
--- a/app-crypt/aescrypt/files/aescrypt-3.0.6b-iconv.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From 337cc9367a3cb4450eee245c6ceb615d0f05499d Mon Sep 17 00:00:00 2001
-From: Alon Bar-Lev <alon.barlev@gmail.com>
-Date: Sat, 2 Feb 2013 01:18:08 +0200
-Subject: [PATCH 2/2] build: support disable iconv for static build
-
-Signed-off-by: Alon Bar-Lev <alon.barlev@gmail.com>
----
- password.c | 10 ++++++++++
- 1 file changed, 10 insertions(+)
-
-diff --git a/password.c b/password.c
-index 9a2c1f8..dee79da 100644
---- a/password.c
-+++ b/password.c
-@@ -232,6 +232,15 @@ int passwd_to_utf16(unsigned char *in_passwd,
-     size_t ic_inbytesleft,
-            ic_outbytesleft;
- 
-+#ifdef DISABLE_ICONV
-+    /* support only latin */
-+    int i;
-+    for (i=0;i<length+1;i++) {
-+    	out_passwd[i*2] = in_passwd[i];
-+	out_passwd[i*2+1] = 0;
-+    }
-+    return length*2;
-+#else
-     /* Max length is specified in character, but this function deals
-      * with bytes.  So, multiply by two since we are going to create a
-      * UTF-16 string.
-@@ -273,5 +282,6 @@ int passwd_to_utf16(unsigned char *in_passwd,
-     }
-     iconv_close(condesc);
-     return (max_length - ic_outbytesleft);
-+#endif
- }
- 
--- 
-1.7.12.4
-
diff --git a/app-crypt/aespipe/Manifest b/app-crypt/aespipe/Manifest
index dc268bf18e91..c39017ae7324 100644
--- a/app-crypt/aespipe/Manifest
+++ b/app-crypt/aespipe/Manifest
@@ -2,4 +2,4 @@ DIST aespipe-v2.4e.tar.bz2 107741 BLAKE2B 9331441214b495f042f8ac41b57203057e7621
 DIST aespipe-v2.4f.tar.bz2 107663 BLAKE2B 80af945ec938307ddaeb1a1f7a91da71d4f1aeabe4cb303166cad95c36e0d0090fd8440bb636ac0245d2701d61fdea715c84e18dfacf32bfba7f4b85a2db091f SHA512 75b6b2069a0e013dbded29b07b990fc783cc04ce05fc37e6591dae7e8190485960735ec1a1af18d065be57d0b7ec23dbe520e920f92e9c01170b7a23eb32eb3f
 EBUILD aespipe-2.4e.ebuild 749 BLAKE2B f0af3d47dcf8d381891a0711a968a9d75a72136a4b52a8548b6e49d5445b2d49e1a3da595fa6ce18a3cc132ca3c90917a1fdb9440a0508f0c6f7608e6b53c222 SHA512 42d563aeb28a957534b0205aa47df96440cde79baad55b2848f9d1d7aa2fccece4d3abb06e070322016def375c8f9b3ddcb23eda7a75a1e93704d534007e6b25
 EBUILD aespipe-2.4f.ebuild 736 BLAKE2B 4424b54cf7e7d9938da977cb8571624dc2f1876c3f66d939535f37b1777b3a2a939c03bfac39e2c4bbb31ac78f7114affe635015020b279706d43eae15a2e331 SHA512 0c85587fc50881634e3f78b31841c54f8e9ebc58da47409d9665f57dcc283265028c5efdb61894c1c7a9f1b52563689dfe5ec115396ca262736223ed82ea4fd1
-MISC metadata.xml 650 BLAKE2B 4bf3cde201df3b0cd6d73e56b3502946c117d8942853ef1e919c245cde0b7f19da7a4cf6e5f95467f8235b6b3033d4897844c6142b9facb0836c92283d81d156 SHA512 73da723df8d56d8a2030bab56d830473fa66dda7f91e62f251c09db6164413dcc6c1f9c160586e383f4874aba11d21e57c44df21dedcf591d378196736136378
+MISC metadata.xml 680 BLAKE2B 90b39843b6dcda4a82b1757479427ac8a305bf204f97ddb19f903bbb169d327aa3d522806bb1852bd433a95248999f9e4ab9e25ebfebd990305a2d3aa65c6eeb SHA512 385100b06f9472bf3d6124c5faf0fc5198cb85659af2a51aec988c9b57407144f37bc7d42d236853578c73ff464edc01a122824196071fd53b63c60028152f43
diff --git a/app-crypt/aespipe/metadata.xml b/app-crypt/aespipe/metadata.xml
index c896699a412e..5c529472b7c0 100644
--- a/app-crypt/aespipe/metadata.xml
+++ b/app-crypt/aespipe/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>hlein@korelogic.com</email>
 		<name>Hank Leininger</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/app-crypt/argon2/Manifest b/app-crypt/argon2/Manifest
index a0de6f57b305..86e68b6041fc 100644
--- a/app-crypt/argon2/Manifest
+++ b/app-crypt/argon2/Manifest
@@ -1,3 +1,3 @@
 DIST argon2-20190702.tar.gz 1505307 BLAKE2B fa9c3dde7b39c8d797a3d6b52992ebfe35f5eba1c7d7b3aa02c440edc36a3f5186cacee2e39e27ed7c6356dc1970dac0e8198d6f2065eb63ff77f9dfb2937cf8 SHA512 0a4cb89e8e63399f7df069e2862ccd05308b7652bf4ab74372842f66bcc60776399e0eaf979a7b7e31436b5e6913fe5b0a6949549d8c82ebd06e0629b106e85f
 EBUILD argon2-20190702.ebuild 1356 BLAKE2B f6ded7042878dab05fbf0fbb955e73ca19ae38c7844e520939427fafcac5460966e83d411c6f695f72e62f674f4c4b63a0a4b7a5a91cb686b7d0884daaacab24 SHA512 ad8927654d5334885beb338dd3fc29b5790d51e00a2515f7a7fced928a6653ec1e924d17f23adfa678a25888bc91d9f56e52acc38f1055812818d1de1fd2baf9
-MISC metadata.xml 638 BLAKE2B d07a626d9825ec2ce799713d1b43beefbc306b95f344b7ab40fdc7b4c4c9c6171385f91229d4a2d10159dcdde9e8d1806769277665a90f7419b5b3a2cb2b69c8 SHA512 24c2648534d4855d93eb91c8e127f08a34dcd21fdff3bf2665d26e62409b819a9ada15e6516f9c1649c848d3a57aa4c68adeeaa80f92b870ed5b4c48c40b5e9b
+MISC metadata.xml 668 BLAKE2B dfdefb44d35ebadb4566d1a29127117a07f06b7cc225d7acf5be1783cd2dad4e8c9c2d770bffc392750e770e52d9165ce985909ce4f26daf54f75b774ab9cd55 SHA512 6793dc9c755f1e7856078cf11831215564b73271a61a4287b8e61777e4efd23cd5feaa84068df61e94e1e7eeb77aee5cbf1a64035f1bd035c94c2c936351a775
diff --git a/app-crypt/argon2/metadata.xml b/app-crypt/argon2/metadata.xml
index dce9d6d61621..d2542d99eb0e 100644
--- a/app-crypt/argon2/metadata.xml
+++ b/app-crypt/argon2/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>simon-bgo@slevermann.de</email>
 		<name>Simon Levermann</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/app-crypt/certbot-apache/Manifest b/app-crypt/certbot-apache/Manifest
index c796e33679b7..7d116d0ece6f 100644
--- a/app-crypt/certbot-apache/Manifest
+++ b/app-crypt/certbot-apache/Manifest
@@ -3,4 +3,4 @@ DIST certbot-1.13.0.tar.gz 1426058 BLAKE2B 661aeb430e468a46362c537efd253bb581c7e
 EBUILD certbot-apache-1.12.0.ebuild 916 BLAKE2B 4f18cd312b4ffec9ceaa76506f41a9c444bc633683aad355040042bb15685c8ea2f3ccf65cdd6956187e28bd86615e4a2e246f989af9761acce44d1cad3f6ae7 SHA512 a3d47c298d4561c7d87e261f054880a7bdc59dd9f09566696fe9f77e261238fddfd510069eac5511507dc53d49f6d214770fb9f701abfddd0ab233d0562e2ffb
 EBUILD certbot-apache-1.13.0.ebuild 918 BLAKE2B 27d7ede9a9f1e9617833c483492277ccb0fab3715072b826134de1d460701fe5e99f69450d2ad54be818040f7f9315585b454188fb99eea55737e7128e496a9d SHA512 ecc7e71a5e4655d5e6ef3d79099130a30f8be29dc041e3e273c8e22599e8f70b36f32572f3d36b35894e095f55cb11cabf9a654bd315c0622e4edb5c29249294
 EBUILD certbot-apache-9999.ebuild 918 BLAKE2B 27d7ede9a9f1e9617833c483492277ccb0fab3715072b826134de1d460701fe5e99f69450d2ad54be818040f7f9315585b454188fb99eea55737e7128e496a9d SHA512 ecc7e71a5e4655d5e6ef3d79099130a30f8be29dc041e3e273c8e22599e8f70b36f32572f3d36b35894e095f55cb11cabf9a654bd315c0622e4edb5c29249294
-MISC metadata.xml 358 BLAKE2B 745ac26a52c7926fcd3d15a7fc88ba34d01c8fda8144bf7054d6bac64625fd4db8ade6d216f25ccd86acdbf3606c47b5968d729a9a8344791958fe971a08b059 SHA512 8fa64cbf6debe838fcf8ba52e9f2c40161860b49065af8e9a1be7b63600ec7748cb34ec33a12c0843f0bcb11c6f8501e03d7d588553be95b5f2545f106af40b3
+MISC metadata.xml 358 BLAKE2B c94560461dda9d2d671208dd9a7e25586f86fe262bb06303a2a5e7f6f717d6936abe8c16dc6c7308aed4f8d11d4d5ae69969367b14d5bcfe838f60fc8b583642 SHA512 04670ec371be696e3da0328059ac4a336995a230823b10b6e5073fdb780ad1b873d510f31ec6c324b82562c0cfc86bfd3cbd797ef577fba7dccfe50c496627f7
diff --git a/app-crypt/certbot-apache/metadata.xml b/app-crypt/certbot-apache/metadata.xml
index e7e2b64639a0..f1394897b78f 100644
--- a/app-crypt/certbot-apache/metadata.xml
+++ b/app-crypt/certbot-apache/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
diff --git a/app-crypt/certbot-nginx/Manifest b/app-crypt/certbot-nginx/Manifest
index 6bc275ab6f9a..6fbe0dc3fea9 100644
--- a/app-crypt/certbot-nginx/Manifest
+++ b/app-crypt/certbot-nginx/Manifest
@@ -3,4 +3,4 @@ DIST certbot-1.13.0.tar.gz 1426058 BLAKE2B 661aeb430e468a46362c537efd253bb581c7e
 EBUILD certbot-nginx-1.12.0.ebuild 933 BLAKE2B b64ce9678fdf0d6a7cb66c4f8270764d04726c9942aff1288cb278af75dd53fc0b9dc5790146458d0187c2d24c5d87643bfad7befca642178f3c97d927268c6c SHA512 8b149b8dbb4938d826a06bdda5bd526a7abd3afd3123148496220e620058717e754345dc9326a96ff83c02d5570d0803fd59154cfce9c4892bf11688c60c0d0b
 EBUILD certbot-nginx-1.13.0.ebuild 935 BLAKE2B 1eed182016c7f44b8ed6339e2adcfad6789663f04dcbbfd76239ac0b43a84388c05f3e73af0b7a76d2cd25710ea8f260a93022e1e81efc55d4c039b144fa469c SHA512 9199c62a00c96c4e839774a78e4a7477e95621574a78415110755ad5e856ad5ecabe957cf1c19a2c263e03bf265724f224c31ee7a43cd2cc00561e1a57de7340
 EBUILD certbot-nginx-9999.ebuild 935 BLAKE2B 1eed182016c7f44b8ed6339e2adcfad6789663f04dcbbfd76239ac0b43a84388c05f3e73af0b7a76d2cd25710ea8f260a93022e1e81efc55d4c039b144fa469c SHA512 9199c62a00c96c4e839774a78e4a7477e95621574a78415110755ad5e856ad5ecabe957cf1c19a2c263e03bf265724f224c31ee7a43cd2cc00561e1a57de7340
-MISC metadata.xml 334 BLAKE2B 4adbd04c0edcc84925da47b32fee63d4652bf2a1bf5222a56e0e1c7cfe8aaa34275a2652c4416f8a80de11fd88217d8626d610fa857f0615f18bfd773a279e55 SHA512 e3d6dda6c44557523fd48b464b6d39fc45b90ba2ecbe03fb300a655973c1b2e654a24d8d381b769eba00d0d80fb5881e1dfec1694e223cd83047abba9f01a44f
+MISC metadata.xml 334 BLAKE2B e7b28e7d3e7c6fdce0c5120b29fbf5aa607408e2add6c0ad42e921fb1add9def38c6cb191129a5a6e1f0e3ea119caa6cdc74955b572e5d2c6f854d0b7c7c521a SHA512 a24ccf633fc9c2670dcd35801d95bd8ca0f4ea4d3d53b6651f2e8e3e280b95ec8a464d99f5423942c14b0777ae4551f46c1ff285caea460bc91cbc417a7a5b70
diff --git a/app-crypt/certbot-nginx/metadata.xml b/app-crypt/certbot-nginx/metadata.xml
index 264684bb16c6..0a55369a680b 100644
--- a/app-crypt/certbot-nginx/metadata.xml
+++ b/app-crypt/certbot-nginx/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
diff --git a/app-crypt/codecrypt/Manifest b/app-crypt/codecrypt/Manifest
index 69e6de95645c..6c221fd0f68f 100644
--- a/app-crypt/codecrypt/Manifest
+++ b/app-crypt/codecrypt/Manifest
@@ -2,4 +2,4 @@ DIST codecrypt-1.7.2.tar.gz 446975 BLAKE2B 40b7f97dae84a0fd621ee19c6bfeba47b781a
 DIST codecrypt-1.8.tar.gz 471273 BLAKE2B 30547c299689547b50e2742e12dbfd32f420217a81813446b36bf5ea52929ca1f3b1968d76937de17e0f003c82186abfa683a6e30dc1fa5dc2ffe89594827ae4 SHA512 0e452f4e93498faa671a5927a3dd93b6dc66cbda7eb71cb33a509f8608573eff5ac8fed0d5e09911e03c153b88c9cb1bb54f7b2aeeb7b6c31eec918ad9685102
 EBUILD codecrypt-1.7.2-r1.ebuild 672 BLAKE2B 8eff53eb6794460747a520d5a3846bc7c732f27105ecb472a1391a67ea8425f3a8c68797fb2fe1460073c586c757433bc98aa46bbc6a4c5fd1e09165f70c94f3 SHA512 a7678a94eb1240c5fe2deed6e1e5717dabd91f4a1fa6e1b279caed274e2cbb3ee61a8dd179590a3b5dd23c44366cff738fae3614feaea6d972aaedcaa6fed788
 EBUILD codecrypt-1.8-r2.ebuild 713 BLAKE2B 278aca073a6bf1d154ebf810b8c80bd49393f63354805d779bf16bf6b23be79661b1d029922217cc3d750a0709a53a05b0cde6dbc8e97279713cda9fabc4dcb4 SHA512 03d85d58d7c3bf3111853b6bd9b0c961ef9accf31fbac64ccf2051034c16e2ef634cc5481844ad6f1ae238537398b3de7d01fc70d50d24e95760d21b4a4d6511
-MISC metadata.xml 756 BLAKE2B 23c44085ef45f26b1ac4fa910594f7ccf47756ff2430e0d461d0ef86bdd92b14358f6041ce35979d3f6312da8cc3008c62691222ccdd05ff13ecae345dfec549 SHA512 b5edbcee8db2b2f57e9c8b3c2d36986e660aa9b1401e0a4dd130ee8ae43b7c899cc2652a046fe526fb58285ec45d7f022085423663b5dd37c89591bed0a6a702
+MISC metadata.xml 786 BLAKE2B 1d9838e87c093b6a7405cdc2a82301c15211d8797641b5550e1905f7322cf479bc126a7aaaad27efef8d4a4442ab53c770864d84cd486ddcb7dd4ab92951c81b SHA512 764d49d985760ee8088881570de5823b655f49ed408ce9b7de986dc113a96897a46df0d0c3dc4e4106b357bc2c8c3c48116a4c38f1e02055f5b740953accf3c6
diff --git a/app-crypt/codecrypt/metadata.xml b/app-crypt/codecrypt/metadata.xml
index be265ff6c7bb..a837d33149bb 100644
--- a/app-crypt/codecrypt/metadata.xml
+++ b/app-crypt/codecrypt/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>exa.exa@gmail.com</email>
 		<name>Mirek Kratochvil</name>
 	</maintainer>
@@ -9,7 +9,7 @@
 		<email>amynka@gentoo.org</email>
 		<name>Amy Liffey</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/app-crypt/dehydrated/Manifest b/app-crypt/dehydrated/Manifest
index 5427d60580c3..b59319185ced 100644
--- a/app-crypt/dehydrated/Manifest
+++ b/app-crypt/dehydrated/Manifest
@@ -3,4 +3,4 @@ AUX cron 71 BLAKE2B 88ec5a0d8618bc9e058d4cb3fedb0f74a530828bf63dd58a267386bd3ed2
 AUX dehydrated-0.7.0-fix-CN-extraction-for-older-openssl-versions.patch 1179 BLAKE2B d4925675e868e24e2bd38aa0444e9b934e351fb706be5b66e71315d213186719260c20ebb976c160b1458eed1f14416ed6d27dad79a6b39b08cca50285802cb9 SHA512 2f18fa75ea6674b9b8746645395317046012f01032e35736580d87ac9a410ec4641e81c5f307d31bb238a53886b30820cde778bf83e3d04083ae1b6323777307
 DIST dehydrated-0.7.0.tar.gz 86574 BLAKE2B 35a3b0b7592126ca65003a6c9eb8934a76584710d028057e5add7f77bb2fa3799e89a060306da3b98a62d291229a2a78f23e0f95f19e033796aee31e97b94488 SHA512 47740d2d31ca73482a4fc5ed0dfce986af907dd5449cb3a5230bf9683845686c8122fc32e6219a4439574ef11d6fb104ee09591c5ff667927a2c9c13ba005511
 EBUILD dehydrated-0.7.0.ebuild 1255 BLAKE2B 558259adab17bf303e93d40538bced438f75bf3f91490cef63959d746d49be7c4779c2f5e881c65385bcfeda6fe3ecc15d427eda56a5bd906393724162918706 SHA512 25047679b5e8d7504fb050f945641db7b9f8f0efe302c2f66d2aa23f513c1b59a18fe058496540a688239ca66b10cc72a39e258090bdc303cab6b1df5dbd9d00
-MISC metadata.xml 555 BLAKE2B a0abd59fec6fa769b7bdd3c4b513af98982d4587522f0f86d07a186932948f7dcefe0246a4616e7b74846c96fd6b4989c4386d8c311a2cd31391c97c80ccc047 SHA512 5b6fb60aec5050207a5606e7155611edd79f64706fcdaa1af4920e56295381a201c84a5259b00d7c4a373c29300d67fa7ea605ee2d364498add7136eeaa37ad5
+MISC metadata.xml 555 BLAKE2B 303318fef11a0c7bdf4efcd70971fffafc90680abf0d6902e2d162e462e0c7f9420bd984e4b2dc43c6af8137ff68070d1469c5444a320ff6f7d6e7c70fb74f11 SHA512 d1c9a2ec024c04d77002d4c5a23965de23e3e37cdf8c15a1ef23a04f60f21a9035633871936f6d1b7f2096ce065f1f780a3c14380bc5dc17bebf403f65461234
diff --git a/app-crypt/dehydrated/metadata.xml b/app-crypt/dehydrated/metadata.xml
index b4fd6de957b4..93f3dace316a 100644
--- a/app-crypt/dehydrated/metadata.xml
+++ b/app-crypt/dehydrated/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
diff --git a/app-crypt/eid-mw/Manifest b/app-crypt/eid-mw/Manifest
index 58be8eb2a3be..4df333e69401 100644
--- a/app-crypt/eid-mw/Manifest
+++ b/app-crypt/eid-mw/Manifest
@@ -2,4 +2,4 @@ AUX use-printf-in-Makefile.patch 1439 BLAKE2B 829b93431a8dddd957ef2deef60dfd3ff1
 DIST eid-mw-5.0.14.tar.gz 8971565 BLAKE2B d1e6997c089c72f6b6b15fafefa227d7341721c1fa52e446f0334c3915b2e16d84ccb27053dc2e12c0f932bb3cb96e1cbfadc0d6b203098734f74fa0dbffc6ab SHA512 97a4e1359c853f14e91d5ec6c3b13d97b3113106da1e7125b558d724aea76f8a15b289dd06ed13391896d9318daea0133eba9269b6103fb1b922e8b55ceaf9cc
 EBUILD eid-mw-5.0.14.ebuild 2657 BLAKE2B 9be1250a0a67ad60cad63225f7a29df1234d3c1d28282ba820b6cd8a6c930170a67341e0e50bb5916152f1987c9a481d513afe0899001d0c2bfd4e0218bec380 SHA512 bce58ec9cc79f3cbf21106221ee71861bd83d7ce15a58661999fcc2a8719024bbce8accc5467929c0bad1c18ac7d24e1f07bb757ff6447402d14237b64eea4d6
 EBUILD eid-mw-9999.ebuild 2423 BLAKE2B 600204c3d487c75471e9c9307748f09356dfccec3a466d538a243c170bca8299659d8cf8205cdffadb4c82e4f31cc5f5964f7e22b2014f45224008b4c54d60c1 SHA512 7fb482b981d58272037e5735fdebaec759b7c2de17280c8b829b3e4677c92ce37572449ab64b951a5d6a997e0041e2f0b387d924393db9b88c7ba95ee28bde15
-MISC metadata.xml 1376 BLAKE2B b137dd3488af97de2cf1acb49c0f69ec21cee305db6eaf1c5906215c213dd688813f87ab139b58cc33dd96b3770a4e79cf17e14939d5d92dc3b339d1c9ebd4cc SHA512 b0c354de9d2f90404eb2525cc21b5e7396018fbcd4cba318c356ada544a168fb8e33dfff33989e13393b9e0a99a0e332b59e4f27ec9bf5e16dee4ea30609ca89
+MISC metadata.xml 1406 BLAKE2B d61f6271dfd3770ac70c284761f50b84d01317641faac528f58f0644d916e29f167ed00035defd8814aec3d15242d28db89e3c72397826dc01f7ccd77cfe8a50 SHA512 362708706e778e86ef0d0962bd6d291f213b739470d97f324aa75ef6dd3930230847864296a0ed22a545c7cb9e802a025f5419d632b1ca81720c5b2365099bad
diff --git a/app-crypt/eid-mw/metadata.xml b/app-crypt/eid-mw/metadata.xml
index 1ef7d1fc9202..890881512814 100644
--- a/app-crypt/eid-mw/metadata.xml
+++ b/app-crypt/eid-mw/metadata.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="person">
+<maintainer type="person" proxied="yes">
   <email>vincent.hardy.be@gmail.com</email>
 </maintainer>
-<maintainer type="project">
+<maintainer type="project" proxied="proxy">
    <email>proxy-maint@gentoo.org</email>
    <name>Proxy Maintainers</name>
 </maintainer>
diff --git a/app-crypt/envchain/Manifest b/app-crypt/envchain/Manifest
index 2c151c84d7b7..f9bbf067c764 100644
--- a/app-crypt/envchain/Manifest
+++ b/app-crypt/envchain/Manifest
@@ -2,4 +2,4 @@ DIST envchain-1.0.0.tar.gz 8252 BLAKE2B 5b4e07421d47eede180ddbd1968090050ec4b25e
 DIST envchain-1.0.1.tar.gz 8604 BLAKE2B 6273eac40cf2a9eaf0704ee81d23b6e72cd296232f378bf5e5b15cdfb29a91bd394201724491e3a7104017b2416084d16e07b3634e5abe382e05eec52e388410 SHA512 ac2bca6e53f46c10978d55b2924595988ed6d76a9969691f01c1a57d17e5e8e2abd21653cba996aad31408bb029e8ba00818100c60f5b089b84c70eaf20a2c75
 EBUILD envchain-1.0.0.ebuild 476 BLAKE2B c424c556f180f755c75db9bb650be9e375f94950bac6f83c114d3f14667f5c0818bf35c98c4c94c3fce098f51c65f1a42791605109ddf279a519a6446994fe7f SHA512 09f8a61e03ad2115a5db8005f4fbd90bb7599c51e6d8bcbda7baffe399116e36a89b07ee7176a13039ff67548a9ae5f51a19967701ef37dc0c7220e5d0f30e2a
 EBUILD envchain-1.0.1.ebuild 478 BLAKE2B 4a7f5f450de103e61a9797d215dc3b55fd1181573914bab3228c47d6fb4daa6fce28b8261e9b7e35ad46e3b0a3b9a2bdb296dadb71618fc1ceddba98b8f9efd1 SHA512 454c17e0950d1afad8dfe04310469c6989f730aad483d6f387031be50c8dbb76c0b0f41b4f6f4168360e9a3adb3ad7084e7b291e49bdc08517c167783b10e09e
-MISC metadata.xml 746 BLAKE2B 2a0348bc637eb81abd5d5f7252685b13d3ead96afa478c066b0c00a3b01ca77479e181b6e5c51590d5cf96a3490e011d42e8172f8261b1aa9db257440ffbbfe6 SHA512 c345e54594f861bbd90d61d92c4e549b8885dce39c72253e84cddecb999d71c450eae659b2d5e59ab162849403beac86225c8ffb5a72fdc721a7383cdf2c5aad
+MISC metadata.xml 776 BLAKE2B 540144978d22905830c3a22561e75357932f8bf68c84913dfb77cc53dfc0199d42f37fd4365d9e0b792cc7c4d2ead9bd328464ff76a173dd1b11eb34bbb64de5 SHA512 08d884715afeb54d775a0796e3d47f96ac7b57885a3837b3ca40f577f026082cb718e35ca1f37888f1e819cead510bc90fcabc24516f6e6e904a0fe93cbea4bf
diff --git a/app-crypt/envchain/metadata.xml b/app-crypt/envchain/metadata.xml
index da51982cb6e3..b3f009e86e6f 100644
--- a/app-crypt/envchain/metadata.xml
+++ b/app-crypt/envchain/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>hfern@fernhout.info</email>
 		<name>Hans Fernhout</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/app-crypt/hashcat/Manifest b/app-crypt/hashcat/Manifest
index cc2e13bffee6..fbe5806bc7d6 100644
--- a/app-crypt/hashcat/Manifest
+++ b/app-crypt/hashcat/Manifest
@@ -1,4 +1,4 @@
 DIST hashcat-6.1.1.tar.gz 5385180 BLAKE2B a1a90f691222c7810150a23d513bd1d24bca4682dd8dec2ff5bdc9cc9f82d5a2b00407de966a7c7db131cf1c1709b5f78c97d45176598d6bb7ebd381c38b4ba8 SHA512 788539b488ba55684d6d93ce18f3b05fa822a8cbfcdbcde9c2b54001d8927580dca253e0e9ff9a19f4278045046d732e104054fc743c39f47952ca24d2e93724
 EBUILD hashcat-6.1.1.ebuild 2295 BLAKE2B 851422a617598df23a1a49eb5a5b68b3fefed33332e0f4c78c5607ec20e55b805eef20bd7d8238c6342acf82345f18fd91489e234f7c1eb4a53e0ee02cd58f86 SHA512 535e3b5b010fc6c6b8e3a99e13455952ac15fbe08562009198c1a9ca61b70f60ae273e9f16100982c2efe6f255df05f4cdd9d7c1e13bfe27f4d056fdf076a4a2
 EBUILD hashcat-9999.ebuild 2295 BLAKE2B 4504eab73c1b0fb65d6d9c1c3c93e3030699b234e890374b4a84b9c59743d32c79d4472d0163da2c3bf0b02282ef34c65d48a68d8c38a0ec9b0734626d875d98 SHA512 9e6db642a6a1e38f91b939add0a57b15dc8d3ce95e1c82685c0ebe9cf070a77f500eefccb956874c1ad0cf38a1d421c62dc63d32228918553ae7bbfc8312754f
-MISC metadata.xml 395 BLAKE2B b058a0b0749da5d258660ddc67733d9f6ba09d10acf98ccb2c46b23534d09cd2865a6e37050b96f89dc97a9584e6791360398c41576224905b667a9b149fd3f7 SHA512 1d2ee684f0180752b2dd6eee437ce2714437775a0224a34c6ffd9f9b86ef8c375947b25f5a372358672a4c69516861fe1fc26d1dbd972684f2df725fba87698e
+MISC metadata.xml 395 BLAKE2B fc7a2bac75e2c4805d002a30364e4f0e20ef972e1c8c91dc1ef3fb2f55914b8fc717a3a9502f064a19e6b0e590db779c650eab94c7b819a497a1d7ec41a78771 SHA512 6476fd0ec2f099314595408d6a593d74d126be57edc651ae5180dc8f36ae26f9db947b038e7d08f4e3f856ea9750f7bfc814f8e31d8ba829258a4dcdef5af75d
diff --git a/app-crypt/hashcat/metadata.xml b/app-crypt/hashcat/metadata.xml
index 4379ee24223e..ec1b0af6d4b7 100644
--- a/app-crypt/hashcat/metadata.xml
+++ b/app-crypt/hashcat/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
diff --git a/app-crypt/heimdal/Manifest b/app-crypt/heimdal/Manifest
index 7329439c6e57..c7a336022cf6 100644
--- a/app-crypt/heimdal/Manifest
+++ b/app-crypt/heimdal/Manifest
@@ -8,6 +8,7 @@ AUX heimdal-kpasswdd.confd 148 BLAKE2B 74c70bf236789e8c87bfd928d9108f181ad31c254
 AUX heimdal-kpasswdd.initd-r2 448 BLAKE2B e9280b18c06ad50579eceec52fe7bb83630b868e5b3ec16bc6ba0bf80c04f303fb8405cb6a728be79052729076de4df4b85e08277198e75d3c0d3093c464680e SHA512 e7de18a197ec6d56fac61c3d014c9f7d5cc10e4ee6c7ee432f9e4658ad5feee7be6c26d175755863321bf927e082e9da34a576647eaa428c98cf80f9eaa99176
 AUX heimdal_build-headers-before-use.patch 1128 BLAKE2B fa8f4a481304b619797a20dce8a8ac9f912d7f3f3402980da35259839fa9ecea0a84b1fb04dfee93af64699beefcdd9b0cedaa27c0323a568861307fa53ef3cf SHA512 df3257627300456afe4bd4a3a18bff5641cf1f0a9d1f0e74716b46a45ad0e58194ee284930cc1f856e7b74eecd6a590d1a6ef93d40a4b275d899856b46e14128
 AUX heimdal_disable-check-iprop.patch 577 BLAKE2B 1bb2be5bfd172988a00fc71c0429a0948437f20228aec0508788de30fe657765dfe3be3955680a8e006d4afdc1396c7810d26775bae936d72f927e14e8dbd46f SHA512 c3a337d7683dba271df13cad9d5ea716449a0a8ed2b178e15ee1e8caf53f28774f96cff92b652af952a9d1b45c0afc6607fa16c115b80c87e90db9b974bb9f9e
+AUX heimdal_fix-autoconf-2.70.patch 936 BLAKE2B 313982f105ac8549b4f6049bcc3b9ea21972584ce243860a105985c795166c8be7a8c6cff46810e6bf604e21f3ebe75cb1f0ecad5ab2aa96ab5f8719b1e19156 SHA512 71668c87242813320d57418b849158af1231e42a970d2e7b7bd64a28db6ce834179c2f1f27b9ff2be4c7ba349a73209d715a60bb8913f7cf4d20d1acc2e49c6e
 AUX heimdal_fix-db60.patch 443 BLAKE2B d89892570100dcc4a9b5bacd672cd28ce284ae9ad753189addf11359a01236a03280eb605ff136b290dcc379d182741d924e2392fc05642520278af8ecc310f7 SHA512 b6e80678801eaeee8c1aa2ec317a80b58cad3ca181aad14136cf352c55246ae36a43344b48a01bc9fc19c9ecfa383d9ab10892534ea60d25e36255fa049523a7
 AUX heimdal_hcrypto.patch 1522 BLAKE2B 3a66fe288a7bede24a6aa124fde058d5ea891a4f829566b3bccfb1d0800d7f9f076c2958ec756821f2b5f2d4249a59d4c9bb320ffa07c3a0e14533a013dbebe6 SHA512 6427258ba47c28415cf2b02e483ab2b29670cc803a7581a4d0102be14f5a102fab478b7c2735436603e44fd6e2d34fa2bbcd0dfc7cf15eca575fe424356baf99
 AUX heimdal_tinfo.patch 711 BLAKE2B 730ef4b1ba79d80c7257d1bd04783584cf616b2e51d6028fe3160dfdc113b6243c7af8c116ff969de439ebb79bab9091f8e5d6e9037c2b48541e6cbc83ba1026 SHA512 b4c63c9e945b914009569e62fd53229032ffaecde11dc4d02a89d5ba65f2c28020d43af8f2c26d87e2b383ba6dd3c3f4c4b69529471bc1928b45a9b5c437958d
@@ -15,5 +16,5 @@ AUX krb5.conf 424 BLAKE2B 49b8a0aab6e0dacb70b91e030bb5f2b8bdfe4253026f85e2c9d16b
 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.6.0.ebuild 4512 BLAKE2B a4e4293543cde87d08cb1833480f278c5c2b2e9d7b138eeecc59668a829526e8bbf0d1aa610747166e9427f555d5c36117146f6399f048a22636df28c5d77107 SHA512 91ab34a629c2c7d909ba1d81538d9d543f8f66c26e32dbed4a45e8bf9358db817d4d56b8e85791fb17fddb51e7bc862a696d06c7f49f7a8d32c3c463b281c0e2
-EBUILD heimdal-7.7.0-r1.ebuild 4511 BLAKE2B f5063ce346f8d7c702bee5b2dbee3077d4f635ad439ed4566b2e835bb02dd501a4239c2de9973febba9eb76786745879457cabbbfb20b4f722bdd3dae4de1d04 SHA512 172bec83d21c91bce1ed233b2204b4c1a5c0e6ab49da8ad9fee920b49be55d88f0dc5a62512b5e8ef589783c33ee2f3752717e79fd58f6f339b0d44658073f2d
+EBUILD heimdal-7.7.0-r1.ebuild 4558 BLAKE2B 537f884969b9d8ea30e08f3183e8a41d2d16febdd8e43517e8415a0a5a5046e2374ded4089336959feef42b4373f2e470999c56f557518f12db9a79d4c913904 SHA512 3144c6e6b97273716ce56ef4099794451be9a4e927d0a53adbe66fe949ff46ff195b92a2b0379b622756010e35e7ad1130a41561283aab64c53d68e194a75123
 MISC metadata.xml 570 BLAKE2B 827b4e549ff73259b932cc8587625fd9dcd73553d7bee3726baae0d1de8d8e8f8d67fdd649d605099301f426b88fc654341005976a3373d61482c81dec67db5b SHA512 069fa36a8f551ae0fdfd3a6f3dfd6cbfb3bf56c2ceba6ecd5184c4686d885ce5aa83622090f7fa1df44924a7ac3bf63fed4b9b19e70254d2a6d883d483500ad8
diff --git a/app-crypt/heimdal/files/heimdal_fix-autoconf-2.70.patch b/app-crypt/heimdal/files/heimdal_fix-autoconf-2.70.patch
new file mode 100644
index 000000000000..0dcc31026203
--- /dev/null
+++ b/app-crypt/heimdal/files/heimdal_fix-autoconf-2.70.patch
@@ -0,0 +1,29 @@
+From 22352b90e78e2d162b98b5ef6c84672c397be40a Mon Sep 17 00:00:00 2001
+From: Lars Wendler <polynomial-c@gentoo.org>
+Date: Wed, 17 Mar 2021 17:49:18 +0100
+Subject: [PATCH] autoconf-2.70 fix
+
+autoconf-2.70 and newer are more strict with quoting etc. and thus generate
+a broken configure file:
+
+  configure: 20855: Syntax error: ")" unexpected (expecting "fi")
+
+Gentoo-bug: https://bugs.gentoo.org/776241
+Signed-off-by: Lars Wendler <polynomial-c@gentoo.org>
+---
+ cf/check-var.m4 | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/cf/check-var.m4 b/cf/check-var.m4
+index 2fd7bca6f0..71d6f70ca8 100644
+--- a/cf/check-var.m4
++++ b/cf/check-var.m4
+@@ -20,7 +20,7 @@ AC_MSG_RESULT($ac_foo)
+ if test "$ac_foo" = yes; then
+ 	AC_DEFINE_UNQUOTED(AS_TR_CPP(HAVE_[]$1), 1, 
+ 		[Define if you have the `]$1[' variable.])
+-	m4_ifval([$2], AC_CHECK_DECLS([$1],[],[],[$2]))
++	m4_ifval([$2], [AC_CHECK_DECLS([$1],[],[],[$2])])
+ fi
+ ])
+ 
diff --git a/app-crypt/heimdal/heimdal-7.7.0-r1.ebuild b/app-crypt/heimdal/heimdal-7.7.0-r1.ebuild
index e6fabf4e9541..1140bf30c50e 100644
--- a/app-crypt/heimdal/heimdal-7.7.0-r1.ebuild
+++ b/app-crypt/heimdal/heimdal-7.7.0-r1.ebuild
@@ -73,6 +73,7 @@ PATCHES=(
 	"${FILESDIR}/heimdal_hcrypto.patch"
 	"${FILESDIR}/heimdal_build-headers-before-use.patch"
 	"${FILESDIR}/heimdal_fix-db60.patch"
+	"${FILESDIR}/heimdal_fix-autoconf-2.70.patch"
 )
 
 src_prepare() {
diff --git a/app-crypt/libnitrokey/Manifest b/app-crypt/libnitrokey/Manifest
index e26059ca6150..e0a94d679b81 100644
--- a/app-crypt/libnitrokey/Manifest
+++ b/app-crypt/libnitrokey/Manifest
@@ -2,6 +2,6 @@ AUX libnitrokey-3.5-tests-version-gitless.patch 789 BLAKE2B 9e184e9e51837796b65c
 DIST libnitrokey-3.5.tar.gz 94356 BLAKE2B 9e53213f309e903d26e0e8e01ab213d6bc42c5b8d720e4b19f27adb607f20ad0c6e1707bf7b55c525efbd6a4fbf7b9c87983decf6b05dab7d03701ae0ea8277f SHA512 d2a95071e92d839c8cde4ac1435158bb469c25662f2988a4e824dbc0dfe83af841e6d04589293deddd77746dbec17b30c50fab69af58cc727ed5e0f2dbd0b5e7
 DIST libnitrokey-3.6.tar.gz 98038 BLAKE2B 27f99e7b6de93548fc7a373f37ce784da0aa50503a5c635b4d90282e6330a5ff4c0dcc03a83a7e57045b8a1aabaab27d76a090d7c49693a6ff1037b81e75ece9 SHA512 a00a6724e5c64715eca688ec254efd979acceb5ff4cad28a205f7128e44db8674a5924634fd7da6c69d589deafca7b28b99e1d05a244c321d5cb429f2e5a3bec
 EBUILD libnitrokey-3.5.ebuild 1123 BLAKE2B 3ae935e945aecc878babb981f1989d8105c02d95ccdc652b9367643449bab791e5ae8979a780c2aea3b7b5a235e1b0d0889bb5bea977a0c915dade5d9097b88b SHA512 ccdb2e813224866ac7955abb89d13f9e58f29e751b6fa5008940a3118cc607d6c1a775a0f0b72ab00a5fbba17e6a54b814b3495a0ff66d667b1179f12e02a85d
-EBUILD libnitrokey-3.6.ebuild 1048 BLAKE2B e49ec7cfed9deb08f1757d14762694638230366aa674cd07e90d65de6ebfef55e9de4c6ce8685a47ef7d07eda954a2036f0874d7e408b964cbc0c852781afc3e SHA512 8f4dd941bc7150e8fc3fb126d5ffa8009f2893b2d40da5c7a64347f3efdf080d7069dac4a1bc93567e41950e3c74c0bc470170577658a4c925a570a30b0d5b7d
+EBUILD libnitrokey-3.6.ebuild 1046 BLAKE2B 19c6e6213b1200743567759d12f9328582273c5f0f1c4fb984e14f6d73e37a0c7fb67f0d874e6f3856a6ea6fee7e213b979f16b19caa3f1559eb6e6e8f823107 SHA512 89e10ca9584e329255753c24f496087b9ca09ba18e623a8938282b9d6f91ff0df457417ebc586aa6b5947d43c632499cd1fe007bdddb91f4788bb139cceabbba
 EBUILD libnitrokey-9999.ebuild 1048 BLAKE2B e49ec7cfed9deb08f1757d14762694638230366aa674cd07e90d65de6ebfef55e9de4c6ce8685a47ef7d07eda954a2036f0874d7e408b964cbc0c852781afc3e SHA512 8f4dd941bc7150e8fc3fb126d5ffa8009f2893b2d40da5c7a64347f3efdf080d7069dac4a1bc93567e41950e3c74c0bc470170577658a4c925a570a30b0d5b7d
 MISC metadata.xml 397 BLAKE2B ec7996ade24566ed79175f047e18c18a7c51e3946c65c4b3cd986d3fe6372ed2a79ca13b6e2d0a21b5e907a2f8e27e7061ad9ce893ffbd93ead06c8814f4d00c SHA512 457d69deef3f3bcca1ac0b0a15d20ca03bf012523a03c311c5be065ad50a43ef5d7e0d7fb949a6a63f3198c35313d83e0e7a8ef882c1095234f93a2dd8be416e
diff --git a/app-crypt/libnitrokey/libnitrokey-3.6.ebuild b/app-crypt/libnitrokey/libnitrokey-3.6.ebuild
index 8687d0d1b4e3..ecef8c9b5c2d 100644
--- a/app-crypt/libnitrokey/libnitrokey-3.6.ebuild
+++ b/app-crypt/libnitrokey/libnitrokey-3.6.ebuild
@@ -16,7 +16,7 @@ if [[ ${PV} == *9999 ]]; then
 	EGIT_SUBMODULES=()
 else
 	SRC_URI="https://github.com/Nitrokey/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~ppc64 ~x86"
+	KEYWORDS="amd64 ~ppc64 x86"
 fi
 
 LICENSE="GPL-3"
diff --git a/app-crypt/loop-aes-losetup/Manifest b/app-crypt/loop-aes-losetup/Manifest
index 5c8b9adc7168..79a6aca11817 100644
--- a/app-crypt/loop-aes-losetup/Manifest
+++ b/app-crypt/loop-aes-losetup/Manifest
@@ -4,4 +4,4 @@ DIST util-linux-2.28.2.tar.xz 4149700 BLAKE2B da38a047b4a7dc867ba72aea149d515665
 DIST util-linux-2.35.2.tar.xz 5150488 BLAKE2B 93eb90ab33db7795b46425ec4ec87f8a2d3d6e0dad671345375ea02efd654bf72041932d30b41bea494e4b62952e2fd14ea9f9e6c738d4eb4b050bd170b9bb0e SHA512 59e038ba71aa74c9af6f927b357483a965f675ab3ffcd25cf0c1b043656312d2d2d07c55659fd3da69ede165bec313e0ae7e1cd73758e49681ae610604b399a2
 EBUILD loop-aes-losetup-2.28.2.ebuild 2390 BLAKE2B 6ef1db9002469b21f72be1b318f9499c4c92dbb5c5b4fd4f1e3e4de6bafcef465277f9a5645661f0015a492e6ae1a81aa937e787e99d53f8f9757bb0aa9354fa SHA512 30d817b41727ab72018e2b637ed3705c07ede678bb6a20bf221ab4cfc69a62c37025a4969a4b84235fe3b25b7f7b0b354c0c6a406893c43af13dbc4dcbbb3e27
 EBUILD loop-aes-losetup-2.35.2.ebuild 2178 BLAKE2B 107eeffbd0719d1d89a8ffba218ab9859c9b5ff06a9338d55a6feacd91126a3ebee2419ca781fa870db0c8cc2bd5dc5874cb55ccf6730efbdb964faa335e4922 SHA512 34cdf0cc74b9646bfc2b2d47d1c6c8f35cf051505db1fab8ed7285c86bd633189d29a255e7de1a874412045e7c9770d58fc6035bc2c0bcf079c5a1fdec72fd92
-MISC metadata.xml 444 BLAKE2B 0c31c7861ba6458dd10ef779ca1d7b5a71dceb156e762b8cbed70960766043aa206338561244da09335973f0e03f9b08e6fa5f1b61edf601033c434beb5b562c SHA512 b2f7754872e47e627cf7cefa9ccb1bfc70e7d2c9b36f5b9adbb3094e28b5945436381c9bbef60ba34188a029c3cfe8cadade00fa563e6e4f89afcc0f6516bb81
+MISC metadata.xml 474 BLAKE2B 39d29a21dbe4702ee734066aac4bf46c6a1eef3c9953289910e5f0f9d66ede6e317bc8fc5fedf08f7a5af2e3021af54569a4b36f3654b2f40e025ab690e23f88 SHA512 28270b23d0effc7f6445e87d7b781d9a40d789a4f6042f6e9ff2db8fec7cd0049cbd09aba181fd67e933a7c1bdc522ac32779f08df1a49411c1911a0d6278b8d
diff --git a/app-crypt/loop-aes-losetup/metadata.xml b/app-crypt/loop-aes-losetup/metadata.xml
index 41aceca13764..2e05891f2547 100644
--- a/app-crypt/loop-aes-losetup/metadata.xml
+++ b/app-crypt/loop-aes-losetup/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>hlein@korelogic.com</email>
 		<name>Hank Leininger</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/app-crypt/metadata.xml b/app-crypt/metadata.xml
index d508e6060e4c..c60e6f5cea36 100644
--- a/app-crypt/metadata.xml
+++ b/app-crypt/metadata.xml
@@ -37,4 +37,3 @@
 		szyfrowaniem, deszyfrowaniem, stenografią oraz podpisywaniem danych.
 	</longdescription>
 </catmetadata>
-
diff --git a/app-crypt/monkeysphere/Manifest b/app-crypt/monkeysphere/Manifest
index 84b975c9ae82..e99f86e90380 100644
--- a/app-crypt/monkeysphere/Manifest
+++ b/app-crypt/monkeysphere/Manifest
@@ -1,14 +1,4 @@
-AUX monkeysphere-0.36_default_shell.patch 466 BLAKE2B be3f2818c3d31400235fe413fb55ea79cdad0cf441a3a841465d11c9467f948f790337dfc1c07bd1bead1f3c58a3b157800b64eb9bc98ada7f263fd7b1c221f4 SHA512 c77042e07372ae2b7434c03529a10afd5d13f99af025cecf53bd433341a3c70ada4cedd904de67090f36cd3dcd7f77f7a46b739116b1248b432803fc137fa7e8
-AUX monkeysphere-0.36_hd_od.patch 528 BLAKE2B 9ba0ae67297716b2379fc7141f6e60f0af68f9290654641946ad94fb6e04d16ede747bd334639c96c6f241e98331cba1373bf5a1c012a15460b58cffe0227ce3 SHA512 412656731fced9ca5e7b1c253e8cacfc47bf45ce7ff28da9e1db1582aa84fa75f098cdd098dc6d33198eedbc87ea397569ebf0045b6291106481e7a11fb04e55
-AUX monkeysphere-0.36_non_default_port.patch 418 BLAKE2B 8abc99d21b539e1b11eab3c689783646c15337e3276c55baf8ef43577fc08c1cd68c85f6555a8685ba1741988e0f2ae31b757795a40ecd30411b00e05958799b SHA512 2a173500e0b659a79a7274e042e49a282f708cda0f6a78ce8fa126013e35c4f6f117e606b90ce31da5158e58ab52a236038a913cc98c5ae1fc8e04a5dcbf816e
-AUX monkeysphere-0.36_openpgp2ssh_sanity_check.patch 1194 BLAKE2B af75804e5ea457c63e6e904e2f1ffde393e3ab06a8222527b825212f44b253ad7d418a1d10a6abd2204332065a2ba5bbbdff09a14181f0fc8bcac6808cdc64fd SHA512 b14c421e5880407b3acb845b235c89c5338a1fc1285b514679de09371db38e42aa3371ef2916c57d5ab10f08bc19f5c864762ff7eaf0a054d2817bc6bcaab488
-AUX monkeysphere-0.36_tests_gnupg2.patch 2272 BLAKE2B fd690dfe4fd357f7a6c551698c8cc897d2c5f34ae44fffd77f4a63de9a25173b3f84dfe7aa3877cd0c724650de250c72ee55f63e1aa658421188658691f02270 SHA512 e75f82793419dd2e99aa95765e9d954437d0e78294ed4188a9e7fa246b85ddbcd755eb566a1e9a9c20f2f2634150d65caa0715993863f59f9146f5cc95457975
-AUX monkeysphere-0.36_userid_empty_line.patch 292 BLAKE2B 5ce813bca6235a365d69f3c8d19b6f39dbb981af57e8171efeeb921f2e0b9c4e73c531838a87e3275809e427a3d7b7e75ad88341ab3dc05a5258f6a7fab6af6d SHA512 15b8e8ff71537e79d069d0f298326cc6705931c58ff1cf2f16c5486e587fe69f610dc1e0ebd0006e0bdef12f936685a0594dc3f9dbdadb928fba25a8e2982eb7
 AUX monkeysphere-0.44-install-uncompressed-man-pages.patch 1580 BLAKE2B 54db4bdeb8d93406d6f9fa222118c98e0a1cfbbdaaf02f280024a41a9c4842aecbbcd6735cdc9ed9949e0e5463f8bf940b642b632c385d48d4dcf36a28a1cd69 SHA512 c4c677e08130ac01a3e98ba21f5e68e5bd7ce4765b44ed91ca5e0506d22937fc13f1a0dfdcd86f1e093e666882452b112a52b954d5f33ee73a47381a28d2e11c
-DIST monkeysphere_0.36.orig.tar.gz 98876 BLAKE2B 5f8dcd5349cd038208fcc00dff19c7d001ca8b763f223e832c820bc4f09391ff78667f80af691c0234aed810f4d5aa77d26a378a88b41a4b115ab528e0cdd9ed SHA512 eb6776bd9996db8a5d6a1d16b5b06e6733069cbb3cb35f4e3965508575e084c6f08576f31c71429432daf93910d145804ecf155c3d7550a0f4550a056cb4f0c8
-DIST monkeysphere_0.41.orig.tar.gz 109040 BLAKE2B dadbd65c879bc8e73e7dd1360ebe7f7242aef125af3907d4487f8d0711afda6d87736ab82938867201eead5c1008d192dbd90602eff5a4843d990b3c87ee2949 SHA512 fcc3dd6c191635ed7ef27a8219d4c9d7043629dc8a02de947fcc4dfc8e612ec767f68d4e4c41252a0c0fc80e4184018e53991d85fcde50cb5def75b925341962
 DIST monkeysphere_0.44.orig.tar.gz 110289 BLAKE2B 8a067035d3a40436fd5c27291ab25f15d475d9a0f17b51259c0431c77841807af93cb04d045b77c5f5dda3cd0061ab52561fdb62a704715d0d8cbbf96cb43259 SHA512 cb3c655a08b1c0a382502f8609f57d0c870fe4491b1b967e9931bdfd146b3926470496577949630452e073f04442b91a1ef679254c0f3091a834f3429e0f8e93
-EBUILD monkeysphere-0.36-r2.ebuild 1781 BLAKE2B 76df9b0b9204bdc2b9250b00e30660ac613c34efa3a2bff2f7a01aa05bf838455c8fd0dda653594619e0255b42ddf7ebcd8f5d3dc3ee65e949948d7249424395 SHA512 f6da7b96ffce5bc0e6eb4fa83df65f47b12882b65fe44f3c8e45b2d38387cc82de9185262ad6fe93a9cddb61929ea3651c7a30979a572dc9ac5a1d24550255f8
-EBUILD monkeysphere-0.41.ebuild 1372 BLAKE2B a290eb661701e8e2e930a25c584d54fc9c31b9373e0d181ffaa03074d04b8c39c7540c9e2a5bb4fc4558354103d34d9ebcdee29a5d941b32a7be673f2efb7f9f SHA512 5f044379bf2b0577bd322685eed5951c6271e8b55ee8338ccc517fc239f743ee43160c32b8293e8a8c345ef395fea7845e1cb4ddc33a705f75c5ef25f227b91f
-EBUILD monkeysphere-0.44.ebuild 1081 BLAKE2B 9c99e3a87ab77e83f1bc8c42c24142f5fbc318c9726c344a79d11508f0d767253e9d118dfade187bc7ecf023c53b0dd2d9dbea9896be3ecba1da030845b25aa4 SHA512 7228951f276d62d01e302f5dcba2cdebcbf0bf4e4dab2986b8d6f9332d4f1e7fa20eaa6a049d7744c15bd5c2eabb9ddaf3bfacc41f38a3244841b0d26ae49b7a
+EBUILD monkeysphere-0.44.ebuild 1079 BLAKE2B d464af629e7a4c91046bb6ff72c275f2b1b4ae8bdf3b8693d92877d3aa76209917e28441be92d553f506cad07f22e7155fc37e64f193f4a3fcfdfc33c9aa2568 SHA512 be037180395aaaeed4e1de486309f21e3ed7a73c6107ad96cec25493e3b09b1465640bd6881cf1b323c907f2540c50ed2010178a02566951065f6b192cc78e0b
 MISC metadata.xml 167 BLAKE2B e4dadf27fd344484f2bccb5b904909c89aac568c32e5b3c44bdf139eacefd4b4fae74419f503d2b7da0dccc1b68ba05d777d11292c0f89270d1ac5c9c703e8ca SHA512 7c8decb24ee3a850e38186cf3c7f8933a28017426806870ad6ef9ceb2533be147a2681fc789b535a81cb528af8c29d90d3006e4f250aee23bd7dea4561294e33
diff --git a/app-crypt/monkeysphere/files/monkeysphere-0.36_default_shell.patch b/app-crypt/monkeysphere/files/monkeysphere-0.36_default_shell.patch
deleted file mode 100644
index f979114181d1..000000000000
--- a/app-crypt/monkeysphere/files/monkeysphere-0.36_default_shell.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -r d0c02fe6a949 src/share/common
---- a/src/share/common	Sun Oct 06 19:21:18 2013 +0200
-+++ b/src/share/common	Sun Oct 06 19:21:49 2013 +0200
-@@ -108,7 +108,7 @@
-          # if root, su command as monkeysphere user
- 	'root')
-             # requote arguments using bash builtin feature (see "help printf"):
--	    su "$MONKEYSPHERE_USER" -c "$(printf "%q " "$@")"
-+	    su -s /bin/bash "$MONKEYSPHERE_USER" -c "$(printf "%q " "$@")"
- 	    ;;
- 
- 	# otherwise, fail
diff --git a/app-crypt/monkeysphere/files/monkeysphere-0.36_hd_od.patch b/app-crypt/monkeysphere/files/monkeysphere-0.36_hd_od.patch
deleted file mode 100644
index 7cdaa74b5735..000000000000
--- a/app-crypt/monkeysphere/files/monkeysphere-0.36_hd_od.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff -r 6150774ec7f4 tests/keytrans
---- a/tests/keytrans	Sun Feb 16 20:11:02 2014 +0100
-+++ b/tests/keytrans	Sun Feb 16 20:11:40 2014 +0100
-@@ -104,8 +104,8 @@
-     <(gpg --list-packets < "$TEMPDIR"/converted.secret.key)
- 
- diff -u \
--    <(hd "$TEMPDIR"/secret.key) \
--    <(hd "$TEMPDIR"/converted.secret.key)
-+    <(od -xc "$TEMPDIR"/secret.key) \
-+    <(od -xc "$TEMPDIR"/converted.secret.key)
- 
- KEYFPR=$(gpg --fingerprint --with-colons --list-keys | grep ^fpr | cut -f10 -d:)
- KEYID=$(printf "%s" "$KEYFPR" | cut -b25-40)
diff --git a/app-crypt/monkeysphere/files/monkeysphere-0.36_non_default_port.patch b/app-crypt/monkeysphere/files/monkeysphere-0.36_non_default_port.patch
deleted file mode 100644
index f14550280fcf..000000000000
--- a/app-crypt/monkeysphere/files/monkeysphere-0.36_non_default_port.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff -r 5f7ee764ec1f src/share/common
---- a/src/share/common	Mon Oct 07 19:22:36 2013 +0200
-+++ b/src/share/common	Mon Oct 07 19:22:58 2013 +0200
-@@ -863,6 +863,10 @@
- 		    ;;
- 		('known_hosts')
- 		    host=${userID#ssh://}
-+	    	    if [[ "${host}" == *:* ]]; then
-+			IFS=':' read -a ARR <<< "${host}"
-+			host="[${ARR[0]}]:${ARR[1]}"
-+		    fi
- 		    remove_line "$keyFile" "$host" "$sshKey"
- 		    ;;
- 	    esac
diff --git a/app-crypt/monkeysphere/files/monkeysphere-0.36_openpgp2ssh_sanity_check.patch b/app-crypt/monkeysphere/files/monkeysphere-0.36_openpgp2ssh_sanity_check.patch
deleted file mode 100644
index aec90eb07661..000000000000
--- a/app-crypt/monkeysphere/files/monkeysphere-0.36_openpgp2ssh_sanity_check.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-diff --git a/src/monkeysphere-authentication b/src/monkeysphere-authentication
-index edc7995..2711ff2 100755
---- a/src/monkeysphere-authentication
-+++ b/src/monkeysphere-authentication
-@@ -84,6 +84,13 @@ gpg_sphere() {
-     su_monkeysphere_user gpg --fixed-list-mode --no-greeting --quiet --no-tty "$@"
- }
- 
-+check_openpgp2ssh_sanity() {
-+    if [[ `su_monkeysphere_user openpgp2ssh ABC &>/dev/null || echo $?` != "255" ]]; then
-+    echo "openpgp2ssh command gives unexpected return code. This can lead to a scenario where no authorized keys are populated, even though they are otherwise valid. Aborting!"
-+    exit 1
-+    fi; 
-+}
-+
- # output to stdout the core fingerprint from the gpg core secret
- # keyring
- core_fingerprint() {
-@@ -163,6 +170,7 @@ case $COMMAND in
-     'update-users'|'update-user'|'update'|'u')
- 	source "${MASHAREDIR}/setup"
- 	setup
-+	check_openpgp2ssh_sanity
- 	source "${MASHAREDIR}/update_users"
- 	OUTPUT_STDOUT= update_users "$@"
- 	;;
-@@ -171,6 +179,7 @@ case $COMMAND in
- 	(( $# > 0 )) || failure "Must specify user."
- 	source "${MASHAREDIR}/setup"
- 	setup
-+	check_openpgp2ssh_sanity
- 	source "${MASHAREDIR}/update_users"
- 	OUTPUT_STDOUT=true update_users "$1"
- 	;;
diff --git a/app-crypt/monkeysphere/files/monkeysphere-0.36_tests_gnupg2.patch b/app-crypt/monkeysphere/files/monkeysphere-0.36_tests_gnupg2.patch
deleted file mode 100644
index 712734459054..000000000000
--- a/app-crypt/monkeysphere/files/monkeysphere-0.36_tests_gnupg2.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-diff -r c13f4b11061e tests/keytrans
---- a/tests/keytrans	Sun Feb 16 19:24:08 2014 +0100
-+++ b/tests/keytrans	Sun Feb 16 19:27:42 2014 +0100
-@@ -131,9 +131,9 @@
- cat >"$TEMPDIR"/expectedout <<EOF
- pub:u:1024:1:$KEYID:$timestamp:::u:::scSC:
- uid:u::::$timestamp::E90EC72E68C6C2A0751DADC70F54F60D27B88C3D::monkeymonkey:
--sig:!::1:$KEYID:$timestamp::::monkeymonkey:13x:
-+sig:!::1:$KEYID:$timestamp::::monkeymonkey:13x:::::8:
- uid:u::::$timestamp::8200BD0425CC70C7D698DF3FE412044EAAB83F94::testtest:
--sig:!::1:$KEYID:$timestamp::::monkeymonkey:13x:
-+sig:!::1:$KEYID:$timestamp::::monkeymonkey:13x:::::8:
- EOF
- 
- diff -u "$TEMPDIR"/expectedout <(gpg --check-sigs --with-colons | grep -v ^tru)
-@@ -159,10 +159,10 @@
- cat >"$TEMPDIR"/expectedout <<EOF
- pub:u:1024:1:$KEYID:$timestamp:::u:::scSC:
- uid:u::::$timestamp::E90EC72E68C6C2A0751DADC70F54F60D27B88C3D::monkeymonkey:
--sig:!::1:$KEYID:$timestamp::::monkeymonkey:13x:
-+sig:!::1:$KEYID:$timestamp::::monkeymonkey:13x:::::8:
- uid:r::::::8200BD0425CC70C7D698DF3FE412044EAAB83F94::testtest:
--sig:!::1:$KEYID:$timestamp::::monkeymonkey:13x:
--rev:!::1:$KEYID:$revtime::::monkeymonkey:30x:
-+sig:!::1:$KEYID:$timestamp::::monkeymonkey:13x:::::8:
-+rev:!::1:$KEYID:$revtime::::monkeymonkey:30x:::::8:
- EOF
- 
- 
-@@ -190,15 +190,15 @@
- cat >"$TEMPDIR"/expectedout <<EOF
- pub:u:1024:1:$KEYID:$timestamp:::u:::scSC:
- uid:u::::$timestamp::E90EC72E68C6C2A0751DADC70F54F60D27B88C3D::monkeymonkey:
--sig:!::1:$KEYID:$timestamp::::monkeymonkey:13x:
-+sig:!::1:$KEYID:$timestamp::::monkeymonkey:13x:::::8:
- uid:r::::::8200BD0425CC70C7D698DF3FE412044EAAB83F94::testtest:
--sig:!::1:$KEYID:$timestamp::::monkeymonkey:13x:
--rev:!::1:$KEYID:$revtime::::monkeymonkey:30x:
-+sig:!::1:$KEYID:$timestamp::::monkeymonkey:13x:::::8:
-+rev:!::1:$KEYID:$revtime::::monkeymonkey:30x:::::8:
- uid:u::::$timestamp::EDDC32D783E7F4C7B6982D9AE5DC4A61000648BA::baz:
--sig:!::1:$KEYID:$timestamp::::monkeymonkey:13x:
-+sig:!::1:$KEYID:$timestamp::::monkeymonkey:13x:::::8:
- pub:-:1024:1:$NEWKEYID:$(($timestamp + 1)):::-:::caCA:
- uid:-::::$(($timestamp + 1))::A0D708F51CC257DEFC01AEDE1E0A5F329DFD8F16::fubar:
--sig:!::1:$NEWKEYID:$(($timestamp + 1))::::fubar:13x:
-+sig:!::1:$NEWKEYID:$(($timestamp + 1))::::fubar:13x:::::8:
- EOF
- 
- echo "test: diff expected gpg list output"
diff --git a/app-crypt/monkeysphere/files/monkeysphere-0.36_userid_empty_line.patch b/app-crypt/monkeysphere/files/monkeysphere-0.36_userid_empty_line.patch
deleted file mode 100644
index 70c7cffe7dc4..000000000000
--- a/app-crypt/monkeysphere/files/monkeysphere-0.36_userid_empty_line.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -r 2315bb7781c6 src/share/common
---- a/src/share/common	Thu Oct 10 19:25:10 2013 +0200
-+++ b/src/share/common	Thu Oct 10 19:25:50 2013 +0200
-@@ -917,7 +917,7 @@
-     IFS=$'\n'
-     while read line ; do
- 	case "$line" in
--	    ("#"*)
-+	    ("#"*|"")
- 		continue
- 		;;
- 	    (" "*|$'\t'*)
diff --git a/app-crypt/monkeysphere/monkeysphere-0.36-r2.ebuild b/app-crypt/monkeysphere/monkeysphere-0.36-r2.ebuild
deleted file mode 100644
index 63a671e3e588..000000000000
--- a/app-crypt/monkeysphere/monkeysphere-0.36-r2.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils user
-
-DESCRIPTION="Leverage the OpenPGP web of trust for OpenSSH and Web authentication"
-HOMEPAGE="http://web.monkeysphere.info/"
-
-LICENSE="GPL-3"
-SLOT="0"
-IUSE=""
-SRC_URI="mirror://debian/pool/monkeysphere/m/monkeysphere/monkeysphere_${PV}.orig.tar.gz"
-KEYWORDS="~amd64 ~arm ~x86"
-
-DOCS=( README Changelog )
-
-# Tests fail upstream for SSH connection. Issue has been reported.
-RESTRICT="test"
-
-DEPEND="app-crypt/gnupg
-	net-misc/socat
-	dev-perl/Crypt-OpenSSL-RSA
-	dev-perl/Digest-SHA1
-	app-misc/lockfile-progs"
-
-RDEPEND="${DEPEND}"
-
-pkg_setup()
-{
-	einfo "Creating named group and user"
-	enewgroup monkeysphere
-	enewuser monkeysphere -1 -1 /var/lib/monkeysphere monkeysphere
-	# Using fperms and fowner in src_install leave unusable config with error
-	# Authentication refused: bad ownership or modes for directory /var/lib/monkeysphere
-	chown root:monkeysphere /var/lib/monkeysphere
-	chmod 751 /var/lib/monkeysphere
-}
-
-src_prepare()
-{
-	epatch "${FILESDIR}/${P}_default_shell.patch"\
-	       "${FILESDIR}/${P}_non_default_port.patch"\
-	       "${FILESDIR}/${P}_userid_empty_line.patch"\
-	       "${FILESDIR}/${P}_openpgp2ssh_sanity_check.patch"\
-	       "${FILESDIR}/${P}_hd_od.patch"
-
-	sed -i "s#share/doc/monkeysphere#share/doc/${PF}#" Makefile || die
-
-	# Output format of gpg --check-sigs differ between 1.4 and 2.0 so test
-	# needs to be updated if 2.0 is used
-	if has_version '>=app-crypt/gnupg-2.0.0:0'; then
-		epatch "${FILESDIR}/${P}_tests_gnupg2.patch"
-	fi;
-}
-
-src_install()
-{
-	default
-	dodir /var/lib/monkeysphere
-}
-
-pkg_postinst()
-{
-	#This function is idempotent, make sure it is run at least once.
-	monkeysphere-authentication setup || die
-}
diff --git a/app-crypt/monkeysphere/monkeysphere-0.41.ebuild b/app-crypt/monkeysphere/monkeysphere-0.41.ebuild
deleted file mode 100644
index fc2a5255bbe5..000000000000
--- a/app-crypt/monkeysphere/monkeysphere-0.41.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils user
-
-DESCRIPTION="Leverage the OpenPGP web of trust for OpenSSH and Web authentication"
-HOMEPAGE="http://web.monkeysphere.info/"
-
-LICENSE="GPL-3"
-SLOT="0/0"
-IUSE=""
-SRC_URI="mirror://debian/pool/monkeysphere/m/monkeysphere/monkeysphere_${PV}.orig.tar.gz http://archive.monkeysphere.info/debian/pool/monkeysphere/m/monkeysphere/monkeysphere_${PV}.orig.tar.gz"
-KEYWORDS="amd64 ~arm x86"
-
-DOCS=( README Changelog )
-
-## Tests fail upstream for SSH connection. Issue has been reported.
-RESTRICT="test"
-
-DEPEND="app-crypt/gnupg:0=
-	net-misc/socat:0=
-	dev-perl/Crypt-OpenSSL-RSA:0=
-	dev-perl/Digest-SHA1:0=
-	app-misc/lockfile-progs:0="
-
-RDEPEND="${DEPEND}"
-
-pkg_setup()
-{
-	einfo "Creating named group and user"
-	enewgroup monkeysphere
-	enewuser monkeysphere -1 -1 /var/lib/monkeysphere monkeysphere
-	# Using fperms and fowner in src_install leave unusable config with error
-	# Authentication refused: bad ownership or modes for directory /var/lib/monkeysphere
-	chown root:monkeysphere /var/lib/monkeysphere
-	chmod 751 /var/lib/monkeysphere
-}
-
-src_prepare()
-{
-	sed -i "s#share/doc/monkeysphere#share/doc/${PF}#" Makefile || die
-}
-
-src_install()
-{
-	default
-	dodir /var/lib/monkeysphere
-}
-
-pkg_postinst()
-{
-	monkeysphere-authentication setup || die
-}
diff --git a/app-crypt/monkeysphere/monkeysphere-0.44.ebuild b/app-crypt/monkeysphere/monkeysphere-0.44.ebuild
index 63b1bd885e78..c22ae2b8f88c 100644
--- a/app-crypt/monkeysphere/monkeysphere-0.44.ebuild
+++ b/app-crypt/monkeysphere/monkeysphere-0.44.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -12,7 +12,7 @@ IUSE=""
 SRC_URI="
 	mirror://debian/pool/monkeysphere/m/monkeysphere/monkeysphere_${PV}.orig.tar.gz
 	http://archive.monkeysphere.info/debian/pool/monkeysphere/m/monkeysphere/monkeysphere_${PV}.orig.tar.gz"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="amd64 ~arm x86"
 
 DOCS=( README Changelog )
 
diff --git a/app-crypt/moolticute/Manifest b/app-crypt/moolticute/Manifest
index 03911b6a239b..2a17aa3e4f35 100644
--- a/app-crypt/moolticute/Manifest
+++ b/app-crypt/moolticute/Manifest
@@ -3,4 +3,4 @@ AUX moolticuted.init 309 BLAKE2B 1f967b7e497e7e2d5547baf3e1b18127590997d8221ed34
 DIST moolticute-0.43.19.tar.gz 5675421 BLAKE2B 8fbe68a86978970768870ac334c38b5cd532e97cb29e03975d6700a98074c51959747c35dee528275b41ef08cf42817f69337c8b93b8c2554729754d4ee818dd SHA512 fb343411854490f8e9bf937728889fc329d2f90274a34bafebacf711b02b3ff04ecad34480b786a59fda07a50f12f572b58fd2c397d46b63dc76df9228ad8711
 EBUILD moolticute-0.43.19.ebuild 1234 BLAKE2B b084b0e2a94b272d775823e64336de19f8aa377c44aabe733866fa9eb80bccf8ab366a29b0c2d9bfb094ac28d3ce2fb0d0b47138eec8d2c20667ff9183a4a511 SHA512 67b55d0e56e7c96f45af9cf41487fc4aa40cdbc700e03d10a4441cee5b376df51986ecb8f6433e5c905f99eb93986692d582dab9477ff396dcacf04d50a4f30a
 EBUILD moolticute-9999.ebuild 1234 BLAKE2B 1eb30c66363b678fe65906aeb0818dbd9a7dffe2e851d13ce62b71da58185e06be623db0ab0cc1368eea4d90ae117771b16d62f3d5f1d5edd6f183b8c7d10902 SHA512 75b781007c139ab687ee02af561afdcf890c0e6888949235d371bbc5e2017b65df275ef4f68a2bdd53a5c9baa5c79635585ad6b1bed08918f31daf8b8f342ebb
-MISC metadata.xml 530 BLAKE2B ab8901536d9ea0b2841cc0cb604cb7e0eab2765079d1964e561bcc61d10ba780cbce831eec8532cc5ed6866df98d0580ff9294ff10d571910bb67d10f065947c SHA512 8551a8d709f3a2fd054a948839518383d3d8f7187b507bcc275d5daa601e53fe1cc1cf3eb7c13c61f6318055964a0a1afba525726e65cd1e3f025b0266997d0e
+MISC metadata.xml 560 BLAKE2B 1a1a2fa92fa327ed5fb5630a5683741c05bfa774e88b3027b102538076c9297e66efe91ac6dbc9d20470bb49b28548926ea337b7a3212049d5327463ccdb1c70 SHA512 21e53b470ecab9422a51b45047cb21a984c8b018d948d58aa878271bb8297bf867141943e670028633151541fb2b2ff8e34930f16bde915e838e2df7dfa02e39
diff --git a/app-crypt/moolticute/metadata.xml b/app-crypt/moolticute/metadata.xml
index 874684f5407a..268fbb10dd58 100644
--- a/app-crypt/moolticute/metadata.xml
+++ b/app-crypt/moolticute/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>nemunaire@nemunai.re</email>
 		<name>Pierre-Olivier Mercier</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/app-crypt/nitrocli/Manifest b/app-crypt/nitrocli/Manifest
index 3bd3ba10b908..ea40099150a4 100644
--- a/app-crypt/nitrocli/Manifest
+++ b/app-crypt/nitrocli/Manifest
@@ -1,7 +1,5 @@
 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 anyhow-1.0.32.crate 28512 BLAKE2B c9c37e9bd70074d53b163a3077b7a5304d04b13ada50c020898ee2169ef4db2e26aeb283421f2e757c3d6e31c58ec1832162c1a01904a44b9fb4cf14ffe05d0c SHA512 4646a3b85459fefd826c11fcdf69e532467d2d6ec0711b8d26312483ba988fa8492fe2f727332c39479e25dd37ad04830ea4ab19034cdcdc639e226e2744dc90
-DIST argparse-0.2.2.crate 19440 BLAKE2B 7b15b2072ff52149bc08c5d02a266f2eef78a3aa8844e49154cf2ae1a9cb960ddc2a96a065b4aa44637aca8216211f2965291364d9f06ff6f68524a1f15dfed9 SHA512 97691566d3adc6f6be1c00cdca48424fd3576c372d1c995e7e31658bd20e17ef13553f7de21968ba189fd812928aeb93ef0fa89fe2fd258f45a0a8e095783706
 DIST arrayref-0.3.6.crate 10035 BLAKE2B 88292fa4b3ad4fccd03772c2f0eca04cc13373fe094358bac57d7523c256d89f3087603e5bcb2a0b15d8b2ecd48e904a822b2cb800276a9c47ad6c6b660d9d34 SHA512 368341d00706c1250ff081b0d99c36c9af694a62ff4f4d8c837234340295771ca49c5439b24b6e1a4f2c3c5821764e98881dcb22d793f83de632fd5cb457671f
 DIST arrayvec-0.5.1.crate 26816 BLAKE2B 172dab8f0129134dfc89c6032c5fc15e2f86a5cd1e5be18b87fe2108d18a1bdb0f597a6ed4cd214dc663fbfb27b05c66846fba4543b5e068b5c75d075bdc5bff SHA512 53db2fafea1f60ac1af9ecc0bc9b69010e9f8573048481d55969ecdc9f3d19832fe05824acf10a0186b0464f0fbfe898d73500fba39ed63650c64dac2c2e8043
 DIST autocfg-1.0.0.crate 12870 BLAKE2B 79e495d53298574afd3b292da7c9c363dcb3ea434fd44258efaf3628e95ebfc731f03083f8a1060272a2a3478a6452cdc41539e2dac08465cc6e6283844bf260 SHA512 451fc63148792ba1952b884170e3481359b01bacca5ec0456f43ca58f8e092b8f81c9764f8b00d4104059ff608089be5858220ee868127c064cc890c767ec3a3
@@ -9,7 +7,6 @@ DIST base32-0.4.0.crate 7791 BLAKE2B 6e457d08f6fe17159b0231b62774d2c366c623b07c7
 DIST base64-0.11.0.crate 48362 BLAKE2B 90d2a64496e20c4bcca6f21c2546474ec88283679ccae95303ea7521133414eba021810e64e5916e3980b6878f90281f09295ebadcc12324fc9a9060ac41a707 SHA512 31b5f56d4907a5e4ae40e92ef1629a446126525186f5236afc2475829bf2e5e067554db200a18f7b3ab741d0cc9c01e20612e77cc0cbc1bc2a4a8d11c0fdbf33
 DIST bitflags-1.2.1.crate 16745 BLAKE2B 0fa6d3ce44aad7616d5cd02aad8c1d0b0fed4022650eb43067c4a72e6fc88da05442674fa51826e4858a47c9de233e1ba2229820af094197cd11bb416ceffb2b SHA512 ad89b3798845e23737a620bba581c2ff1ff3e15bac12555c765e201d2c0b90ecea0cdbc5b5b1a3fa9858c385e8e041f8226f5acfae5bbbe9925643fff2bf3f0b
 DIST blake2b_simd-0.5.10.crate 34093 BLAKE2B 6e725c9399714d1e199277e3f9882d636c1737af5b0b290f853573575005d053d2ab3a34843461747914a0c25d370f0d5a5cbb46765fe99308c1fd7666d471c7 SHA512 7471e0347267a4b88e9eea932b3001c420da0a472b2ea0f20dff974789955d6d95e19d51e3a8a312516c7fc4c83b6af17cc59ea2b8fcd4ef879ebac22534307a
-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 clap-2.33.0.crate 196458 BLAKE2B 3bb62d817afc77b421a6282746b9b61367d224de6b614c7ed66bde452ce1046728077dab3368a46635b5c74d82ba3196586d87c0201478ce5b89638910dadb1a SHA512 f1075031414d48e4340bfe308904a95a31b72460724773c52a0bc8c004e625a04c904a39fc5420cb8c26a633321f9b5f4f69019c7aae5ed89900b63ed8c21a91
@@ -18,75 +15,49 @@ DIST crossbeam-utils-0.7.2.crate 34338 BLAKE2B 3cb287c7741c4d5b0551331634a75b066
 DIST directories-3.0.1.crate 15674 BLAKE2B 0650c306a6c1086b5f0b4dc49120c91c8f541bb275eb5a21166272fd8fccc4a20dda099e44cfe4c79e2ab82e0552a6390a5893f1ee7bf1f69e64737a41f6bcdf SHA512 840b325522cf9a6a20ad54885b1e0e16f2fb72de6c18ced24f3766dd8355329b7b9f1e6dfacaaf72623d0415b28e7dbbfff3234ff82e5c0fffa86772c3b4bad8
 DIST dirs-sys-0.3.5.crate 10643 BLAKE2B 8df1e6ca2c8e8560913bfb74e7bea1b12e1b13b6d337f3c76f517716622586cae8ff9999044e3265504a44f161526a79baffff2d123d3ea6c5cfebefcf498010 SHA512 ff7eb48943b61773dd2aa8dc10372186d613c225a2b39caf48966a1a5af087dd0177b8db80b1353a504af8aa1c8b4a0a849edf6c7e4389f6b753bfa3b7376833
 DIST envy-0.4.2.crate 10985 BLAKE2B 8a6f25fd3cdfcc17cfced55bdebbd9641eee3cb7a0d227f1c08837ed41e31fee8575875dc165139d83cd7e124a8998ce77d7d1d0f7ed230ee2e07cb7179b5798 SHA512 3188120adf5dcd72a3329561e8cb864865927df1d24dd7eae6f21df4156c2d8e6bc73351eeefd6c1ac62857bb6d3e154f682b7815a86b77c8047ae6afb88b74e
-DIST getrandom-0.1.13.crate 24581 BLAKE2B a61df4369526f860eef6952a021c3f473562cc4171c373c105d8944c305370592cd98a6c28cc0f8d00496f6b47cb900a4498dad942d0b6f60b4d8163d8904f14 SHA512 534b01d28bc9e69a5ad1e84f34aa4154939c27d70c5f557f15e669fa8894c375486ee945a6a6d8adaf1b6b7accda0e24963f70e77dd51ee0638a6ae6daa38925
 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.66.crate 457815 BLAKE2B 5da379ea738b75189e106d4be821c999394043303b8bb6a9caecdb1b53e449f11a58edc4589193611b76e7baf00e155ba1077bcca4d0cfae30826e946a0075f0 SHA512 5bf5645a7cbe626108cd71e1d189286ed161fcd3ea12cd34f4e392be4cf93bf78feb6128b1101bedc41a71091398f26771f3efd3880f779ee0be00f706914975
 DIST libc-0.2.69.crate 472393 BLAKE2B 41a9cd242ccc994c69da10f091061b2c31ed6a9c52cadb8e82fc7c5b7b5dd61c81ded5cfded098721500c87b021d5d79766571a7dd6fcde319c826e2e4244d38 SHA512 2addfd505e0904e18a600caa4e695536d2f95292af25906925066616bd588de9ea9abaae45bc8427bc6857c3b9fb6c4288e4cb48e3f1ba69ee1d7be8f3b3bcb6
-DIST memchr-2.2.1.crate 20862 BLAKE2B 79c8b7772f6c4e76ef98e416cab1a87648fe1f78f77eb31a894a2b1611fcf2d8336e361ab3d692cd03579b33f6bc5adb20d42418475dac5441b8bf356e38e442 SHA512 0f5e11507a4235edaa8ef639753abf62f1c187c8c6e35b0c80c9306958e41893492d4995e28bf28e5710e8739c7e75bb75a515507ec87870741a3b426ba8f44d
 DIST memchr-2.3.3.crate 22566 BLAKE2B f952070b98ef30f0d2780a6efbeb36d295710734f678517d913a8002cafebbd3cfc38975fc4546d306efc11bc815764d14320af3b7a2360bd46fc2ab3db9efa5 SHA512 922e05da920d0d94226857788878ee5e31518cd80d95ae57e1d7ecd233942c37d01565525db2f1dfdfd5b3b1f81b2c73eee058cbfd745cb4e1519518318df248
 DIST merge-0.1.0.crate 16946 BLAKE2B 1389893fdb788371e8f2526ef9fcc9e1b7a61a6f55fd092cc595339b9df9bc550546056191c1479ecaa13b88633e12656d2a8e217927495e0096ee5ca5641e47 SHA512 2adfef5cf142b06343e8f5816ffba7d031bc71b4a4e54170e36b88267d0c203ecc0cf084041cb25ae55df874fc80d55bd051c76f608ab85fd55f1b5512efe238
 DIST merge_derive-0.1.0.crate 2598 BLAKE2B 209381385224343cbe5b67b4fb4c21e0c0820a0abac19e8ff3baa0c1a4c8e403470d8de840c49f5c2f584ca2c5420c9709b9d598257e2067c037506fc019167e SHA512 cf3781464e4cbdfeee6e394dce38aeb41ac44a71f832907ea0e96c5e8fa0f78945e167f42c541e1ad8930b6583f82bf5c77c68db2165a48287d420570b1c5572
-DIST nitrocli-0.3.1.crate 67983 BLAKE2B 196076079b837f9fd622b0ca0ee63575cbe0a0e317321691472df489cea5b97e472477048a44dc46d5024c1882c1e8ad3305c95ce9e6da91412cf3f6c03737cd SHA512 4e4099400175115cd5304a2f135ec497d0fa3d74a2d19ceb1634b2d921d38f54cc5404ab4de31a511a0f2967ffff355ce34236ed3a3530a16e8e86b9d009fe83
-DIST nitrocli-0.3.2.crate 88594 BLAKE2B 8bbc50222724b674e2f76b6b945bf82fc86e4c7bfaa78eaa5806db69db3c324c9ab432f83425caa67a4e7ee275cf6404e9ed2d9ca9243ac05de53612333b5098 SHA512 48ee29dcadab938546bdb9c5d5a053e88d0860d6be6f27292db53fe304d32597a6c415fd61a1c69755e4f60b192a527de99fb603afb27b762a377e2a01bc0d9b
-DIST nitrocli-0.3.3.crate 89987 BLAKE2B bafa15d8d696d5899ac7d1a9af907d77e6ecf62cf09f7a9af5b01a9947926eb1544f2862322d912e283869067bea722e99693513d30ee367809de69ea54c32e2 SHA512 9bc58ea6d1d60985a0f7a8e07eef6a620805be6fc0284c8a43ecfede69e0421c40716812896609cb8516855900f8ed6017c4e693b5be422b00701b0c2437779a
 DIST nitrocli-0.3.4.crate 89135 BLAKE2B c79ce5b4617f47aad4c830d073b39795f6a106697d3ab85ba6f4dc7ad8633cade3aa840c9a117f7b0b4642594757131a5486b077605bcafba6192b28aad26400 SHA512 6a7a5a26af7ac4ddeb14e7612ba4c580c8d7025468a4ef15f102a0890f8ab6234d7ffabc39be04f348c26d87d43c07d2db9b890bf334821a4a6885428b44f682
 DIST nitrocli-0.3.5.crate 97613 BLAKE2B 0bfd97e8a8a643eaf74a7d678c093e3f5beb6851db2f4a1b4df7b2df543a9ee36e4c5de5cb1126799c24fa0c8412da44519a66a161cd9adcadd476789fb20f8a SHA512 7065333b0138a6283224cd604786545fc84360c582f69d0c7ef40ea4d5f8e1bf440d622e958ff84c6ddd4a342c7f38635e222c0f85772ac894afeb68e79e603a
-DIST nitrokey-0.4.0.crate 34431 BLAKE2B 97e5de4f53beabb90ca00685bc62cce152d320bde7092a2a1b911a00a6d6a4bd2bedf5e93e584fd268b119de6626f499ad75c01c715d840be84a94965b90c450 SHA512 b84440bf8624848be5db7c2547d30ebdc9d8bbc8ad09a8809a1a05104f6cb2efe8f5ebd9abd9825ad5028aa474ab556a83836ce4390e650484e0ed1e73543c3c
-DIST nitrokey-0.6.0.crate 42218 BLAKE2B 09410ae8c5bbfd76b216e4ab6c1156dbc3840e9d0f09ab5727ef91bc54b58aab22bb3b54c42f5bc6a9e95936de8c2424449ed61d7cfd4a52ceb749eb6fa4306b SHA512 924c40ad43296538a49f58051d7fa72f6df2ebbeac4b91e416a9e2b017e60b867827352bab0975d1ed5828052572b719b7caf419ec611323b0b5fb8319d0d9e3
 DIST nitrokey-0.7.1.crate 42264 BLAKE2B 32aaf5277f3ffdac9cac5f6a5918caea01bcf4b3f9595d9ea4f1895cde517fc4127acf817fec98f1b2a71141d27632abc2bc4e12bca276beb4e1d3582fbf027a SHA512 eddc244c0feef80b58e8c5d287bef8c6fcb6a08e3e56e599e4c3f754ae47c2ee576721edee22d5784e54086535d995fa30326808b85e40f068c72f4c09466915
 DIST nitrokey-sys-3.5.0.crate 69014 BLAKE2B 61b036749f4c990c9f5575d464016ac4c2058ae81067dcfdefb49e70cc9702671ffe3e952848f24aaee475243208cfeb4bfb52dc5210b5b8db8d53124871378c SHA512 c7b5db1cd9d14dc46e2de6c47007da01ba9d242b0378490fd9c03b7e9ff18dbaea1e756b0731a7920cfae9be12f86b62e7219f8b380ac6dbdd0cfbe362fd72c5
-DIST nitrokey-test-0.3.2.crate 21714 BLAKE2B fc56914efde9fc25cbe04d8e69401b3bf1e231f80dae73a13e760616bf1aea92b9988efcdbede760b88747b4e33103405ad4c5e54597e8a23cc82aad08e4db60 SHA512 fbc2b00d7556244e880b3bf340bbb5bc19e3411f966d4474a661d5e78979a8eb9b02becfb528f026caa03eee658a715314d0e487fd3e0b2338ac489585a6fdf9
 DIST nitrokey-test-0.4.0.crate 21694 BLAKE2B e6d859751c9b32303ad0e54fefb93fcd4d725655521474f12bf35928792558111b602264593369372410b2b83078f01e2391d0874c695b33c0e3a7a0c19d88e2 SHA512 5a2430bb1c8f51de40ee1b81c3b4d01aadd2e6ea59281a255176040ae464191a81547d80a09fe51bcbaf8195c90b17eb0fd32b2ff24d7e8b70cd718c6f243bbe
 DIST nitrokey-test-state-0.1.0.crate 14022 BLAKE2B 786a5dbbbbdc8043ab3fbdfe2b1f2e975c1b98558e828b47bc6ed210b1f4e053233b38dc12491d3256710863a20cd24ab404aff7b7a33789361e5304ccf87c71 SHA512 7d11336e50cdadb9d401a83def544c8aaca9cba5e85f7ecf3d1e94042c646dc39a4f4a17f9cdb1d14ae74b6bc1cf5f9ec2f1acb299c63d949f488fb5325b7580
 DIST num-traits-0.2.12.crate 43807 BLAKE2B 3913a6c73a928ccae330ae4592cbaf502bf3e6e43f1ba847a02d317003074a07d0d4334eac6e31a5a9220186c44e9ce80111d59203b78e50d4abfc6da4daeddc SHA512 98fe81a3747d619861c3b2789253465eed68c371d74f719885a4b5f09af1abdeb0a147baa52fe335dd4f471f82463aee65fdc9e44432dd67248d5f43e4b85377
-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.19.crate 36390 BLAKE2B d21272e6bbe7bc5953ca388181a3875e6a3426e48ba3eb8808ec51fd2139093b60260998509b81ab1d67dceb4f9a0a255c234912d41739a7420537615ad3a4f0 SHA512 046f65ee0eefc1bfa39a405f46a7aa5ba83a11af057f150700412bc79a7a76d713f020377f38171086da58ee15e3db784c3e198cd18cc852add405e5e27eaeea
-DIST proc-macro2-1.0.7.crate 35588 BLAKE2B 8d9b4c1f73c0959a77ac4b5839cf8b1a12259ef83c17fafd773a81518cf3750b43bb05df83719f2966afd5a71982b4a681d76692b93941127a52459990d3a281 SHA512 282514c6d052896130c83f632962a54f6310bea35b5418b41bdb540e51fad73d91bdb1c5e9f83dbd265c1f3d0fc67cd119db5483b5697e34b1598735ea9246b3
-DIST quote-1.0.2.crate 23023 BLAKE2B 4091809b4fc9b8d0b56be814b127d6ffd7c1507becba85dc905606cbe85f46233dc4b429c1e865e7c7de336cb936d956169ceb5dd45b489b7722022ccf818a3a SHA512 67778dff9dc5c4edcdd6454b74ad9353bb6c0c4e51c16cb82f2e393a7d7a0cde084d3c93279b718a8398c40af0a9377ebfae5321e69e635efd8390c125b75ce4
 DIST quote-1.0.3.crate 22939 BLAKE2B c50e47b647fe1ac1930544d20b2b78ad98e6398a32c98460701d93f93fa1437c6d12c632386ab9eb733cbe64cad57e02dd201686885d0a951cb013fc10a95a9c SHA512 b4867554b86d119251db67f9d0949bf8c3cd7c64f006c76531398ebb7478cb93805b9bcafe159d921ba1a32e92773853b56685cff0e1ebdc6aadaefd3b932ef3
 DIST rand_core-0.5.1.crate 21116 BLAKE2B e74791f941a79971f2741172d489d546373c9abcb0dfbffcb7b97b858ec800b2e0c97df4ac636f3aa1b8dd6c14685edf317336d577f31b5c6cb7d89a157e547a SHA512 4f7500b35e165e6c817fdd67a50745d5497d24e554bb554705097e37258751e8755c4d6b8a69fcb5e1977708ba78620bc35d640e4e018fcd4e88d9dbdbebdcbf
 DIST redox_syscall-0.1.57.crate 17087 BLAKE2B 88e3ffcfd752e757f8fadfd4edca367f9185f09e609c329bb36f179183cf103dc182aae701c14afb717d2b4c3d72ba307b49fc671cc97aa7c9d03df1a7a1835f SHA512 c6e187087060084b7173ed0d9d0e982e4259d4f76522112268c02ff20751382e3bc8e119da6153170f5c54bd5b9cb028910f2f85c1c842099205dccd44659184
 DIST redox_users-0.3.4.crate 12526 BLAKE2B cae43317cc63f129bec8d4da5959e5b00a17c4ecb35d5a18a410f12b70a9f72c235afcdbf9bf5de71a94cfe02f46d7e2d6988b536d02ff1b333c6025a5ab906d SHA512 7a42f4b6ced1b8ee53f2c35446154fea6646bd1634133738a281788e69121bfcbc02d4aeb88d25729382429945c0e89b6de4b6b63831e645c6197ff4ad022831
-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.17.crate 294004 BLAKE2B 3d203b06b8b1a5bdb42d50d395ce117ad92e41a7d36e5cb5194014eb7af1b17f944ae493041b7e9a2a9ea929381b4c1cb513c895747beff97aafef524ea2ced5 SHA512 bd9a165bcac207ec3bb87a81ae644be98d9b5ea0053b3bcc69efb334e3ebfeb85021aa372bafc3575758200640cbaaa67d372950fbb3ab210d8ec62b336d147f
 DIST rust-argon2-0.7.0.crate 27757 BLAKE2B ddeea9ffda1216294e0b8a3dced747fffbd8198fb3b5b74a347a8932a242db7c81554c08c3757574cfbcea5b13b253737df098355e65685d8ae7d95f55306290 SHA512 7310b7f993eb190c155b982bcc6e88e887ca4605dcdae521f0d744f48a5646694c4befa5518f9c94d303c8af1d9111e59c1c67512a9dac4e5f30b83cceed8ddc
 DIST serde-1.0.114.crate 74453 BLAKE2B d5cd4b23a0b6555f8efce963e833b0c293b53cf33a3846ddb189c8d8d8ef5f157c45e33833baa21683a336b60de4785509288c417243b43fc5395e5df6a4e7dc SHA512 9c8db28e52686bc0d428374f13e5a5f4ccb235ef17d8840aa676042321fc89adce4cef4dd00700bd25c2024f79a96d91eca8ec9122e899056116a890cb90300f
 DIST serde_derive-1.0.114.crate 50733 BLAKE2B f66ccfcbd8ccbdea4e3acc7fcb33fb1da516cf41e75c2993c2de79cd139fdf1b7c0ff6a95790df623eaf8b30fce4dec80f2a9c5332a8047dd0812fa65170737c SHA512 b3bea48a9ddd9c442a4ae6d0b76a116450e648976c02f07c2acf48459b15aef9c69d4843c2f04f387015c7f3ff5c3a1f4e5d1dc1e3a3ec3a114f6a651874aeb2
-DIST structopt-0.3.12.crate 50273 BLAKE2B 9d7493700cfed14a8f20cae73c807fd103623ec6502a76ec677ff6bdd5385a88d5d20a395394fa28be580ac2fac34aeb19a8fb0ffb8dd23a50e9551ce973e7a5 SHA512 a71f4cb68ff3cfdacc4600350e35ab040e7fb5c929f3e9649fc0d93f9ca74c6a6efc46e1aecaadf3690106cd281118a1c7c03dd7b265d532e033d437f5ec2e7d
 DIST structopt-0.3.13.crate 50324 BLAKE2B 0c2060e87219437f036772e7457b6273c756c8ecf686bfd24273b713cbcb8410bff5d394e5c6effd12fa222fd0e7510cf16966ad6aafc9196d9d0c646e3a2445 SHA512 b22cf51caaa46c0ad07ad58709e024d615f2f8688db2414acce4f1abd677adb61f1dbdbf3318e194172c475781150da6bcf3c149f6acc60cc195ec598874db5e
 DIST structopt-0.3.17.crate 50166 BLAKE2B 86be10f82d7f56ec178c87248c1618664ed2f8491649e4d90d6dd3358bd4b9ddd76685635e060fd37562cde2abf87ab0f933b9a212e32bdbd4e72d69e103fe9a SHA512 dc193e216dca278b081057072e7888f5b0e0c773fac8e136efd9d0af8cfe89f60d07459bbf23172dd7f8c4ee461458a7d5be957d6cddcc5bbff18515716b66c0
 DIST structopt-derive-0.4.10.crate 19724 BLAKE2B d7e3ebaff53b82e093ef750c10593856270dc59f3ac1f6590256806ea7f7dd2254be6ce1b4e5d8322f9bd1b68931816ddf0f5ff8bcabee3c9112f837610daf81 SHA512 b390a703cf8103fe89663bbeaed30871b8c0f9738f6543fa35e36125c0d1eb3032e363812c1c197c4a42da204b992e7c69fe11bedd4474d3ddea19a96c81bbad
-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-1.0.36.crate 205090 BLAKE2B ec3842cb0b1c72de82b2009a52cfa6e8b37f881f195414b6825345d958cb3052aa6c3212aa1d42da7780f8b8960a38d1487b1967125075ce11ef154d01f99592 SHA512 cefc4161d8f10df4782ab8ccea81c14fbb3b789ed71481e32231d4519b8babf6381a671afc3f89a9a8ad17e7f5b4d7ca6c9dbb4c1843132f606db5636ebf0902
 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 thread_local-1.0.1.crate 12609 BLAKE2B 34206b5232262cda9cc0fb970e20f154d43ff1c4477a5ad5ff9200e6d874a6c7b2bcd99a2dae75a984b54574281e049ad35307ace0dd188f44c9a95fa93139cf SHA512 f2bfca4eee32a8fc88a01ff5bf24518c12142228d95916d13aae35ed6addd0b7da2235359f15220049ef197555344ac31a8833775e7a5bd49144db9c54b3165b
 DIST toml-0.5.6.crate 54341 BLAKE2B a367d22daf6169dbdc9cd58c97f824ab76567679e1032af7a0f924ca53720d2f0989c14545d1f5d82e7f46293e3d27849459157d0cd77dc78e9d76dd6d200648 SHA512 718f5d3fde823ae5d7fbea31e3cd0eaa66f6a2bcd854093d0179dfc4328930a984deff466bcabf3c81caa323aa743c609136b8d036b80087b88e888ba7577f54
 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 version_check-0.9.1.crate 11459 BLAKE2B 72f002c00504f635b7d2d7ee7137e07ba9c182d2e41d32a51851896f6bf6742c5524b7f66946437ba581ccf80b9c9a57280dd4b02df0918569ac710511940fc1 SHA512 b9cf363169df2022a961f5bed4fb7da07513e0283a85aa69752f6ac567e942611ed2216ac61799db1a199e2bdf0fd9b994e35d4a40c6cd80cd26b97cbfe977cf
-DIST wasi-0.7.0.crate 33941 BLAKE2B de1e4e577a1237a233f81ff1a3bd7f888020a42d93a807187a154a3ae0593397358a8667a065f0cdd5497dd2a89889e418d33a0d42ab1631b3f99677e9ebd665 SHA512 1950e78df7f0ba21b917680633d092704f1fb906bd973de4ddc43cedb7bf449f6e881d50e3aa0d5595e8d58796915d582b69c116ef536f819b6f035affea18f0
 DIST wasi-0.9.0+wasi-snapshot-preview1.crate 31521 BLAKE2B 716bdd2ec46d0bc9911c5e5e29fc783840559931b2563d8619675fc11da9527ddbe653a0f1ce0b782ee0c5f7a3131aba2b0867d415f003aa9c2389357569e7dc SHA512 dbe641f796ee3a5daafcaafc911ecc6dff170340f477c2df7a61fb4858a85aefc2637c9e61973ecce66a987aa8e08a736273a4aad3ef47eaf61ed4268dbf9c47
 DIST winapi-0.3.9.crate 1200382 BLAKE2B cb5799749ccd935ea2d7068d953cecf19f543d9db7dc16ad4584bb7005373ada34937a3ced7225544d8bc765da599911c7a3190efefb3a25b7c1bb7123b4f673 SHA512 ff8b7b78065f3d8999ec03c725a0460ebc059771bf071c7a3df3f0ecd733edf3b0a2450024d4e24e1aedddaecd9038ce1376c0d8bbf45132068cf45cf4a53a97
 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.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
 EBUILD nitrocli-0.3.4.ebuild 1551 BLAKE2B 5d0dbaa6766209bfcb3d2c1332a69c395df40377b679f9b42bbf3f58616ffaf51b532a6ee4df185d6c2ae2744c0b18f214027ba4caf0918ef2a69b0565594ab4 SHA512 d774c7b7fd0f92e52572d1fec2f9413d1e683781999336879a89061a68d5f64fb20717e198f4e286a7db9b5b64990e5c21ab4c4c4be3eb659156c7f24eccd760
 EBUILD nitrocli-0.3.5.ebuild 1968 BLAKE2B 5c58af3560e0ca2bfb52b31fff704117b2d5defabcf55aca20efc19d860c52a9f9675086698bfb88394ec3041453030b2e1fdce3fa3a1c68e8a2316af33428db SHA512 f4924b0e13093548c93c12f14dd2472ce3ac39f67525904cca9522c829db27faf768abbe041b1904931963886df92fc240a85602581acb2a4059c40b5d98b20e
-MISC metadata.xml 683 BLAKE2B a973761f8df97168483a0adc13bf44f088f13fb9c472986cffed08d53f69cdbc27a4bc195babcd86796853968c8face6c00004e060086b2ba4d09c52ce978815 SHA512 3f4615ba5af13e358c1c3a4b28c3dbec77c0b99af4692c0b2feedb4f21a1e5f8f76cb7fbd2cdaa5a8c899d340094b8029a6967dd68d591586bef551f8eb61b1f
+MISC metadata.xml 713 BLAKE2B 77012af77b67c16b6ff4fa02a3c0a26d493ee288f4ed2bb5884923f5be779baf56e12c0bf391d6eae4e9f79f3899c053f583ffdc0ed7595f24ec84ef93c23fe0 SHA512 4a99d7fba9fa024a139fa7b71eae1d341d281b9a9db52376b6ed4e447cd875d2319dc6115c7e17e6b1386b10fb956584203bfac9064af9cf8844788fa7542410
diff --git a/app-crypt/nitrocli/metadata.xml b/app-crypt/nitrocli/metadata.xml
index d84c39390b85..9a1a0f54e70a 100644
--- a/app-crypt/nitrocli/metadata.xml
+++ b/app-crypt/nitrocli/metadata.xml
@@ -1,11 +1,11 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>deso@posteo.net</email>
 		<name>Daniel Müller</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/app-crypt/nitrocli/nitrocli-0.3.1.ebuild b/app-crypt/nitrocli/nitrocli-0.3.1.ebuild
deleted file mode 100644
index 9d51dc07dddc..000000000000
--- a/app-crypt/nitrocli/nitrocli-0.3.1.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-CRATES="
-aho-corasick-0.7.6
-argparse-0.2.2
-base32-0.4.0
-cc-1.0.48
-cfg-if-0.1.10
-getrandom-0.1.13
-lazy_static-1.4.0
-libc-0.2.66
-memchr-2.2.1
-nitrocli-0.3.1
-nitrokey-0.4.0
-nitrokey-sys-3.5.0
-nitrokey-test-0.3.2
-nitrokey-test-state-0.1.0
-proc-macro2-1.0.7
-quote-1.0.2
-rand_core-0.5.1
-regex-1.3.1
-regex-syntax-0.6.12
-syn-1.0.13
-thread_local-0.3.6
-unicode-xid-0.2.0
-wasi-0.7.0
-"
-
-inherit cargo
-
-DESCRIPTION="A command line tool for interacting with Nitrokey devices."
-HOMEPAGE="https://github.com/d-e-s-o/nitrocli/tree/master"
-SRC_URI="$(cargo_crate_uris ${CRATES})"
-
-LICENSE="Apache-2.0 GPL-3+ LGPL-3 MIT"
-SLOT="0"
-KEYWORDS="amd64 ~ppc64 x86"
-IUSE=""
-
-DEPEND="
-	dev-libs/hidapi
-"
-# We require gnupg for /usr/bin/gpg-connect-agent.
-RDEPEND="
-	${DEPEND}
-	app-crypt/gnupg
-"
-
-# Uses a plugged-in Nitrokey and runs tests on it. These tests assumes a
-# pristine configuration and will modify the device's state. Not meant
-# to be run as part of the installation.
-RESTRICT="test"
-QA_FLAGS_IGNORED="/usr/bin/nitrocli"
-
-src_install() {
-	cargo_src_install
-
-	einstalldocs
-	doman "doc/nitrocli.1"
-}
diff --git a/app-crypt/nitrocli/nitrocli-0.3.2.ebuild b/app-crypt/nitrocli/nitrocli-0.3.2.ebuild
deleted file mode 100644
index 443257457f3c..000000000000
--- a/app-crypt/nitrocli/nitrocli-0.3.2.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 2017-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-CRATES="
-aho-corasick-0.7.6
-base32-0.4.0
-bitflags-1.2.1
-cc-1.0.48
-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.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
-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 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"
-
-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.3.ebuild b/app-crypt/nitrocli/nitrocli-0.3.3.ebuild
deleted file mode 100644
index 132dfa4a321b..000000000000
--- a/app-crypt/nitrocli/nitrocli-0.3.3.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# 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/nwipe/Manifest b/app-crypt/nwipe/Manifest
index 36ec16ffd6b9..2473e5056739 100644
--- a/app-crypt/nwipe/Manifest
+++ b/app-crypt/nwipe/Manifest
@@ -1,3 +1,3 @@
 DIST nwipe-0.30.tar.gz 6358657 BLAKE2B 69fdcfaacb32aacc27b375a793bff5b7014979c8097ef3b48c2c307e4bc3a828de7c01b6a58e46346dc58a1b4beee4a408074706175098c364dff7ecf67771d3 SHA512 b6d86d78dafbe6c5e27b00b183673dc77dedcf849ecd169b616c90bcda5180bc10fe072580c13f027abaa5fd840e73034ac75af75fe1cf6eb0756273bf46975f
 EBUILD nwipe-0.30.ebuild 542 BLAKE2B 58bf4c9fb2f0280e34e8c626377f9ac49b06a94565f2bd7f75c4ed2af75040e09f1db8ce8ce894ebf0d07e4852e92fb5c89740410c37fd49f17b806e612ee0a8 SHA512 a625f460573dacd84cf11b97d87294b63753063383333183b977136d4001d4dee6f61778e337068488038e4725706aaff14070ff5882395dc214038c4d6a8f5e
-MISC metadata.xml 458 BLAKE2B a42de1e61e183e78050015563f293f8cae433af086d3afde066624dd56b024a35b590590dc728cc181e5ab0912ab94e48af4a3db9117498084423e7134a9743b SHA512 63e500333fff449b1e2e91fed9492ee3c5b33aea0116009cceca1b50d744b87cbe7a86c01a5cf19979425f56ccf746e487b8ec03c55f988f377b326c95a1dfb8
+MISC metadata.xml 488 BLAKE2B 43eb76db498081845651cc0d94746f2cfbc9deb831a0e220e60122d527439d2dcf63ce183f3f39a7592ec14aebe97d4042f78c1492b75e60bdd6d0e66d8fe442 SHA512 46ef396b60d3e2f9b1ac11f68335ac3de5a5b894939902fe98f3c66547a539569e1b6055a7eae80dbba708c999926ea7f4041560e866786365db27785477553f
diff --git a/app-crypt/nwipe/metadata.xml b/app-crypt/nwipe/metadata.xml
index 0675dc705da7..007c834756f4 100644
--- a/app-crypt/nwipe/metadata.xml
+++ b/app-crypt/nwipe/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>jakov.smolic@sartura.hr</email>
 		<name>Jakov Smolic</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/app-crypt/openpgp-keys-terminator/Manifest b/app-crypt/openpgp-keys-terminator/Manifest
index 786325b180f9..0b8cebc7381c 100644
--- a/app-crypt/openpgp-keys-terminator/Manifest
+++ b/app-crypt/openpgp-keys-terminator/Manifest
@@ -1,3 +1,3 @@
 DIST gpg-D11A7596F61705480C711598F2FAC7C7BAE930A5.asc 3898 BLAKE2B d0ad7f85001c2e7ecaabfee90e4676296be271b00a10dc8206d8be3b5e4c4c8619f65d9d2361569ad7be44a41d67b5815ce0521e85e7a6bededd3840e0912bfb SHA512 c7b9df5ff1ac3cc64ca12643be7415742f7af6d43324d355412cab2c6a6c9d1f4b3d5ea33005d76ebff9a6513a25beab16ee4446e753adecfde125b5c1ca9f5a
 EBUILD openpgp-keys-terminator-20210306.ebuild 644 BLAKE2B 68c1c656223826bc7432d9e1517b9535dc8692e162994127beb311246915bd9190e0bb7fc8c6414eb919aada745a5b741a2464278a7e78c33c51209e7863456b SHA512 9ad15927bed3aef4c112a316cb1a18f7e88cd70a151cc4b5761c14f201904f20a65b84ddc225e9324bddf6136c9e20a234722fd4dc14083117e0604ed2bbe2dd
-MISC metadata.xml 397 BLAKE2B 5d71b968b7376a396a2641a4aa6cc1d7c019bbf41b9a9af9ebf6280e4070273637ba3dd3b7c6f2c0cc713332859184f271aa685fee1cfc53e77c22890c68f0d1 SHA512 58cd284549afcb205fca09cbfe968b9946c515cc4d94fed3ea1b8eb3d7e97c568fc8de4572f3dc3c1862fb7f07769fcb8c0feddf19b6224c8d0ddd4ba9a80757
+MISC metadata.xml 427 BLAKE2B 2d8c5fd5d9c6a2c49b9454fb488c60a722b5b56825f25861fbee192cc64dc3690e93d47e45a9033bfed431fefa6d2171de2d8efca61fa8b1128fd741873ffbdf SHA512 b41f357a99251aa868f31466749de8043a2b419927d7e87a1abd778b83a799636590278cb223daa83613f5b6d0e86e7e3eb75ee0fed08395354ce14f7a17e433
diff --git a/app-crypt/openpgp-keys-terminator/metadata.xml b/app-crypt/openpgp-keys-terminator/metadata.xml
index 301999f989e9..7db431c0d583 100644
--- a/app-crypt/openpgp-keys-terminator/metadata.xml
+++ b/app-crypt/openpgp-keys-terminator/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>alexey+gentoo@asokolov.org</email>
 		<name>Alexey Sokolov</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/app-crypt/p11-kit/Manifest b/app-crypt/p11-kit/Manifest
index cd8f95b15c7c..5b8c87566760 100644
--- a/app-crypt/p11-kit/Manifest
+++ b/app-crypt/p11-kit/Manifest
@@ -1,3 +1,3 @@
 DIST p11-kit-0.23.22.tar.xz 830016 BLAKE2B 4e1edfd9e2441d237c07a16c003aee5ffde38f1cf545c26e435645429f2cfa4fe7ca61cdc3c3940390aa040ba991f2ee3995b14cc31bb886d5eeffa8ed5e1721 SHA512 098819e6ca4ad9cc2a0bc2e478aea67354d051a4f03e6c7d75d13d2469b6dc7654f26b15530052f6ed51acb35531c2539e0f971b31e29e6673e857c903afb080
 EBUILD p11-kit-0.23.22.ebuild 2007 BLAKE2B 83ef4fbea91e9fde8324a6a490055a7af92c0cb21550f832242ab9e6fdf9762d315385fedf38b450e0a8ffb076cb7c872b3694b02fb2d6031bdc9afb0bc67061 SHA512 97a4d243b6a053c7a1008906aaa5143de852438cd71e689c415f7de3a16febdb2c5b2fa4485913ea696bd184b1df804a3d7658ea96f69ae49693f774eb569652
-MISC metadata.xml 461 BLAKE2B 4e2b3a011845a7f8c6e4afc0f176615b5badbb64f73a6f83854c4b40babc1b2cafafd0dc26ea65a16d2b96a314600218271e63aeb58f5fb1a3dec3fbffd4973c SHA512 947edc1be15e91e32b12b75b95ba95ea3db9528c2e6bbaf3006f9d9c842bf63256614b1da3129b5a8dd9f2c57771523a79d02febdc17ce9214cbe91276eee82a
+MISC metadata.xml 461 BLAKE2B f08333756cc155a6cdf4114a5c486915ca0c328be382457981064997951bc89b4968fabcce89fad96fcf1c26e822d292aceb26684f1118520474df52b40dbf8e SHA512 043b9eb064bd25e69b57b0ec50193ce748efae48429e2b8518df0d2376262d213507bb11a809a2a5b4443d3991eca6c60d418538ea92845b3d71139b16e19fa2
diff --git a/app-crypt/p11-kit/metadata.xml b/app-crypt/p11-kit/metadata.xml
index 21a9f711d2ff..6724ed5eb2e4 100644
--- a/app-crypt/p11-kit/metadata.xml
+++ b/app-crypt/p11-kit/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
diff --git a/app-crypt/pius/Manifest b/app-crypt/pius/Manifest
index e2c37dfe4d88..476a1a539134 100644
--- a/app-crypt/pius/Manifest
+++ b/app-crypt/pius/Manifest
@@ -4,4 +4,4 @@ AUX pius-3.0.0-Minor-fixes-for-pius-report-137.patch 2744 BLAKE2B bf738bdf20e33d
 AUX pius-3.0.0-pius-keyring-mgr-Fix-constants-134.patch 1909 BLAKE2B 60440079520ff12664c89fa42a0ee4cdf9fa5f9a69fa6293f5eaf3fd9a438a669aa50b84ac78701f6ae91c67486588c5403ac89bc08b32697c1550b513ebfe08 SHA512 faf77cf23cb1e2e7b214e70dc955e8683f08195175228e299955bcf4eae07c5fd147959a0f526be42960df2607deed9ac3f15e4abac0484d415fe2acaf4b3ef7
 DIST pius-3.0.0.tar.bz2 46643 BLAKE2B 18abe6a93bd719adf50fa4bcbf5128845d732b598d611e716a536f78f4930e6e63e7f60d7444775fbc32072935c13b1828377a9e843114255a4101f4e3199f98 SHA512 0c906574ac703f45e3318ae3e7994fe6580fd172849b2956d9084033d6fbfd69fec942b95bc2edadadc223fa0685ff0b9799ad03570b712b9cdb09d69491cc91
 EBUILD pius-3.0.0-r1.ebuild 877 BLAKE2B 4ce34605005d1afa28c76bf158b01803e4a52db9907b5c1c6594d8be3ffb15fe8fd9d144d5142a536216fd81fd496e3d91d2f861530214986ab6da8fbf6616af SHA512 5e86eedf186ce5b72bd1bf99dd0ce01349a50c2dcc56aaf85b6671a041e0d4c49c5bf95f93f89ff9227ba7e038c55f8124f39f0a054c3360c5e319eff111fe5e
-MISC metadata.xml 822 BLAKE2B 5dc5796afbb5b5e3f070db3884adc17d0e6e73c568bd747d1ae5585416219305a48d3a7d53bd3f30761262b232e737e1f6633c7ba1dc0834cd95b3fe50b903cc SHA512 49833d454ceb01c9af3010643ba78da1c49152e2502a522fadcc13ce83e9e26f2bf24cc6b06c88cee42f1ee15ab5a18e8d3bf50b3e18b0bde7d1d64fa2211fcc
+MISC metadata.xml 852 BLAKE2B 0599ad8055ad38cfd9703002801ad6e852e942ddfc9892b7450572a08b8a0331f904f76798dee301fee201beb73dc6d8b8f10a6581eb1a456270e85272a617de SHA512 d6c854b7fa0a839401425202a83ed0c931d6ba49e6553d0116d9360c0ad4d8d7f35ee7385c0e2127eb6d67a8749ecc2fdbeb27a28676b05fb0809fbc1773c078
diff --git a/app-crypt/pius/metadata.xml b/app-crypt/pius/metadata.xml
index 0be0c7e0c49f..e153f79ae689 100644
--- a/app-crypt/pius/metadata.xml
+++ b/app-crypt/pius/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>nickaristocrates@gmail.com</email>
 		<name>Nicholas Meyer</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/app-crypt/pkcs11-data/Manifest b/app-crypt/pkcs11-data/Manifest
index 0b553cc64802..95ca0ee6bdbd 100644
--- a/app-crypt/pkcs11-data/Manifest
+++ b/app-crypt/pkcs11-data/Manifest
@@ -1,3 +1,3 @@
 DIST pkcs11-data-0.7.4.tar.bz2 226267 BLAKE2B d9390dbbf465e4ac945d5a5ed0d11ab538da269fed871a21b122e395c1080f9a1acf4eaea072e422a62b043d546d6a7c130f3c67ab07b953d3cbdc469142a3bd SHA512 79b13cbb7dbcb8a35c46e8de79d31e51e53a4e75783c3bef28a0d1aa8176db869a0bf984e516d21567619a7f8ea9206ac9ab5ee81672d9ae2a89efe713cfc46c
 EBUILD pkcs11-data-0.7.4.ebuild 441 BLAKE2B d5a6b5a19a70e6427efecbf3e7041efd29737aafc1db00da163a926a1f63da8b2374dc9ff6b7e5abaee40a3d1bcc47ad23d06f67761829e2e194720d05308361 SHA512 ff4b872e1f8fb3dfa78e061bc18304a2c87f4f9201e0064d9d3c5d2a6c3204c329f577e68f0261c0cd2d943cec06de4a8be0d85c95d7fb2b2644084fcc7a1765
-MISC metadata.xml 307 BLAKE2B ae01ed33ba78fdb8a1bd890b7e57d75cfea4584ae4affe58bd8ab1397c795fd6f0d75194ed4b6c279de6631ab1a4813c5f05465e441d9641fe32f809277380f3 SHA512 f404f1f58c1fdcefca42d89064a4723578765379a187c5559c999930a459ba5d954a1ee5f37b854d340d80d41b739f25d31aa988f0b53ac96d0f498338f71c59
+MISC metadata.xml 307 BLAKE2B baa64290cb0547464bb3e85d18403f010c3bebfc1ca2a074e633dd88194739df018a71dfbc517d78aed8b654e98791f1bcae34c27829e2873fe7e5e9bfe89775 SHA512 189f549c770d50b1175ac6a1af1d0ca84379f803a7b6969414e51f8c00c2cf3f0113d8ee9a098d0cc503f6c0c3f795159b7f561dc6378bdc5bd6024c9182660d
diff --git a/app-crypt/pkcs11-data/metadata.xml b/app-crypt/pkcs11-data/metadata.xml
index cbe6bfa21c37..e1b63724e315 100644
--- a/app-crypt/pkcs11-data/metadata.xml
+++ b/app-crypt/pkcs11-data/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<!-- maintainer-needed -->
diff --git a/app-crypt/pkcs11-dump/Manifest b/app-crypt/pkcs11-dump/Manifest
index fbe4b4b2ec21..8adfb91e3ec1 100644
--- a/app-crypt/pkcs11-dump/Manifest
+++ b/app-crypt/pkcs11-dump/Manifest
@@ -1,3 +1,3 @@
 DIST pkcs11-dump-0.3.4.tar.bz2 255715 BLAKE2B 61545d1b929f47799fa1c3f2591b245b7dadf70df786d7c3574109e66cab407449ec158e2bf29fcdce2238bc316029293ee9f37586367da971f1a8aa777bc015 SHA512 b38dbe8d7b04d7227592c90f6de815da7a030014df2f5f18d8c81587a742c587424a0eea3a1c8ec6e5c8c8f6dccc144130b91c57bef3d5882ee161629a97781b
 EBUILD pkcs11-dump-0.3.4.ebuild 492 BLAKE2B 721d41e557a7d1d6bf0bab3cb064c5cc401cb5d0e12d343fda4afa85b4b103648646244f52c078412d89dad5940b6dd580c72e24ee8358fc516e30fa385b2b7e SHA512 b63b2e3ed5fc56682e42ab76292141d6e1f0a4f5f23bb8c0159cd6779580fdb70109652d8c1bd3a2d5862422a22173f237a9da5d372b8c068aac17ac3310f505
-MISC metadata.xml 307 BLAKE2B 6d692123eb29fc361d6b528781dce686a58c9d25cd85822d49ff80275f78173a8d36c02d7595b267286f055bfc2b20b46332a6f80bb5788c6e2834f1b6119225 SHA512 db3bc942e4feff7a33d76e37e1469d8855e49eec7c5a402ecaedd776e2678d76e3f3cb4e1d79e70258b33afc95325b521397ed04f054434192e7b4b4315c99a4
+MISC metadata.xml 307 BLAKE2B c3761947b71d701b45ebc6d4fd4037ea0b166c37b4a36a63b90ba6212da18a01af423f63da55073f4a6868848451aa6003a2b6029d6ac5177e04fd27d1427bec SHA512 aa1c7499786a9fbcd5ed05f88175e7ebfefc8adb56ab4cffcb515e8a35d67b42e237cb4af66e41f1af5031e41a3764c3e462c3ed8e7379e5233034f401242b37
diff --git a/app-crypt/pkcs11-dump/metadata.xml b/app-crypt/pkcs11-dump/metadata.xml
index ab07aa2158bc..cdde025bd782 100644
--- a/app-crypt/pkcs11-dump/metadata.xml
+++ b/app-crypt/pkcs11-dump/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<!-- maintainer-needed -->
diff --git a/app-crypt/princeprocessor/Manifest b/app-crypt/princeprocessor/Manifest
index 1f1277fc542e..bf1855cdfd50 100644
--- a/app-crypt/princeprocessor/Manifest
+++ b/app-crypt/princeprocessor/Manifest
@@ -1,3 +1,3 @@
 DIST princeprocessor-0.22.tar.gz 38829 BLAKE2B 396a3b12bd390dca80f8d054e8e0c04c70d0bc1cb4f957d53f9f7f4a8aaa87edc1499cde20e01dfa288ba8212403e87e2c6180f1cee3da4825938d08cb2da1df SHA512 8b73867b3f8a83601cde9d6d17e917d0ba468873eda8c47e3c4de7a0511fe35bedb44c68897df9fcc48b1737c1f2c026117e9398f5ff4202611a001fe33990df
 EBUILD princeprocessor-0.22.ebuild 678 BLAKE2B 3b2ab98149708f2e50c0eb9bb890429d4066f9705c57e8e637590603c2531bafea6b74ddab845215eb1c7fa81d536ae48748384be741debce3388b68185440ca SHA512 08777a7c55c7599280f783ae0fd22d4b8d912571ee5001c5e8e2527208dd1a3bbdd881f79ecf232ef4a324651901f146917bcf532c614a667a8fb6b4840c550c
-MISC metadata.xml 335 BLAKE2B e69056b841f119cc4dacf6390d8008a89ca59b715a85fc6b16a65ee01ba52aa87b1035bbcbb4e345358b20805b07dd61555229b0fbc47eeea5b5e0f5e49966bb SHA512 a2cf00a24dfc489539a22eb44418ce8b758ed5b3934ad0cd75fd05a9e081eefa19588d536468a0dd3047f8ec52792186107f755b6136000ba70108d2dceebbe7
+MISC metadata.xml 335 BLAKE2B 39bf00b0d858c41cad2b0b20bd0347eada5a20f33f79ae5fb14ee46f8e50b7fee5b95359aba07aa5c6720eb80fd51ac87d1fca8398d422de044d8ca47a399c48 SHA512 cad2e2b0ccf5c3efad1e8a0d96e409032eccfd3dcb6585ee25f5277d119f30918147e0d954134b95e098c9a107f943f07edcbf53a051f72b14a188b39822e55f
diff --git a/app-crypt/princeprocessor/metadata.xml b/app-crypt/princeprocessor/metadata.xml
index 83b9308ac052..034a0320f71c 100644
--- a/app-crypt/princeprocessor/metadata.xml
+++ b/app-crypt/princeprocessor/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
diff --git a/app-crypt/scrypt/Manifest b/app-crypt/scrypt/Manifest
index 64508e19443a..2681c0e4e881 100644
--- a/app-crypt/scrypt/Manifest
+++ b/app-crypt/scrypt/Manifest
@@ -1,3 +1,3 @@
 DIST scrypt-1.3.1.tgz 394516 BLAKE2B 91faa22dc317927b92abe26c5e15cd52c409722716076c7cc502a0c6e4e84ceaaf60222b3ef141c6a209f36084df2d7f45d8f19482aa035c3e2442513c4283d9 SHA512 c76c29463d2a4db6b62283daca80bc4124a6272f37f983d472d44251b98da702f1edb16ad15058a8d0ea320c23bc1486892ab25d367d37ec77c38a55ad7e69fe
 EBUILD scrypt-1.3.1.ebuild 451 BLAKE2B 85576d7a479c5b1381d947e13cd0b923861799aeaa734c5f0b850befbdb35285dea06ffa359d020da3b4129a48a5b87f0d1a34ecd5f91c1e616b1f86ea023540 SHA512 e3beb1513d2bd91f8e9718682b30567c3f2719e67187ce547fb1a9a9c3c3e1537cdf0354f3f549614db674f2968511693af5e03c155e9c6e825b5a0678f00460
-MISC metadata.xml 368 BLAKE2B 66dc904d7524c2f61313445e7dfe583df69a6bfbbdd1ec8b4203206ec47bb178bb2c5bdacb618cfe47409fb0328ab32e6a6bff123725ed1088e9f2422b4c9e26 SHA512 1a6a98313e5a0e60c51174622e8b96d1b25b0a9b6060a55b1ec18690bf8def973f70c6597077663ab518f4d8135bf7ea114052be801b324e91f80d2580fa7914
+MISC metadata.xml 398 BLAKE2B 72a53247c162b55941628eb873f42270e2e92b34c19d1a62f75a7770bdedfabf53b06a4e8b6da9c84567f0a3e747dd1ab6c7793dbb10a5bd18d18e87e727d754 SHA512 7f0d45abc59402c619041a0acf3ff7d5508a2c656172df422e2d8be2e802cc4cfd6f8bcc4e5dd2fc41db6538cee5598eaa128aaffa5210454dece2dca94e83cf
diff --git a/app-crypt/scrypt/metadata.xml b/app-crypt/scrypt/metadata.xml
index 9654d1c22bc0..6d821181d635 100644
--- a/app-crypt/scrypt/metadata.xml
+++ b/app-crypt/scrypt/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>jakov.smolic@sartura.hr</email>
 		<name>Jakov Smolic</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/app-crypt/seahorse/Manifest b/app-crypt/seahorse/Manifest
index 6d937474b038..3894614a970b 100644
--- a/app-crypt/seahorse/Manifest
+++ b/app-crypt/seahorse/Manifest
@@ -1,3 +1,5 @@
 DIST seahorse-3.36.2.tar.xz 1695824 BLAKE2B e4efb20f952e879b0ff17a9c8664ba61d10c69e377a2fdda52904a8bf5c026d147f9feb9b55c07982f256b366f756dd1567a522d89969c8c5c461f653a130676 SHA512 6a0cb7847fe9917d6d6da31f9b81a4737e425d451fc80604d8e3deb9fa57798f04aa577dae68bc156a15743975f74fbde5ff06a0b05b34228bdc9ef2539b6451
+DIST seahorse-3.38.1.tar.xz 1725480 BLAKE2B 348d9fe1208a9205c58c5655ce97b79c279e2e3506f041a1ebac1f7c83666186ec792bafe7f23b470dd1202a12bc974376b8c369888c6fa194739e7a15973d63 SHA512 1a064ecaf1a25aa84010f914043c3776eba464844598b15e0822217ad330396516df64afed1aeffb3c7b6102d1477c280ec8ec32101cf9f5120c433431b9df32
 EBUILD seahorse-3.36.2.ebuild 1617 BLAKE2B 74ce0bde4fcf4c6e4206075d5e16db5365ee57f90f32d86e07be2d881e8e4f4fb4cea3f77137450c03504cb63ae6243f4e5840c14756a2cca0d5ad9b478fa9bc SHA512 4c7e8563f478ae8852a1c9dca359fb4e0a731e1f6a5e508d40a3487f9b92ac38894bcf52db84e1dfe35239b9de8659957e6e303ebe05dc058ef744cd016cc91c
+EBUILD seahorse-3.38.1.ebuild 1619 BLAKE2B e619cfac7a6e96f1b0f66fdd9bc7368bd6ed9c59d7a2aa8ddc981bf33ac8050218c7162930bb95579e385231abe52e6979a78650910b3277da898ee74f6d3109 SHA512 16cd3b53b6d6410c04a97c23a868d27e8bce6c6c7082bcc6e1aa0efdfd0e2b21c361af8040f68f93d616f9b6fbf8a0cb2b1ba78f3305690368d6377310b23da6
 MISC metadata.xml 742 BLAKE2B 11cc6cebe3f395ccd9f2570a419e812951287d7a9af2bd88720a66c7349305c108c451b67a33f9a6da0c82d7b0731ca74980dd7515db3d167993008633973a6f SHA512 cf7cceeaedb1fdb503def974d945a7a5d38a95105dda77f7e917abcec8ce823b461bf3cd1ab5f1a458de859e48a4d58abde71a5a4599685772936eb3525ae3af
diff --git a/app-crypt/seahorse/seahorse-3.38.1.ebuild b/app-crypt/seahorse/seahorse-3.38.1.ebuild
new file mode 100644
index 000000000000..031375c4f5c1
--- /dev/null
+++ b/app-crypt/seahorse/seahorse-3.38.1.ebuild
@@ -0,0 +1,76 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit gnome.org gnome2-utils meson xdg vala
+
+DESCRIPTION="Manage your passwords and encryption keys"
+HOMEPAGE="https://wiki.gnome.org/Apps/Seahorse"
+
+LICENSE="GPL-2+ FDL-1.1+"
+SLOT="0"
+IUSE="ldap zeroconf"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+
+RDEPEND="
+	>=dev-libs/glib-2.58:2
+	>=app-crypt/gcr-3.11.91:=
+	>=app-crypt/gpgme-1.7.0
+	>=x11-libs/gtk+-3.22.0:3
+	>=app-crypt/gnupg-2.0.12
+	gui-libs/libhandy:1=
+	>=app-crypt/libsecret-0.16
+	dev-libs/libpwquality
+	net-misc/openssh
+	ldap? ( net-nds/openldap:= )
+	>=net-libs/libsoup-2.33.92:2.4
+	zeroconf? ( >=net-dns/avahi-0.6:=[dbus] )
+"
+DEPEND="${RDEPEND}
+	$(vala_depend)
+	dev-libs/libxml2:2
+	app-crypt/gcr[vala]
+	app-crypt/libsecret[vala]
+	gui-libs/libhandy:1[vala]
+"
+BDEPEND="
+	app-text/docbook-xml-dtd:4.2
+	app-text/docbook-xsl-stylesheets
+	dev-libs/appstream-glib
+	dev-libs/libxslt
+	dev-util/gdbus-codegen
+	dev-util/glib-utils
+	dev-util/itstool
+	>=sys-devel/gettext-0.19.8
+	virtual/pkgconfig
+"
+
+src_prepare() {
+	xdg_src_prepare
+	vala_src_prepare
+}
+
+src_configure() {
+	local emesonargs=(
+		-Dhelp=true
+		-Dpgp-support=true
+		-Dcheck-compatible-gpg=false # keep lowest version listed as compatible as min dep for gnupg RDEPEND
+		-Dpkcs11-support=true
+		-Dkeyservers-support=true
+		-Dhkp-support=true
+		$(meson_use ldap ldap-support)
+		$(meson_use zeroconf key-sharing)
+		-Dmanpage=true
+	)
+	meson_src_configure
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	gnome2_schemas_update
+}
+
+pkg_postrm() {
+	xdg_pkg_postrm
+	gnome2_schemas_update
+}
diff --git a/app-crypt/signify/Manifest b/app-crypt/signify/Manifest
index 9d02ea2ba710..ac21700ccf4d 100644
--- a/app-crypt/signify/Manifest
+++ b/app-crypt/signify/Manifest
@@ -7,4 +7,4 @@ EBUILD signify-23.ebuild 543 BLAKE2B 4af7771a8feba476774c635481a7458ff74066d60dc
 EBUILD signify-24.ebuild 540 BLAKE2B c9ad33a60f4d8e2d5ef7a3f8945e722eb06d1c29f9947d24a93433ad54249860ff8a1f960eef2e31c618c1af9d6f7dd92ea6bf8099694ccc7c92aafa097ca46b SHA512 3792038e4d522c6ef7d30d3c6569f57902524f04e5c8cfa5f3868f491eff6094d163294f0fccbc5338acf1e398dabac3140f6ebd68395f142ff172a649a9eca6
 EBUILD signify-29.ebuild 551 BLAKE2B b91d56242ee6a5f33993e236bc405dd1ca92cf3cef64367aa4fe6d15de963c5dd6a71f6155777d0f1b7a50d2d243f46e54d876decfae931d51514d3e020e22b0 SHA512 f446097bcfd19cfb28450c98aa46b850d036e9ef68518912193f0cdedd08e0c5647232740f464c4f51bb13c712ea1814bddf393575712cbddb905cb079188825
 EBUILD signify-30.ebuild 616 BLAKE2B 970eeb3f56883853c77608f81af3f712d8057bb71cd5c99565a551a5e1a267358cf21e52c9e020461c8cfff09b18170cb3fb26645e8c811f9694e3169494de89 SHA512 3973c9115bf57c8582575a3791dae541bd3125241b0bfee2c046c795e627d818db8910fba83acb997fc8c27525df172908c136435006bc3fd4da571d5611f0b1
-MISC metadata.xml 328 BLAKE2B 48c8809b13673350e0ed718437f90815703eb6977ad40b8ca9a2f17b3b51e4d412450a31e58369f49c14e3a3d20a704840ec3efd6e03b9b377c8378598150dcf SHA512 4958752eab2ed703ddab429c46274a605a4954a4da92131979fd988ece5a5a68d944feb60cd4a21e2b6cfdd320fcc00ea631c8befe4cf620cb6b4794e6107560
+MISC metadata.xml 328 BLAKE2B 660647e23f662679935a56bfa1e200da9725f5c9906eca894fb8517bc698ed07293450239f38294a011a422a477dc4192e1f1431196ecdac71df1635788eaf87 SHA512 cf027ac829b9862f917060f9452ea898c08ad659a5287a32c3af3984fd10edbe1c6035037b317219fe056cf461b0a3e83ce1397eecf5fcd5294bd07323629618
diff --git a/app-crypt/signify/metadata.xml b/app-crypt/signify/metadata.xml
index 70c25da76340..91cc08c1747e 100644
--- a/app-crypt/signify/metadata.xml
+++ b/app-crypt/signify/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
diff --git a/app-crypt/swtpm/Manifest b/app-crypt/swtpm/Manifest
index e87b4a5d2806..da48e1640732 100644
--- a/app-crypt/swtpm/Manifest
+++ b/app-crypt/swtpm/Manifest
@@ -3,4 +3,4 @@ AUX swtpm-0.5.0-disable-test-dependencies.patch 696 BLAKE2B 7cbfb36e82b88d125dab
 AUX swtpm-0.5.0-fix-localca-path.patch 1318 BLAKE2B 1d8c7367cdc92232d13b4169e387afcd7247ffbdc785cad0d4e40ca9ee7710036f4a7debc1c6112afe255b19422a32b76f72efba04840136f28a72d241aa091e SHA512 e327b581dd1cf9bf92d400fc2574a585ea8708ba6b7e2c89fe368cfc990e464773900488736944b0f97cfd6e65b6aebf39e55ef22428fcc2510c8205ef77d738
 DIST swtpm-0.5.2.tar.gz 309436 BLAKE2B 0518e59b052c9224d5db1c2720f74ff15717468f73b1665e67c017581dd2b52d7a4cf28f94a932eb6068de3bc50f2e5710b8c447e4a08e6b4a31019db542d910 SHA512 4554f1b7a534829f9fbef4a09e190f1d5e91692d270f4f668bd6ef79799a4186a38db172e37a18be9f203466e2d7c9cdf3a350c0020d25ff6126128085ebe3a3
 EBUILD swtpm-0.5.2.ebuild 1778 BLAKE2B 6e1ee3a3b5bf294ed8bb63466d63e4e6f89d7a55dca83f3c30ad305fdf0bc766dcd87251693806f93f0a1bfd8697f612df77c2ecb46c1c5ba2c83c56e48471b5 SHA512 109bab163b9fca1815cc7535f93cb38c0ade8389f76778d57dbb00f4b60a02096b12f6d9cd2468fbbffc698d160fbb6ea8b270d72f261b5fa238167ba6b063b0
-MISC metadata.xml 457 BLAKE2B defc06c2642823aa760cafc22e90f891f9337358bfaa446778e1f4107f6e295ec21b5987f49bdcee3fd7b68084be1b864d7569e74bd729345e4886b08c617a06 SHA512 c80e24dc4ec41e5aae1e7fe67208c945e62c02f469164d0a76445269e3e0204674cd593956f99fa1539505e1a70a15bbf6c02afcf6b38592f04f3c4d3f275e08
+MISC metadata.xml 486 BLAKE2B fed5484b3accb9cfad5349d2752953f8ddbd59d002183efba66e5d3b7117c7d113fe53aa8f782349c40cf0beba60b4caa38507378498e13a94c396372888831f SHA512 e28d882b4a3086f21bba65947bef8b204e730e57a9171913139e27a8211f3856758a479d2e73257ba6ce2db616aa11af7561ac39d7fc52d959c6582f7f4a878a
diff --git a/app-crypt/swtpm/metadata.xml b/app-crypt/swtpm/metadata.xml
index 261b73cab058..f5a19bbb03d0 100644
--- a/app-crypt/swtpm/metadata.xml
+++ b/app-crypt/swtpm/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>salah.coronya@gmail.com</email>
 		<name>Salah Coronya</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
@@ -13,4 +13,3 @@
 		<flag name="fuse">Support sys-fs/fuse based /dev/tpm interface</flag>
 	</use>
 </pkgmetadata>
-
diff --git a/app-crypt/tpm-tools/Manifest b/app-crypt/tpm-tools/Manifest
index 7e17186639c2..ea45e7df845d 100644
--- a/app-crypt/tpm-tools/Manifest
+++ b/app-crypt/tpm-tools/Manifest
@@ -3,4 +3,4 @@ DIST tpm-tools-1.3.9.1.tar.gz 482859 BLAKE2B ee915679e23bead04672bf719ce59bb6f20
 DIST tpm-tools-1.3.9.2.tar.gz 431930 BLAKE2B bbea3848765d9907c6faa1b5f4a60002e94243040985ce503f392bc8d7392bea41b54317b15fd227b5d73d589cf2c330729532448751d4375484375725310dfa SHA512 b684716c71702140591d89eb03d3724ed5b448e7ba2881bc44de9d44ffc23a9f7dfcf4351eec24e5438cc883f49a7dafee82bb19f90800610cf764ce74e60ccb
 EBUILD tpm-tools-1.3.9.1-r1.ebuild 1014 BLAKE2B 709a67933038725f0d5f13c01f022784036980b4fefce6c6409b5dfbf1e688cda1602a44ca38ce6db09a1cb56a84e15366e0f70c241cf6aee2bd6ac9f47595f4 SHA512 96f5e4867454ed666a95fb843a1540514d6114bb40e7df7b6b11f5781851bbae7cf473e7ae0fc5ee361d72d620f57382cde33ee8d777bcbd5e9ffccf68e39d61
 EBUILD tpm-tools-1.3.9.2.ebuild 1157 BLAKE2B 5814481a8573971f5d89f795b02fb09a7c559772f55302a2004d4e45d3e65128448d0e454497f0696e319d632ea972500e29f865dbedc7c530b27b349a71f788 SHA512 4a34636c6382cdee294d9ff29f127a6d44df6d6e8041fd1b4d4952b641256ca03f8557193463ce4d10c6383322b8fb2d91692fb9fe4104c68252e58d0cf087c1
-MISC metadata.xml 620 BLAKE2B 476e96fcb039ddb412218d88dcdd4cf2fff9fab8c1f84d4c8e8388963c3150facf9b23e661c5f3552928fe6695105e8ee713895e88bdcd87b648eec6d2adc59b SHA512 38c4cfaa0c8d3b3f606247d76a52e82e3dab7c487e73780180a197763a695c3d023ac54706c87238f75f2ef8ba6b1913bcfd7769c36506690830fd98b6cb7d6e
+MISC metadata.xml 650 BLAKE2B 66c56e7c16146ad3bd6649ee4bc57f786329edc9fd7b02b7f8ca074ef37d949d34429b9c758ee790c120736b2514a1accb32fb617dbe1661e7144a07251842af SHA512 5fb40c8f69ad43a46bb93bd991b2cee31ba4e1fdf3b770916d6c7ec533abdea0832b273cb2502e2ff56898c0d4a703e760cc2861b139f4ccba90f8a9fa5d2703
diff --git a/app-crypt/tpm-tools/metadata.xml b/app-crypt/tpm-tools/metadata.xml
index d0084064703c..9bad4aa32163 100644
--- a/app-crypt/tpm-tools/metadata.xml
+++ b/app-crypt/tpm-tools/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>salah.coronya@gmail.com</email>
 		<name>Salah Coronya</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/app-crypt/tpm2-abrmd/Manifest b/app-crypt/tpm2-abrmd/Manifest
index be49cf5fc23b..e3f588bc8534 100644
--- a/app-crypt/tpm2-abrmd/Manifest
+++ b/app-crypt/tpm2-abrmd/Manifest
@@ -2,4 +2,4 @@ AUX tpm2-abrmd.confd 17 BLAKE2B f3b6301cb29f0f741c26025bded10af8948eb7f16faca051
 AUX tpm2-abrmd.initd 390 BLAKE2B 5dbaccf073eba208e13c24f92127e41c4c71fe62dd9bf2062301efbcc16daa1559ffba127399a189d6466e21a8cf9b85ac0e09d34f495be58430eb3cfe0886ef SHA512 aef622face110e22831dddab8a6474b4d003e6d50da9d334653a88ef0a7fca88377379a56fef9c404af5222c8c2fb97090eca913aa7d96183c4e14d7ab470044
 DIST tpm2-abrmd-2.4.0.tar.gz 575440 BLAKE2B 20c1fa772b016879adf28a67966450d64924bc1ac22b3111cf7376706335dc92fa8de97183d89c9d3ff5955dfb2a7617869469e9da61eb05847fd29b4a0208fd SHA512 c2ef05ca2db5a33d3067052779aa4c2485a63bd357d5fd90ef9d4644530b37aa28b906064eed3b15729131697a2a9d6b9cc3f05bea04810fd6601e405af48110
 EBUILD tpm2-abrmd-2.4.0.ebuild 1247 BLAKE2B bcdb64e32ca8c3574dd8965154456d156b280ca5b36ef421b7d774fbccca52967234bf2a9bcc6c21fe362773fc2c261ce3c03150ae894a260482895a8d6df058 SHA512 db9395c665dbc7b66c23f84609da325f39d3518c7b618a922a311c7e713105fb193fa2dab9ede08f3de2e1d76b7e6a6acb40033b02bf2f3731f21f9354dac321
-MISC metadata.xml 458 BLAKE2B 049bd6e5ef39abed2d063afe42162fbd7afa04776d9cae8d35c2704ed9ebcdd7ab575dd87350744d443211d6ed4a7a8f3a8d1a12abc4f0673d0c642d3b9412ff SHA512 c44d5ffb197cca46a7c06e1d7d74351590624a0ac62d2fd41e07c8f2dd51877a3770b7c047c4880f3bbea9ac4488a8045bf5aa364c8faf5e0c9bc030620702f7
+MISC metadata.xml 488 BLAKE2B dc76f732a1e1c6a7aeebb38bda5ce237ed666ed3aa995f46d42a47e34e458383f86973536d772ed8c88709ba89d987150eeeffd4a71de7eecfcc55ee729f086e SHA512 3285b333530bfe75e9593ebef0a4ba6e27adf006d82b7b78c02be8fca408ef71fd5d599a6ec224d7739d2f0302880931ba0023770eef534b774be88492c84a97
diff --git a/app-crypt/tpm2-abrmd/metadata.xml b/app-crypt/tpm2-abrmd/metadata.xml
index ddc35e0cf88d..fb21188fe8c0 100644
--- a/app-crypt/tpm2-abrmd/metadata.xml
+++ b/app-crypt/tpm2-abrmd/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>salah.coronya@gmail.com</email>
 		<name>Salah Coronya</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/app-crypt/tpm2-pkcs11/Manifest b/app-crypt/tpm2-pkcs11/Manifest
index 74dbe887b3d9..acea8db7846a 100644
--- a/app-crypt/tpm2-pkcs11/Manifest
+++ b/app-crypt/tpm2-pkcs11/Manifest
@@ -1,4 +1,4 @@
 AUX tpm2-pkcs11-1.3.2-Remove-WError.patch 356 BLAKE2B d3c124abbad2e3f8a818091293156840e22fca3aa59b59ff8af4f5e3ddd351e56e1619c647b89fd84df7e804bfccd608a1c9ea89d586ca84eb0326d3563ebf79 SHA512 4cd405ff046fd209bcc543c55514e5750007f76e2ed014bcf50975d62493feee0173c0649a06632d2aff2bcd39375be4ec5d341ba75558a257edf7a4ae03a63c
 DIST tpm2-pkcs11-1.5.0.tar.gz 1355121 BLAKE2B 9c00deb62bf30e22ef346bcdf951252913709f6c953f45e68df35cea434e55f79a960fea16aaa46794650c0cceaf979f4250af8cc835e48f34aca5b2306f2685 SHA512 999adf3ea031dfbb0eadefbd6b2c5457bff738bad231efa70218032f851fe5ba466e37bdf47b5bce380c378b97e88b2a76c9b59a264db5c5f380a9ba3cce58a0
 EBUILD tpm2-pkcs11-1.5.0.ebuild 1556 BLAKE2B f8c03e4058c93fe7866f24cbfe10c41e8cce5f1c7547f5db6877a008b8a5bce8d51f86cdc4f6ab855256af395befece75fdac581285b385ce6acd03b6f08ac89 SHA512 2fec1928477aeacaa54e1760b3669aec86213768ab5001cd2f88df1dc6d0e086b624bb2b9beee04086c978bfaf5a64429010c5883887b4588ba7560b172defa9
-MISC metadata.xml 439 BLAKE2B 6f2f3a6188973cfdc23515761b9ac0a1a67d644374de859c8f493874c79b8802a8cfdab9635ff6af3eb03cf925fc22214da23a26738b51d5dd3c0d5c9e78af72 SHA512 0d819fb83133364a6ff8fa22a868e4a88101ca1d72d2552e007e25be1f4ea7da9066556123879035962f36910dd5eaf2f5b5dc613c8e7807ab383084185bef41
+MISC metadata.xml 468 BLAKE2B e08802703d3c5706bd33b10fc052a921d080c634ab2f9dae36b10b6f16e9fd0d5026b78b8f8c3e1f37a26bbdf6b235306fcb85ea904b50d1eb07cf7bbcfa5757 SHA512 a347075cf14f72b8f1b221ec0436531f53aad8ee878532695304d6972964ec65c119c1a40abab1efc8dfce0d5abdc2fc0977f212ca08b2791e7a7ea78a074f5f
diff --git a/app-crypt/tpm2-pkcs11/metadata.xml b/app-crypt/tpm2-pkcs11/metadata.xml
index 428d019c9ce4..7cbd77e4f138 100644
--- a/app-crypt/tpm2-pkcs11/metadata.xml
+++ b/app-crypt/tpm2-pkcs11/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>salah.coronya@gmail.com</email>
 		<name>Salah Coronya</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
@@ -13,4 +13,3 @@
 		<flag name="fapi">Enable feature API backend</flag>
 	</use>
 </pkgmetadata>
-
diff --git a/app-crypt/tpm2-tools/Manifest b/app-crypt/tpm2-tools/Manifest
index cedb015d206c..f1070443e183 100644
--- a/app-crypt/tpm2-tools/Manifest
+++ b/app-crypt/tpm2-tools/Manifest
@@ -5,4 +5,4 @@ DIST tpm2-tools-4.3.0.tar.gz 881544 BLAKE2B 0415f30845658e84e97a964abebc3082e45f
 DIST tpm2-tools-5.0.tar.gz 990855 BLAKE2B 5d39bbef0bc6f0d84f37c64c697260343a9f9e134bce015a6b529176195adb907672f35b85382b0a4785e40e368030ac347083086c3799bdfe86dced1ac69848 SHA512 ea57a28a61e28b78cae7067ff58facd8754fafab7a2689fd93f8b3374073b6ac30301a75f8ff5c654800ab469ee6604d0b8a86c310631b9545b816ecaa05968e
 EBUILD tpm2-tools-4.3.0-r1.ebuild 1169 BLAKE2B 8e0636426eb9aa2f39464c9c191e58b7af188b6dd01c8b40586abc393425425a427eb481d8c7dfbf335aa63e84d1962f7280f4589fc158e4021c80b20bf7a1eb SHA512 b5df4e5816e4d5135d94d650fdfb4bcddaebf370187da397ad72d9ecb816693cc274dd96989f60f3e1a713da60aed1deb397ec955227be7a161c49c734704762
 EBUILD tpm2-tools-5.0-r1.ebuild 1167 BLAKE2B 059a93934c3154258b9fc32fb7f002d54e4feeee76e0e6d22cce8828ae61a244e0aaa85682b30824e9c7dffa16f0293bf32aacbead026d8fd2ce6efd78c8c8f9 SHA512 d0afe0b7c39ee438de039432ad226bb65d1f98a9687ee4c81955288fc7e3e24f3c395ba6c07a0d6d685d26ac376b982befb0c9bb7386260031aac4a1bf330796
-MISC metadata.xml 525 BLAKE2B 5fa89e3cfb69fe00abe745690aafc6e45b8394e1673521049ae2bb834454f3100ef65d4080010c4fed7265bcd6c9dd6cb9015a159674bb71622646d5dd5dd57b SHA512 533cc4a3dc31600a948c931d144eeee3cdb265286677966ed7bf26953deec79f1c9e0c2c7152e1a5ef3bc067bbc3d88a7ae0678b9395be3a7b01d76976a9a4d9
+MISC metadata.xml 555 BLAKE2B 18636ec11d6b6a4d1586e015c860e38f1b28072194ee6b598646e24843372feda4ac1d1e14b9b27eeeb3c3401635415a0d368311e361aeb67b4039747919cbff SHA512 61444d1451e7c1f827330be175abc03996b61ac42c99c8f6ec4a01d54a24b62a7e115e87aa935a74fbd1ae6f0f507a8386b972a59ec34f9c639a2a984783db8e
diff --git a/app-crypt/tpm2-tools/metadata.xml b/app-crypt/tpm2-tools/metadata.xml
index 26b4dcbaf517..f5730a083624 100644
--- a/app-crypt/tpm2-tools/metadata.xml
+++ b/app-crypt/tpm2-tools/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>salah.coronya@gmail.com</email>
 		<name>Salah Coronya</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/app-crypt/tpm2-totp/Manifest b/app-crypt/tpm2-totp/Manifest
index c26fde8d1b47..c73e88d46d83 100644
--- a/app-crypt/tpm2-totp/Manifest
+++ b/app-crypt/tpm2-totp/Manifest
@@ -1,3 +1,4 @@
+AUX tpm2-totp-0.3.0-Remove-bogus-value-from-Makefile.am 730 BLAKE2B 8bf144a03ec3c29c2e43f564ba65e8c10a70c61dc3e14d8c1085012f3aa1d8bbbb2cac3ab634ea02122ed1f2d21103b2fbf307528af178f3265788baeee1221f SHA512 3f51ed8205d6a0480abe85bc49c4fa86eb8141f3667a04dcac327e6c4382c9b430c97d170506a4e12bbda80c981128e9b5f5308036d4ccaee4e28bb93b866204
 DIST tpm2-totp-0.3.0.tar.gz 428874 BLAKE2B 413f4418cd1ce9a996f36c83e27c3fe256b2d3f5ff36e7df1dc1b651e38afa222be9742d5cfa76287263a4e1402dabea3400b41a1e1bde9f31fe03f82894f4f1 SHA512 d47cc8155a60a464afe602c3114ff8e6b2ff825457e6069693947421716b97c34b00f70adbcb4cda1b5b9639b8a3dfc7800295bbff99822da7a8077ebf78d6b2
-EBUILD tpm2-totp-0.3.0.ebuild 994 BLAKE2B d9b207eeb13a40283cedd2993049d09bab514d93cc71071d6332a6d589280d39908cbb1f5b69e9c014aa7e531d2e67498a66131e1389a8c52f6b7e3f93a990e2 SHA512 bcdc1cb8bee0503710d1d673ace426fb340e6a3982c237b09cdfb4f2a9c8370209e9e099a9a56262938a51348790082411323fb30650354aff25d29b20f2952d
-MISC metadata.xml 544 BLAKE2B 4c6496211180d7893b35163eab8ca8f6a6cede115470f0e4bbeaaed773d81c8d08cd45949276e33842d321bd4834f978ef1f1fff09545c261fe02e0add3b6a52 SHA512 47d8998acc8e248fd70743a7cd53ecfd04f9ffdd5f0332be0efb5cf6112d0909044b9562e2401b9d7f6f98d5dd008dd71d56d8c2c85847536d18e93da706122e
+EBUILD tpm2-totp-0.3.0.ebuild 1064 BLAKE2B 5611bdffbba3553a038bd61377e22c1bdafd5bb04018222b4e325b8296f101530a783df628d1968b4cdb510b23d10f35d033405d54f85bdb41a747d63e3bdbbe SHA512 8d16ac7a67fbc072b7478eacc0b60645fa6fc3c4a02c589ba407f0ddf40581d529e337652e558a775a7d328fee5eaf776eb6d1d02caa444584a08f3589bc21e7
+MISC metadata.xml 574 BLAKE2B fb8af894a46a8e2ab847b277d92f9fcb73a59da34ea545d5b116aa16c2ceaf94d795b064cf9f8695c4363654fbff3aa97759a00594ef09b7825f0a0e99b9c406 SHA512 e74c1adc64ace9aea1568ddb6a6e50bac391e02cdf97986174b0240083d339fbebcc3266b5ce71454025f6b2af9326858c53947286916e63faa3ca9fad56e396
diff --git a/app-crypt/tpm2-totp/files/tpm2-totp-0.3.0-Remove-bogus-value-from-Makefile.am b/app-crypt/tpm2-totp/files/tpm2-totp-0.3.0-Remove-bogus-value-from-Makefile.am
new file mode 100644
index 000000000000..75188556dd0e
--- /dev/null
+++ b/app-crypt/tpm2-totp/files/tpm2-totp-0.3.0-Remove-bogus-value-from-Makefile.am
@@ -0,0 +1,25 @@
+https://bugs.gentoo.org/777291
+
+From 893ab78144b95a52d73e1c125e56380fbec68a6f Mon Sep 17 00:00:00 2001
+From: orbea <orbea@riseup.net>
+Date: Fri, 19 Mar 2021 11:01:03 -0700
+Subject: [PATCH] build: Remove bogus value from Makefile.am.
+
+Signed-off-by: orbea <orbea@riseup.net>
+---
+ Makefile.am | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/Makefile.am b/Makefile.am
+index 984212a..cdaecbd 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -71,7 +71,7 @@ include_HEADERS += include/tpm2-totp.h
+ 
+ libtpm2_totp_la_SOURCES = src/libtpm2-totp.c
+ libtpm2_totp_la_LIBADD = $(AM_LDADD)
+-libtpm2_totp_la_LDFLAGS = $(AM_LDFLAGS) '(tpm2_totp)'
++libtpm2_totp_la_LDFLAGS = $(AM_LDFLAGS)
+ 
+ pkgconfig_DATA = dist/tpm2-totp.pc
+ 
diff --git a/app-crypt/tpm2-totp/metadata.xml b/app-crypt/tpm2-totp/metadata.xml
index fb1b2ed30d06..f98b49016b48 100644
--- a/app-crypt/tpm2-totp/metadata.xml
+++ b/app-crypt/tpm2-totp/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>salah.coronya@gmail.com</email>
 		<name>Salah Coronya</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/app-crypt/tpm2-totp/tpm2-totp-0.3.0.ebuild b/app-crypt/tpm2-totp/tpm2-totp-0.3.0.ebuild
index b02901ba1dcd..67e6798a5655 100644
--- a/app-crypt/tpm2-totp/tpm2-totp-0.3.0.ebuild
+++ b/app-crypt/tpm2-totp/tpm2-totp-0.3.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -32,6 +32,10 @@ BDEPEND="virtual/pkgconfig"
 
 RESTRICT="!test? ( test )"
 
+PATCHES=(
+	"${FILESDIR}/${P}-Remove-bogus-value-from-Makefile.am"
+)
+
 src_prepare() {
 	default
 	eautoreconf
@@ -47,5 +51,5 @@ src_configure() {
 
 src_install() {
 	default
-	find "${D}" -name '*.la' -delete || die
+	find "${ED}" -name '*.la' -delete || die
 }
diff --git a/app-crypt/tpm2-tss-engine/Manifest b/app-crypt/tpm2-tss-engine/Manifest
index f31212c9f9d0..8a8a8efc67d7 100644
--- a/app-crypt/tpm2-tss-engine/Manifest
+++ b/app-crypt/tpm2-tss-engine/Manifest
@@ -1,3 +1,3 @@
 DIST tpm2-tss-engine-1.1.0.tar.gz 394448 BLAKE2B 0502907dc9ce872f31be3b980f975a02af2e3e4b369d188afa5327bd4475d93dbf43769dc7ddc11e8cbda8d1fde09f28a9aef9145e859a90225cd397f62c7a2c SHA512 5d2e08178be54350e8672245023d601a0d9d520f8c49e977af49d7c59b91d033c14b4a347b71e042fe7c5ff12af9fcc43b69fd1dc83a9f0db12d47d43e1107f4
 EBUILD tpm2-tss-engine-1.1.0.ebuild 824 BLAKE2B 468c0e8f67cf86c2b7aec7466bcba1ef7180ac24c73f1716510a53f79f0f0aaffa5df7d80276ddf9a6784dae9661650c11bf858fb03734918bc0d618f785e428 SHA512 b4a7b735533ffe077aad28c0cae60f0e611fe5b58b8dbd0bd87195e19a76d8dde7506f115f29ff86e4b93a7e3de8cc5fe923eb65db0e11ab9a058a6ba9793193
-MISC metadata.xml 463 BLAKE2B 7e0574fa7ade812b4a7176f30d0218a70e0396f2c76ccaedac3cc50ffd0aca7581f7b6075ee98828634d7f3b6b7af63059bfed2eab84b52fce418ee787e237be SHA512 b6d0746d2806d1e1f2a741b5ccd97abfc74e6fd8562796175a900ebf28244d8b3a8a1d9cc4bcd70cf51abd66eb180594f972e03c68deed57fa0023d726b6227b
+MISC metadata.xml 493 BLAKE2B aa698b011d1d42b7a68349b50f345ff2d71ee30271c80d506b69254adf2b62e4b81a3ad8a4b26aa9878d3d691927b837c77d69bb32ac6c6b7b4470388d2a36c2 SHA512 e3790629d744cfe6db020a1ab460ce73260b7ffc7bdf842ae77d9f58c1f7dcbafdb6cad198fef04de36afe96b8cdb12fc7e8bd8106f1c85223a40c7b308c096f
diff --git a/app-crypt/tpm2-tss-engine/metadata.xml b/app-crypt/tpm2-tss-engine/metadata.xml
index 3625c1b74945..be009e371ba3 100644
--- a/app-crypt/tpm2-tss-engine/metadata.xml
+++ b/app-crypt/tpm2-tss-engine/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>salah.coronya@gmail.com</email>
 		<name>Salah Coronya</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/app-crypt/tpm2-tss/Manifest b/app-crypt/tpm2-tss/Manifest
index 6a6bbe1d8285..969dc9757026 100644
--- a/app-crypt/tpm2-tss/Manifest
+++ b/app-crypt/tpm2-tss/Manifest
@@ -8,4 +8,4 @@ DIST tpm2-tss-3.0.3.tar.gz 1489136 BLAKE2B 5bf24cf2c36e579388f62eea06ab3811eab1a
 EBUILD tpm2-tss-2.4.3.ebuild 1706 BLAKE2B 8093b404fa89ac49f22375f59b4f9e4f77e6f73fbb63841734f02413ce26d78c5f689630ee085419e3abb70e0b27d9bc341ca10ed329c5f0e676fdd65a760cbb SHA512 96e2af5daf4e0ad4ac2fa98afa35438383b56a61da704db591ffe502d35ae092c952674504d93758ddfdf7d39ee1bf91bd8a1b41f807188858a6314d6fc4a393
 EBUILD tpm2-tss-2.4.5.ebuild 1792 BLAKE2B 070f12c2add6ca65276a2954a2e14c2f0d399256988a07d30cd37bfd96ddd6a390fed1baf372b7377e746dd6ed0f4595c76e1b725a807924d76cdb6439d6fe11 SHA512 a6aae008df0ec09b4ce09b27f6e5c98bad4697f26613d7b479e73bfc6f7cbc1a02661c7f8fc4428ad0b058d3c5a92a7790887e5934c23b604f9ed8fb52cd31c2
 EBUILD tpm2-tss-3.0.3.ebuild 1780 BLAKE2B 89aad07e3a6bf66825d898bb98001a42f0cdcac534723e8ea6a2d5506eeabed823eb2958f4a1d50d35e10f4ff3699eb506ec5dee9da04415a04f92815d4f1807 SHA512 222bb72f83518a459fd777773034a101f352a8cfe67f9d6b06e2b5f8658b6b25cf6be522c07f0a6008a32bb9dad73b0e5f6fcd064f0fe7dada7f56dbd245b37b
-MISC metadata.xml 792 BLAKE2B fe3f4ee796a06707683eb6fab993d34075a23267c4838bec5f063187c323b74e81e4e21c9e314be01d2a07853b7d2bbb0288b379c77053d6f6d2c99c372ba3a0 SHA512 7d1441a4bb5fbeb10fce0673f5b572edd4eef3be89184d2296e019b676cddd39d590da558ee3a83eba31cba56caf0eab6ec4b8bff9bed421660a5688ad38ae64
+MISC metadata.xml 822 BLAKE2B eae42cf7851ae2698b811dd0dff761f281b66bd340675264ce3fede19947bff56345744976ca08770699aa7edc8834286f75ebe1d0a512680736a78315217d87 SHA512 87460c43990ee8cfafe10b6ff001562fcd9acb5ff4a70d91880650d66badf80b66a7fe1c942c0470a69573023f655d36e72ff8938052aef6965777b65dec2415
diff --git a/app-crypt/tpm2-tss/metadata.xml b/app-crypt/tpm2-tss/metadata.xml
index eec8488de47c..c8c3be1edd56 100644
--- a/app-crypt/tpm2-tss/metadata.xml
+++ b/app-crypt/tpm2-tss/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>salah.coronya@gmail.com</email>
 		<name>Salah Coronya</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/app-crypt/trousers/Manifest b/app-crypt/trousers/Manifest
index 9c42a58cb841..1d737376f522 100644
--- a/app-crypt/trousers/Manifest
+++ b/app-crypt/trousers/Manifest
@@ -12,4 +12,4 @@ DIST trousers-0.3.14.tar.gz 1378438 BLAKE2B 3dc2824fa2ca1b1f1181f98d59e85276e7d3
 DIST trousers-0.3.15.tar.gz 4699936 BLAKE2B 53c60498ed6a9d3d87295b00676e5d0d82452918c35af6b98c7979ffa2dc04dd817e7cd3f4a33ca17c30b90eab53d80b2bb25306fe9db7bda2125019edfed280 SHA512 769c7d891c6306c1b3252448f86e3043ee837e566c9431f5b4353512113e2907f6ce29c91e8044c420025b79c5f3ff2396ddce93f73b1eb2a15ea1de89ac0fdb
 EBUILD trousers-0.3.14-r3.ebuild 1673 BLAKE2B 4c86cb8c9764179850cb778094a3dcdcbd4775955858981e8d5ce958217f51e2d6529059e31f61149156d517fe2f3179f7d85ae9a4724f3c2f1aa9c34da6bd84 SHA512 555038110e4fe3ff35c5fbfb9d1f35e3f72345dbbd31381b0de9a4f09404c1241456088d185c5dc2d94eda55d54277820d9a8145493b8499f1734bfb7f6413e2
 EBUILD trousers-0.3.15.ebuild 1597 BLAKE2B a402299093ac80756a929fd82b503c5ee718969fb4676a83d58a027ae3b2174bdc988d6a7e505ba64a5e9057143d7e2601e8698ca078bc2f8a4734aabc1d3c3d SHA512 1ff94752e3051e2d469e0f73f094ac7336b41b809cabaf8781925889da8f0d23bf52cabb9c0553c75c4a176a2351f58d8a32cba53acffff4ace5366ce913d29f
-MISC metadata.xml 507 BLAKE2B 1674e8c11713df517fd8d2aead0b5207a114de5b34559ed1b1a2527e73ee7e749a13d5a7e10330f940bc61c51ed9083e3ce423db428503f25295e1fd3b64d576 SHA512 f1c304734694001da4b95f1f18cb6891d3fc9df1db1013ad7155b2f60fd466f46947b3fa9e78d50c2a4a2fb1d0ca98b8ebb8017dde2bfcadd847e422df8885d7
+MISC metadata.xml 537 BLAKE2B da490642bb36fa390a95ec6f20c248ed85fff1fb60df044c7ff7d7f98d33ffd59b616708cce2cf91e28d594a5da320db3b7c0aa34f5a99c7cb682596b7b01bcf SHA512 64fcfc9bfaaa6ba5c303c90211a26f20d8fcf613185c76b808ff06184ba66b753ead06046afc1cf98c08497b658d21d759beb2b523751e620f69f8647c6a7ee4
diff --git a/app-crypt/trousers/metadata.xml b/app-crypt/trousers/metadata.xml
index 643c6bf8c70a..43231480888e 100644
--- a/app-crypt/trousers/metadata.xml
+++ b/app-crypt/trousers/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>salah.coronya@gmail.com</email>
 		<name>Salah Coronya</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>	
diff --git a/app-crypt/veracrypt/Manifest b/app-crypt/veracrypt/Manifest
index 45ed70a9d5c2..d57489d4b527 100644
--- a/app-crypt/veracrypt/Manifest
+++ b/app-crypt/veracrypt/Manifest
@@ -1,6 +1,4 @@
 AUX veracrypt.init 384 BLAKE2B 0325852e3bb9d8427298c46b0e7caefb1f62d957a158c8a6f898c6609c0363449ef5f48c9cd5a1092efbd9d2e1077a6218bdbebacebde936afc40ec3bfd0b3eb SHA512 574b18b7cbc5f4ea71bb35ec3343af5bdcc7848801decf3b93157bc4fde44ca5daec01847e3ff9f3a638b297f33023ea46a0ada5cc64bab0d14cbe12b93b66ed
-DIST veracrypt-1.24_p7.tar.gz 25113248 BLAKE2B 8ead3325ce6fadf4ca8211ea45daaa82a655f29006f224235f44200839289d42fabe84da2e731fc6a169a7d157535c719b2cd9294524e68532c0065e41ed733c SHA512 d149736d4d6740a89bfce892f44757600c6411776b471a208a75b4573bbc6125535ef1b68c2f55903ff82f4d0fff13b8b07d3cf15c7a301c39158aefffc29e17
 DIST veracrypt-1.24_p8.tar.gz 25116825 BLAKE2B fccab3e7de7637f6f3a7f448a9dcc6671198ea6155e8f6741844c5bd844819c639f968e4cc6e13c274c90f2ba8e540a020b98cb12617a109d5911ce8dd9cb991 SHA512 16139d055e2b2dda6c38ecf156cf5d15cd4788253fe0c85e42050eafd8afbd5c5908e590e53a7b5220767ebbb3b9e81d0049a910b322e42f1c29d2c131bd29d0
-EBUILD veracrypt-1.24_p7.ebuild 2538 BLAKE2B 5860c80d59157f5eb10a6017d837a7eaaf746aba035760b3d4a03bfa00f53fed9b62e83c706ff729a7c873c71cf80ef32eba7269b75c9a9ea5d4d3eb14e20094 SHA512 ecb74dbd33d71828558fab05e246cd7d2bda552f3b9998ecd97b5259a3cee54fb8fb3fcf1b75399fbd41c3d308e91d3f188795baffb7f5284561e9bd3a0856e4
 EBUILD veracrypt-1.24_p8.ebuild 2545 BLAKE2B 9bce35c540f25e5e010443fc849b99e409e47b57a572a1bf69c17ec24974cddcffa676f5b2f69c6c26d2ffda4109d3051a599738d9b1290eecf8b4dee0743527 SHA512 4f47cc599a13183c2d18a0927900f429c5a49a03e2227a32654880e7be22919d7795e480f9b2595220aa8410c804a5720fd3dd39d710ad5fb6cb5974d93c17ef
 MISC metadata.xml 399 BLAKE2B a7d22abada8009869e82b80f8b2274e1acc2fb1488d584c9d730f231057519404445a0d048ad70a47f7d946bc987f836fdfd87da296537a307e234175e521acc SHA512 ac0676510d8d2ac2430dd244ed5e4d18de1cbb7050563fcdd46fc8511c9813dc3609565a6c071f75d9cd26e73c1f453cc8cf9b9b47e0822bd93548a8baaf62ca
diff --git a/app-crypt/veracrypt/veracrypt-1.24_p7.ebuild b/app-crypt/veracrypt/veracrypt-1.24_p7.ebuild
deleted file mode 100644
index 10a8cfcacd0a..000000000000
--- a/app-crypt/veracrypt/veracrypt-1.24_p7.ebuild
+++ /dev/null
@@ -1,101 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit desktop eapi7-ver linux-info pax-utils toolchain-funcs wxwidgets
-
-MY_PV="$(ver_cut 1-2)-Update$(ver_cut 4)"
-DESCRIPTION="Disk encryption with strong security based on TrueCrypt"
-HOMEPAGE="https://www.veracrypt.fr/en/Home.html"
-SRC_URI="https://github.com/${PN}/VeraCrypt/archive/VeraCrypt_${MY_PV}.tar.gz -> ${P}.tar.gz"
-
-# The modules not linked against in Linux include (but not limited to):
-#   libzip, chacha-xmm, chacha256, chachaRng, rdrand, t1ha2
-# Tested by actually removing the source files and performing a build
-# For this reason, we don't have to worry about their licenses
-LICENSE="Apache-2.0 BSD truecrypt-3.0"
-SLOT="0"
-KEYWORDS="amd64"
-IUSE="+asm cpu_flags_x86_sse2 cpu_flags_x86_sse4_1 cpu_flags_x86_ssse3 doc X"
-RESTRICT="bindist mirror"
-
-WX_GTK_VER="3.0-gtk3"
-
-RDEPEND="
-	sys-fs/lvm2
-	sys-fs/fuse:0
-	x11-libs/wxGTK:${WX_GTK_VER}[X?]
-	app-admin/sudo
-	dev-libs/pkcs11-helper
-"
-DEPEND="
-	${RDEPEND}
-	virtual/pkgconfig
-	asm? ( dev-lang/yasm )
-"
-
-S="${WORKDIR}/VeraCrypt-VeraCrypt_${MY_PV}/src"
-
-pkg_setup() {
-	local CONFIG_CHECK="~BLK_DEV_DM ~CRYPTO ~CRYPTO_XTS ~DM_CRYPT ~FUSE_FS"
-	linux-info_pkg_setup
-
-	setup-wxwidgets
-}
-
-src_compile() {
-	local myemakeargs=(
-		NOSTRIP=1
-		NOTEST=1
-		VERBOSE=1
-		CC="$(tc-getCC)"
-		CXX="$(tc-getCXX)"
-		AR="$(tc-getAR)"
-		RANLIB="$(tc-getRANLIB)"
-		TC_EXTRA_CFLAGS="${CFLAGS}"
-		TC_EXTRA_CXXFLAGS="${CXXFLAGS}"
-		TC_EXTRA_LFLAGS="${LDFLAGS}"
-		WX_CONFIG="${WX_CONFIG}"
-		$(usex X "" "NOGUI=1")
-		$(usex asm "" "NOASM=1")
-		$(usex cpu_flags_x86_sse2 "" "NOSSE2=1")
-		$(usex cpu_flags_x86_sse4_1 "SSE41=1" "")
-		$(usex cpu_flags_x86_ssse3 "SSSE3=1" "")
-	)
-
-	emake "${myemakeargs[@]}"
-}
-
-src_test() {
-	"${S}/Main/veracrypt" --text --test || die "tests failed"
-}
-
-src_install() {
-	local DOCS=( Readme.txt )
-	local HTML_DOCS=( )
-
-	dobin Main/veracrypt
-	if use doc; then
-		DOCS+=( "${S}"/../doc/EFI-DCS )
-		docompress -x "/usr/share/doc/${PF}/EFI-DCS"
-		HTML_DOCS+=( "${S}"/../doc/html/. )
-	fi
-	einstalldocs
-
-	newinitd "${FILESDIR}/${PN}.init" ${PN}
-
-	if use X; then
-		local s
-		for s in 16 48 128 256; do
-			newicon -s ${s} Resources/Icons/VeraCrypt-${s}x${s}.xpm veracrypt.xpm
-		done
-		make_desktop_entry ${PN} "VeraCrypt" ${PN} "Utility;Security"
-	fi
-
-	pax-mark -m "${D%/}/usr/bin/veracrypt"
-}
-
-pkg_postinst() {
-	ewarn "VeraCrypt has a very restrictive license. Please be explicitly aware"
-	ewarn "of the limitations on redistribution of binaries or modified source."
-}
diff --git a/app-crypt/yubikey-manager/Manifest b/app-crypt/yubikey-manager/Manifest
index 81210a5ba1e5..d21a7686e5dc 100644
--- a/app-crypt/yubikey-manager/Manifest
+++ b/app-crypt/yubikey-manager/Manifest
@@ -1,3 +1,5 @@
-DIST yubikey-manager-3.1.1.tar.gz 116632 BLAKE2B 252c419280143fa6f44daf3de8ec27bbdc3218e4552e39799e1daca5b46939c4042ae1d43abeab110fe1abaf2e87d94c270442ee6fce05e26927add5b34e9f66 SHA512 8229d5442ddf89fe90abb0153aa005cb0d149a84634b994dc283f7cbac2f72d4b913c238c277c6aa07f431aed8905008aeb11e594e730be71c9ca88150a6ef68
-EBUILD yubikey-manager-3.1.1-r1.ebuild 1460 BLAKE2B 96288c87b479695b709e6db3c0cae37e4c6db7b22976b742ee432d54a288b17534103598e03eb5cb8e86f6bccad630f0dacb292a6514c07da4b0575e04975243 SHA512 94a4e4bcdbe60ba0575c420aad79a0a98ae8446d280b8c59efa6b3ff38677e6540b6ad6dc29c60c078e1692f9647033879bbe874b153bc2cd175d9b4ac706b7d
+DIST yubikey-manager-3.1.2.tar.gz 116728 BLAKE2B 35b592a26bbe1c2a1c81ddbc5fd5de2693b01dbadd04dd317baa14e5f9c5556ff8622bc36e31983947b4eed272be16d8ae1d55c6e30fe5532c20605c784411c5 SHA512 e7ad46536fae0476ae7ea4d7115ba9ddb0fe158fcd1e1d548524860b2033996f5487f9c948df85586d5b7ea690b51ad8d5b43261a56aa8820940226e0b18acaa
+DIST yubikey-manager-4.0.0.tar.gz 137438 BLAKE2B df50113ed46c531032785ceb95ee130a2440f88677b088f70095545528cbceff55db483bc299654beb8d78b3cea94a9c8507751a090a8488cc609680167ec8d7 SHA512 f1684122a9ee8d57fa3644ecf140e39973c822dfcb7cc1d6578a2ef9b09ff9b0078e6e4ab3f0eb6522a08703d095027f9f24bc8ca6fff8b6874f7a9b5e99f1b2
+EBUILD yubikey-manager-3.1.2.ebuild 1460 BLAKE2B 245167a792b93078529190fbfbd45bef1c80fc4d1fcf8ce0e6e72e9a2fef4c317708e5c1433dc6bf585e6821aa21511268e7e1191860b329961e1a8863c0a994 SHA512 19b3084bcf54261aaf1537ec8d13721aa5eb1701375c749428f1ff23cf6c586cd94faf9a45fdd6565c2fd8843af9858741c3a19ac3fb9abef67aca66ea178157
+EBUILD yubikey-manager-4.0.0.ebuild 1324 BLAKE2B f15e7265610bbff0ad64940db32e8455893c67382f81c1b5f1e918a279fb409cfbe9392314850383f5e353fbc29d7e6fe1514c0826775becb1e34749b3c25ca3 SHA512 b215021993fa42925c730c84a66e04b502cb2afd5a4c7a152f337e778c01dc2e1bb26f5071e4ff8ebf4c8acde5ac60ab4dba3b20136a9194b89d88f965ceab85
 MISC metadata.xml 466 BLAKE2B 258688bf55e0d7d5d13a45996c2177d2154626a75ffd0c5b39cbc5c3f83979a00ec1d9a993870c00785d0e1d02cdeb1dadfa38f39d91b5992c5b495f644c6253 SHA512 6355c94235c5a7a9dbe37fb954d7de5807bbd48d62921f819da7ac1c56f0214820cbf74b2f91311573f8a1726b05960d944b536fbf0e0f27fe49a5aa0a827e1b
diff --git a/app-crypt/yubikey-manager/yubikey-manager-3.1.1-r1.ebuild b/app-crypt/yubikey-manager/yubikey-manager-3.1.2.ebuild
index 1d78a11c0b1e..8995c052f7c9 100644
--- a/app-crypt/yubikey-manager/yubikey-manager-3.1.1-r1.ebuild
+++ b/app-crypt/yubikey-manager/yubikey-manager-3.1.2.ebuild
@@ -22,7 +22,7 @@ RDEPEND="
 	dev-python/click[${PYTHON_USEDEP}]
 	dev-python/cryptography[${PYTHON_USEDEP}]
 	>=dev-python/fido2-0.7.0[${PYTHON_USEDEP}]
-	<dev-python/fido2-0.8.0[${PYTHON_USEDEP}]
+	<dev-python/fido2-0.9.0[${PYTHON_USEDEP}]
 	dev-python/pyopenssl[${PYTHON_USEDEP}]
 	dev-python/pyscard[${PYTHON_USEDEP}]
 	dev-python/pyusb[${PYTHON_USEDEP}]
diff --git a/app-crypt/yubikey-manager/yubikey-manager-4.0.0.ebuild b/app-crypt/yubikey-manager/yubikey-manager-4.0.0.ebuild
new file mode 100644
index 000000000000..46d392c70cf0
--- /dev/null
+++ b/app-crypt/yubikey-manager/yubikey-manager-4.0.0.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7,8,9} )
+DISTUTILS_USE_SETUPTOOLS=pyproject.toml
+inherit readme.gentoo-r1 distutils-r1
+
+DESCRIPTION="Python library and command line tool for configuring a YubiKey"
+HOMEPAGE="https://developers.yubico.com/yubikey-manager/"
+# Per https://github.com/Yubico/yubikey-manager/issues/217, Yubico is
+# the official source for tarballs, not Github
+SRC_URI="https://developers.yubico.com/${PN}/Releases/${P}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+RESTRICT="test" # Tests require non-existing package makefun
+
+RDEPEND="
+	dev-python/click[${PYTHON_USEDEP}]
+	dev-python/cryptography[${PYTHON_USEDEP}]
+	dev-python/fido2:0/0.9[${PYTHON_USEDEP}]
+	dev-python/pyopenssl[${PYTHON_USEDEP}]
+	dev-python/pyscard[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+"
+
+python_install_all() {
+	local DOC_CONTENTS
+
+	distutils-r1_python_install_all
+
+	DOC_CONTENTS="
+		The 'openpgp' command may require the package 'app-crypt/ccid'
+		to be installed on the system. Furthermore, make sure that pcscd
+		daemon is running and has correct access permissions to USB
+		devices.
+	"
+	readme.gentoo_create_doc
+
+	doman "${S}"/man/ykman.1
+}
+
+pkg_postinst() {
+	readme.gentoo_print_elog
+}
author	V3n3RiX <venerix@redcorelinux.org>	2021-03-20 14:27:17 +0000
committer	V3n3RiX <venerix@redcorelinux.org>	2021-03-20 14:27:17 +0000
commit	5bb9ff1ee56d2b5e75e01a7f066d8b0cec84ec02 (patch)
tree	66e860a5099bcad013f1cf667255dc372a7c11b3 /app-crypt
parent	7218e1b46bceac05841e90472501742d905fb3fc (diff)