gentoo resync : 03.07.2021

author: V3n3RiX <venerix@redcorelinux.org> 2021-07-03 22:39:47 +0100
committer: V3n3RiX <venerix@redcorelinux.org> 2021-07-03 22:39:47 +0100
commit: 7f0ccc917c7abe6223784c703d86cd14755691fb (patch)
tree: 8c6793f68896b341e22f33d7e6cef88e481f4a8b /app-admin
parent: 9aa80713372911cec499b3adb2cd746790920916 (diff)
80 files changed, 639 insertions, 2309 deletions
diff --git a/app-admin/Manifest.gz b/app-admin/Manifest.gz
index 8f05a50b7737..b77eaa2c0f1e 100644
--- a/app-admin/Manifest.gz
+++ b/app-admin/Manifest.gz
diff --git a/app-admin/apg/Manifest b/app-admin/apg/Manifest
index 663eefa06e6d..a12be2755eeb 100644
--- a/app-admin/apg/Manifest
+++ b/app-admin/apg/Manifest
@@ -1,5 +1,5 @@
 AUX apg-2.3.0b-crypt_password.patch 844 BLAKE2B c87ccb6002eac2c363a5b35dc033badf3968562956a4f49697c98368293aa98f2420ff56ac742a7308a2373183c3883c5bce30cd1d8cb72f6f788df2891f8275 SHA512 bde5b1bbc4084cd4d2630ea92ed73c970cd217554638d17980c4d56b0da2f55cd7cafbc76b5073bd0415a7698b70df9d357f0c1731353dae46990e9407d7bb94
 AUX apg-2.3.0b_p20150129-cracklib.patch 1485 BLAKE2B e6df97af3cfe408d68a86461733a060a7045d9cafd1a82821c56756b6c69d27aba5ba6b7b189346daf52cd407703e07ccff4a66965953f0a20c1ac19add4a064 SHA512 d7e3b210627ac6df34cb380c9b6bfdfd3eff790750082c7ebc40a837a88c73467f0e5847633a51b32c7634a57821b06c704bace511dfae18bc5d3e473f9e43ad
 DIST apg-2.3.0b_p20150129.tar.xz 313372 BLAKE2B f5a1b894a0379294c478020de512af047aec2e7c9d881cb2f4c79df88583707b5ce0e995623915b6bd11b720e60e0f8696e0ddce472441cb1d04f3bf7a818e32 SHA512 7be813368b4b6fe4ae2882d85c40b6cf80ad44b7aa7e46c8cb97926ef89edf4f59e9a4c76a7aa9f725ac6ce1f0df361f8b68ef6dce798e1e0a8d55767c7a16e8
-EBUILD apg-2.3.0b_p20150129.ebuild 829 BLAKE2B 1c427d4e5dd0fec28687156dc73eafe7f9ea9db3b8c80dc9180793e9321237266e09108ae381a715a5531db59c60b91f29d130b477086982d648a0d93abf002f SHA512 ab6b277e0d41cc814d9b833d0ddbfe477f4a965e8e81e13b655b596dfd741d9b543ec762886d374268452d18ca6967b5f73dd667492a797baeded7eaa994bad4
+EBUILD apg-2.3.0b_p20150129-r1.ebuild 849 BLAKE2B 46e43a3bf3fa6c3afb8ec54b4a128aa2b392ae9574abb4d93fca062476a1371e34286cf9ddeb3c1cc8aecf3b83e0b8034803a766f8a2148a3b7706a7992b2504 SHA512 484577621df9f2c5f9ea11e417a07ee2c384619480165597eefe59d2813bee3c13cc38652eab2e110c91b87f33eed0392d27aafa57472c660d350e419c7adef5
 MISC metadata.xml 323 BLAKE2B 3b44b94032a0312054a8d1b5e1d77d8104646ca23a5ee93f20e34a93947184353a2c953141a1de172639fff8100eaf8eda38d1a65690ae99dbc3e533464dff6c SHA512 63dcf35a66f95ba538cc976762491f8e248d5679fe854f06f6c98394731c61f28f66f49bab54e5fad3d48a6cb8f611d2afb90f5ddf48a55eb60ca1b26a649926
diff --git a/app-admin/apg/apg-2.3.0b_p20150129.ebuild b/app-admin/apg/apg-2.3.0b_p20150129-r1.ebuild
index 239110be3b68..50fa2b6c6bcf 100644
--- a/app-admin/apg/apg-2.3.0b_p20150129.ebuild
+++ b/app-admin/apg/apg-2.3.0b_p20150129-r1.ebuild
@@ -16,7 +16,8 @@ SLOT="0"
 KEYWORDS="~alpha amd64 ~arm ~hppa ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE="cracklib"
 
-DEPEND="cracklib? ( sys-libs/cracklib )"
+DEPEND="virtual/libcrypt:=
+	cracklib? ( sys-libs/cracklib )"
 RDEPEND="${DEPEND}"
 
 PATCHES=(
diff --git a/app-admin/awscli/Manifest b/app-admin/awscli/Manifest
index e834e9f613ca..9d86a1ebd153 100644
--- a/app-admin/awscli/Manifest
+++ b/app-admin/awscli/Manifest
@@ -1,52 +1,8 @@
 AUX awscli-1.19.47-py39.patch 2498 BLAKE2B 39f698d756422eecbb6a37bec572f00e184775b816f467d1b0275740b59678518db7ae44240476048c0f11d8d01403e8f9a03ad0f64414206fe77c15c4d695d0 SHA512 6a80d35495b63572e5e8ee6550a1c693d71adceaad79fba9d097668049a5c9d425b7eaaba008458cde8eb3e406e6e2850b6d43e6a610e9f28cb44278b231312a
-DIST awscli-1.19.100.tar.gz 2022522 BLAKE2B 0af348e5e01cc9f3ab421ebdb0bcfe7578bd7578355130951d58ec5b842499527a175c1cb7fae2381f35faab47e7183315c020fcc1d87c29658d45a84c2178f0 SHA512 10a7edf826982e0f1978fe5bb3bb83c1960c1baa353c94533da8877bfb35b022b8a7aae307db9cf526dbc3a80a5f88d16d4f864d3c858d28114afa73e518fcec
-DIST awscli-1.19.101.tar.gz 2022752 BLAKE2B 7565ab5185dd08d02d1f626bdeac2fee1576f0afbe796f5f522d72e4705177e631e0606d49ccbb3f0cfa9fc2b6345c7c5d77eb1689249c7bf78d377839d6d972 SHA512 09821c79dc2fe4d3d0792fe2f2b2c4963d51e31efdd2b70182438373eb811458c1a1e564e94172f50b2b448ee6a4a74e046590ed5907778356d432f84e87ad4b
-DIST awscli-1.19.102.tar.gz 2023841 BLAKE2B 1960557f4dce8b1929dd98f307036e9e802ecb79ca3f74547b44598a523dddc20bfb4c917a0515d6bc896902be49c06c8c0790175fd791d0bdc0b90e6e075903 SHA512 09bbf2fe3812e035ecef35c183bcdcb9007595992bd1f87359e4fab7060631d25de686daec970e5f40fc55974185ed688efb72b29fd018cc6f6c1654b002ea4d
-DIST awscli-1.19.47.tar.gz 1990843 BLAKE2B c894aaf84d5fe7cb8998fcd682783a1f2e75dd9273a2aa22babe4d57175a1716aefccda50edb96a1203f010dbb2af29cd47d43b5d5f94adfdee1730ab98345af SHA512 7d51022e13609f5f5ab3155e3ac09670c7e49508d67eca8cb477e556e4b06b7643e86bdfe5fa8db59360f6d73e5774b433cb7093c25d6b688f98847b502872b7
-DIST awscli-1.19.78.tar.gz 2006020 BLAKE2B 6def90848e033413136865b0176c8d435fb70465f700a82673e9b20378be3792c8e3e59715466a93199358d698c9b58daaa88d6c2e921474460fdef0a214fdba SHA512 ff48f06158d401bf27e2f63c86ade91009dd9a48edf20156d3511ec2685a2dc93e8129a766eb0cc979e81121804dff9f18524e72f8ac1cffc43c4d3ed3595c83
-DIST awscli-1.19.79.tar.gz 2006413 BLAKE2B 40b806b7987dcbb83f0d5f7411dd36c5acfddf3927bff00d396724ed178dd114b91a6852fce9f1f1dea44644c3be26c2d1b63f114b5a9eb9b1832cc2f7e5c69e SHA512 1255b2439ba5061987af7f7b418e564c8bccd6d837614405512628a259c2f89acee3a41386b2507c596d9f52b432fa34c615d06ad15787a131bd06397a3b2aab
-DIST awscli-1.19.80.tar.gz 2006767 BLAKE2B 9840d8068d10048ff043b43cb3e2dc49ee55f38a177ec32b0e061eb4ef3e7503864d05b4a886995ba25a716e82300d20a0c5678bd8f0b8f211bc1ba8785312b2 SHA512 3ca91745075cd46aeb5853fe5979b4c9e9ebb4e7ccae03f2f59d4817fd2e5089747dcb48bff496fcfdccc81d7832a203144364ef0ae716b347222c2226743295
-DIST awscli-1.19.82.tar.gz 2007776 BLAKE2B aaa065a555c481733a3bece914cc84d97845be52a6d254b74494b8f3fc554dbaf33a5cddedd45fdd1f5811e9fad2ce9172939dfa352ba693576dc8554e0d7283 SHA512 87e4b4449d05dd01480c74b992c25163761dc4b495f0414c46631bc547d6b7d2b3b0805205c6d0b641b33f1a8ec98ccb821fdcb18bd2f672695b431505792e18
-DIST awscli-1.19.83.tar.gz 2008544 BLAKE2B e970d95e9caad606e66f1985dcf2500670ded3da657926e9ec7f37201a45f480318a6081aa2cdd0e27d46a498085c6fa8e9a13e0c8a091f9aa6a12af885d90e9 SHA512 03e10001115e201c6db3f7bb45eaf47816a95813678502e8b97b1216c9748385df2832f55328780b6e070d57e13a7a680a8b429fcbae351be100add84bb16d45
-DIST awscli-1.19.84.tar.gz 2011045 BLAKE2B 581a7d1c22f7f92c434b6726cae34cdfde1f6da73c9b4470c73386389b1969872825850623685ddfc5958e99bc1d065b9f7afad8f88185329f0752dcb79c0b82 SHA512 4408bae1564346c873693e82124d33c17563a0a35fa41c8e2896a8ab4df23c5c41d17c87b522e7c2222335146dab0b9b32aa671f6c0e9f769bdeccf36948ae72
-DIST awscli-1.19.85.tar.gz 2014586 BLAKE2B 7d7ec1d8ece349875403258988ac1732e48a70293471b76b0b3e5278877d606b9390cf3a01166914b3db78696f31598d30c4de1a0f1e5dcc2cc3582bbcf9a493 SHA512 738d433997f7d9a21db2d9d236cf5c1cc0a61ebf601cc2a96f292e22f9fdd4bbb6e6377fb55d161814275b653f61974c13b399d450ecea888b26543c6e3cf955
-DIST awscli-1.19.86.tar.gz 2014916 BLAKE2B acebaf9c5d6b672333162ec578f29781f74e66c4eeda212be8b7722d05b30839ba835f03f4f4e9d780cdb4df3e7e9a5ad4a407a0660ddc4f6a8a60f7073c6440 SHA512 dcf9c23a6b11272a6ffdd04f8ba74bd85624692c5de28b6dc87ae75ac5d8b68a1b73d09cf02d29939f83d7d68860c21b2043d4cdc300b5664e0b221a47344956
-DIST awscli-1.19.87.tar.gz 2015321 BLAKE2B 02cc3f0cc2588c9e0d2c7b8d38248455692f3b30dfeaecc076edfc3ce072128c6e788e8503e110eedf4d45ec71f3309c5db7871fd75018da3aaa424ed9d5fe4c SHA512 5bb6fb4ae62a1c4c5e83f59f32840ceab656d17cdee80dfd5530606f2d24e7b77aa78b8d62a020ca44a74c6f73de2cb4f625da5af68de3a90e704d4020703d7a
-DIST awscli-1.19.88.tar.gz 2016344 BLAKE2B 09d29f2494cb540fcbd128197c0ac181c4106bc8aec651144f641b44d4ad0acb6d3c6381180f301508e8babe66f8cc800ce2932706a4efbf8042a525e433e583 SHA512 a5821af1af468fc1c02a9aaf9691346daffe09bc4b886b3b6ecc0a9e30420deb9e7bd3b3308c5dae2518cf76badb69602948566545473a59efd6eba1a329a728
-DIST awscli-1.19.89.tar.gz 2016580 BLAKE2B d58c490383750df0ec9482dd0adbd119f0db0cd30c4cca944581b81eacb9e7bcc99b9b54816b4a85f50e9d326b930cca62a7999a2218e4057029d02888a3a71e SHA512 7aec8fb6b0c8e44c89d24880483722aef81416918cec1f582c847dc1893458ff6297f39b4591f2502c322a760cc4a5c8621d69fae0937df8e1c2eb2290d66a77
-DIST awscli-1.19.90.tar.gz 2017068 BLAKE2B 7e08ee937c90ab82318479d960aa7c8f8274ba46b1267692f93e7756bccd50e35d12174b5e58a3ae3dc540cea7e57e311ca6edc4b43ea7a46475395d7f74ee49 SHA512 502d5a30022c8113d5ff7be3fd33e835e963b9bbe01da0b75892794df7cbc6a08b7bfd948c1b3e3d96e726e0d1d537bf79baf3ca77192e46fabc0ba341e0af26
-DIST awscli-1.19.91.tar.gz 2017336 BLAKE2B e74079f8bda95cec8998f85436f5fcc6ec1f3a6a475909c3c8068b876651640c6a0635b22a098812e3b31bc5ae6b7c202f287eb36870c923ddc2cd3376e6ec68 SHA512 ae547b7c5cebea25d63861500f8195e1ea640cbf6b93391d3b3128ad0cc13393441fcd70932cd93ca0bba39b0b1ed98720a063e4ef28d06b7dcb09464b17fdeb
-DIST awscli-1.19.92.tar.gz 2018201 BLAKE2B 3e7988878772b978efe1a9043a3d55c129e4ff35b6d3450e65f9bd9fb92effb3d7e0cef389880f4d34726ed72d3249778a50a0b716420c369abe04a2a097685e SHA512 42f91c73c974ab20698259d98b6f31694317cb01127a20d346695b4e73ae45cfdcee0ef241d40e648f5d538d93a2303ba74759508873dbe5071b43ae4f4c80bd
-DIST awscli-1.19.93.tar.gz 2018769 BLAKE2B 95aadfbf6b54e679aee97a1f9194aa8d1667d73b4397e60c00b96bf45ef3e8cfde607b574e0a4017c7660fff7fbf150b9dfb5d2c37f9a12fa86987cadf8c2143 SHA512 2f2ba19659f0c385b629124741218a541024c45d95960069cf362f6e17fa78fd7f2a69042cd9a4e64af540bd4ceac9b451f415c589504fda662e491dec082828
-DIST awscli-1.19.94.tar.gz 2019028 BLAKE2B 5885322bc03f18829217ab8fca683fbd4c19b7e7761be33ac4d568d6085844d81677b0b01e93a4cb88e23a47a16afdd49ed1c1c2eaafcbf1bee0d22c6f7c2600 SHA512 226f8eb41f3aedf52b71cfaf3f4f92286fd9d4a89015f3ba50bceb733ab316f6ed2ee787da6cfea84f5a13c26ded8123a2f32603259c67442a7d741b86fe83c8
-DIST awscli-1.19.95.tar.gz 2019311 BLAKE2B 4ab4901cbc701e5697f5a98e61df401cdcde0b364674c8939788b0177199ee174f6f8ca22c87c11fe8b468bdc3002fc2e521869a5982c4f1bd3b307a986a3351 SHA512 7134cad65f2bfb9068cec5d9939e37fd0e340a82a54d2f100847f5afc50e6d77fae79511f7d0c8eb928c0110f9d05c84917e3605f3dc1807bba939c98734781c
-DIST awscli-1.19.96.tar.gz 2019687 BLAKE2B 77ea6eba698a0ea95261741b68416091fe33a1268c5c3d8d52d286e652929e597767ce5a6d5f8012ad0911a8fd7f86b33dadfc4ab1a5087a5a36c8e7e1f41217 SHA512 ba22fd866dc4ce7fe927e2a63fea784514057cc5b3e5259c5d6b73c42d10f68bba9732c4373e6eb4145aedfe6c373e6c5764a2c5ca31ba935cdaba6b31eeeb00
+DIST awscli-1.19.104.tar.gz 2024567 BLAKE2B 82662ffe6a05dd329210ff84962e1ad37ece63a8f964c3c6bb293f53fea3af151bb088150260b3b279730871b7e962f2c580385b21a56a8bc2f86b437fab92d4 SHA512 444e533219e23b5151bab29d2d65deb8de9008b883b08ae553dd322b3f4e96d3836fedabc7be0393303ea146a0b8ad8220d4f4de458bca00303dc0798e543840
+DIST awscli-1.19.105.tar.gz 2024530 BLAKE2B 8d05c41aa76338f30edf8640923250fa3d3954e942243552338837ec163f987c583573269d94a63f47f48fbb0beab4c6265e9197b465563374e4afb45ae20843 SHA512 73207ca67d490df705022844e6d025d051a276698204fcf82171e0075f5db2c347de0634cffc48fbd210314d66fd79c61d4129003ddbd6db698adc710fbb2068
 DIST awscli-1.19.97.tar.gz 2020143 BLAKE2B 2dac6f59a04a958b09e0f8b7d056583015762df78ed1349b55c6301d3189e1100bd8ab98445ded3ccc0ddbf1148ddf0475086704f123b0db1ccfd1cacb6b4680 SHA512 4e4e0f34ba02819232427f7571a4b10d22b167788d758c9ac43749607ea7a4c498259fcc5c69fb32d66faffc535a5b3045006168b64506f2b0f9fbbaa804e387
-DIST awscli-1.19.98.tar.gz 2020264 BLAKE2B 4a466af94d909ff072ac54631769345fbdcc167012cbef64fc315a2ab9acf0516cad5f684123ffccc64c16e48791bd469f3c30e76317963bbf4ddbdb806934aa SHA512 74e52fd242fd606bff2913fffb3e5a84abea88bf487f110d0b7144cfffd1ccf18c96103bcf88ed94a101689e11b22bf2d1a77cebe09083839ed1f0f8abd00fd1
-DIST awscli-1.19.99.tar.gz 2021763 BLAKE2B b3c78764c91f6a333ad493aa14d4af54e34e4e6658469d345e16e3cf05ed7ac6c80322ce55ad8831ffff369e1dcec3125b1422b2888176b47b4b4b9544a124fd SHA512 281bf1a2fd0868519589749923e3040551cd8d6d9831b20558f492633a2d0734d4fe570e85c1b8ab6230d33fecc851d5b88f69dc5173b08dcd240952737e9003
-EBUILD awscli-1.19.100.ebuild 1467 BLAKE2B ff662a5f00944f42ceccaa347486745528b94083fc5ff4053a28253d9cbd26d7ba46688d95ed8c7d1e50f01e692f3f16f26e01ffcc8973a4fef31c6f2c58b07b SHA512 d79f8e7fd1609fe1f4d746a363b14e05d8b68a3b1359cdc2215a03759ba68880f0bff46d2519f420c50f088eae84596d2686be428604f678a716f3c10d002f4c
-EBUILD awscli-1.19.101.ebuild 1467 BLAKE2B ff662a5f00944f42ceccaa347486745528b94083fc5ff4053a28253d9cbd26d7ba46688d95ed8c7d1e50f01e692f3f16f26e01ffcc8973a4fef31c6f2c58b07b SHA512 d79f8e7fd1609fe1f4d746a363b14e05d8b68a3b1359cdc2215a03759ba68880f0bff46d2519f420c50f088eae84596d2686be428604f678a716f3c10d002f4c
-EBUILD awscli-1.19.102.ebuild 1467 BLAKE2B ff662a5f00944f42ceccaa347486745528b94083fc5ff4053a28253d9cbd26d7ba46688d95ed8c7d1e50f01e692f3f16f26e01ffcc8973a4fef31c6f2c58b07b SHA512 d79f8e7fd1609fe1f4d746a363b14e05d8b68a3b1359cdc2215a03759ba68880f0bff46d2519f420c50f088eae84596d2686be428604f678a716f3c10d002f4c
-EBUILD awscli-1.19.47-r1.ebuild 1367 BLAKE2B bb8b7d8cd38bf771578ad146817be2570d4e17ad86073691c8233c4d5bdfb4804f51dda002eb4662e70ab226615876c829798fbffaeaf609b953d70dbac0c8d5 SHA512 9439c9fe91e9e965f9d43a5a6ea238884cf8f74fa8055ff5d15bad8be2798ba98dac5ba14cef9f32bd911d9dbbcaa90d2fcb2b99d6b4c53edb63efa4f36ef877
-EBUILD awscli-1.19.78.ebuild 1466 BLAKE2B 2e7a21a20d04c5175ffa9202dc8b98819df134680a207d24e1155c7b505a9e1a1af8d8894e57d54db450dc41d1a5aa58d73556f1dbfa7ea85bea174ee2f7af18 SHA512 3f1dfde745085142aa706e3c577ee7eca5fc121f80e200694faf5c4d55a05b3a0153211279dbfa2e755ad7466daaf3918f55b835508581d5ea6ba3ba98c35ca3
-EBUILD awscli-1.19.79.ebuild 1466 BLAKE2B 2e7a21a20d04c5175ffa9202dc8b98819df134680a207d24e1155c7b505a9e1a1af8d8894e57d54db450dc41d1a5aa58d73556f1dbfa7ea85bea174ee2f7af18 SHA512 3f1dfde745085142aa706e3c577ee7eca5fc121f80e200694faf5c4d55a05b3a0153211279dbfa2e755ad7466daaf3918f55b835508581d5ea6ba3ba98c35ca3
-EBUILD awscli-1.19.80.ebuild 1466 BLAKE2B 2e7a21a20d04c5175ffa9202dc8b98819df134680a207d24e1155c7b505a9e1a1af8d8894e57d54db450dc41d1a5aa58d73556f1dbfa7ea85bea174ee2f7af18 SHA512 3f1dfde745085142aa706e3c577ee7eca5fc121f80e200694faf5c4d55a05b3a0153211279dbfa2e755ad7466daaf3918f55b835508581d5ea6ba3ba98c35ca3
-EBUILD awscli-1.19.82.ebuild 1466 BLAKE2B 2e7a21a20d04c5175ffa9202dc8b98819df134680a207d24e1155c7b505a9e1a1af8d8894e57d54db450dc41d1a5aa58d73556f1dbfa7ea85bea174ee2f7af18 SHA512 3f1dfde745085142aa706e3c577ee7eca5fc121f80e200694faf5c4d55a05b3a0153211279dbfa2e755ad7466daaf3918f55b835508581d5ea6ba3ba98c35ca3
-EBUILD awscli-1.19.83.ebuild 1466 BLAKE2B 2e7a21a20d04c5175ffa9202dc8b98819df134680a207d24e1155c7b505a9e1a1af8d8894e57d54db450dc41d1a5aa58d73556f1dbfa7ea85bea174ee2f7af18 SHA512 3f1dfde745085142aa706e3c577ee7eca5fc121f80e200694faf5c4d55a05b3a0153211279dbfa2e755ad7466daaf3918f55b835508581d5ea6ba3ba98c35ca3
-EBUILD awscli-1.19.84.ebuild 1466 BLAKE2B 2e7a21a20d04c5175ffa9202dc8b98819df134680a207d24e1155c7b505a9e1a1af8d8894e57d54db450dc41d1a5aa58d73556f1dbfa7ea85bea174ee2f7af18 SHA512 3f1dfde745085142aa706e3c577ee7eca5fc121f80e200694faf5c4d55a05b3a0153211279dbfa2e755ad7466daaf3918f55b835508581d5ea6ba3ba98c35ca3
-EBUILD awscli-1.19.85.ebuild 1466 BLAKE2B 2e7a21a20d04c5175ffa9202dc8b98819df134680a207d24e1155c7b505a9e1a1af8d8894e57d54db450dc41d1a5aa58d73556f1dbfa7ea85bea174ee2f7af18 SHA512 3f1dfde745085142aa706e3c577ee7eca5fc121f80e200694faf5c4d55a05b3a0153211279dbfa2e755ad7466daaf3918f55b835508581d5ea6ba3ba98c35ca3
-EBUILD awscli-1.19.86.ebuild 1466 BLAKE2B 2e7a21a20d04c5175ffa9202dc8b98819df134680a207d24e1155c7b505a9e1a1af8d8894e57d54db450dc41d1a5aa58d73556f1dbfa7ea85bea174ee2f7af18 SHA512 3f1dfde745085142aa706e3c577ee7eca5fc121f80e200694faf5c4d55a05b3a0153211279dbfa2e755ad7466daaf3918f55b835508581d5ea6ba3ba98c35ca3
-EBUILD awscli-1.19.87.ebuild 1467 BLAKE2B ff662a5f00944f42ceccaa347486745528b94083fc5ff4053a28253d9cbd26d7ba46688d95ed8c7d1e50f01e692f3f16f26e01ffcc8973a4fef31c6f2c58b07b SHA512 d79f8e7fd1609fe1f4d746a363b14e05d8b68a3b1359cdc2215a03759ba68880f0bff46d2519f420c50f088eae84596d2686be428604f678a716f3c10d002f4c
-EBUILD awscli-1.19.88.ebuild 1467 BLAKE2B ff662a5f00944f42ceccaa347486745528b94083fc5ff4053a28253d9cbd26d7ba46688d95ed8c7d1e50f01e692f3f16f26e01ffcc8973a4fef31c6f2c58b07b SHA512 d79f8e7fd1609fe1f4d746a363b14e05d8b68a3b1359cdc2215a03759ba68880f0bff46d2519f420c50f088eae84596d2686be428604f678a716f3c10d002f4c
-EBUILD awscli-1.19.89.ebuild 1467 BLAKE2B ff662a5f00944f42ceccaa347486745528b94083fc5ff4053a28253d9cbd26d7ba46688d95ed8c7d1e50f01e692f3f16f26e01ffcc8973a4fef31c6f2c58b07b SHA512 d79f8e7fd1609fe1f4d746a363b14e05d8b68a3b1359cdc2215a03759ba68880f0bff46d2519f420c50f088eae84596d2686be428604f678a716f3c10d002f4c
-EBUILD awscli-1.19.90.ebuild 1467 BLAKE2B ff662a5f00944f42ceccaa347486745528b94083fc5ff4053a28253d9cbd26d7ba46688d95ed8c7d1e50f01e692f3f16f26e01ffcc8973a4fef31c6f2c58b07b SHA512 d79f8e7fd1609fe1f4d746a363b14e05d8b68a3b1359cdc2215a03759ba68880f0bff46d2519f420c50f088eae84596d2686be428604f678a716f3c10d002f4c
-EBUILD awscli-1.19.91.ebuild 1467 BLAKE2B ff662a5f00944f42ceccaa347486745528b94083fc5ff4053a28253d9cbd26d7ba46688d95ed8c7d1e50f01e692f3f16f26e01ffcc8973a4fef31c6f2c58b07b SHA512 d79f8e7fd1609fe1f4d746a363b14e05d8b68a3b1359cdc2215a03759ba68880f0bff46d2519f420c50f088eae84596d2686be428604f678a716f3c10d002f4c
-EBUILD awscli-1.19.92.ebuild 1467 BLAKE2B ff662a5f00944f42ceccaa347486745528b94083fc5ff4053a28253d9cbd26d7ba46688d95ed8c7d1e50f01e692f3f16f26e01ffcc8973a4fef31c6f2c58b07b SHA512 d79f8e7fd1609fe1f4d746a363b14e05d8b68a3b1359cdc2215a03759ba68880f0bff46d2519f420c50f088eae84596d2686be428604f678a716f3c10d002f4c
-EBUILD awscli-1.19.93.ebuild 1467 BLAKE2B ff662a5f00944f42ceccaa347486745528b94083fc5ff4053a28253d9cbd26d7ba46688d95ed8c7d1e50f01e692f3f16f26e01ffcc8973a4fef31c6f2c58b07b SHA512 d79f8e7fd1609fe1f4d746a363b14e05d8b68a3b1359cdc2215a03759ba68880f0bff46d2519f420c50f088eae84596d2686be428604f678a716f3c10d002f4c
-EBUILD awscli-1.19.94.ebuild 1467 BLAKE2B ff662a5f00944f42ceccaa347486745528b94083fc5ff4053a28253d9cbd26d7ba46688d95ed8c7d1e50f01e692f3f16f26e01ffcc8973a4fef31c6f2c58b07b SHA512 d79f8e7fd1609fe1f4d746a363b14e05d8b68a3b1359cdc2215a03759ba68880f0bff46d2519f420c50f088eae84596d2686be428604f678a716f3c10d002f4c
-EBUILD awscli-1.19.95.ebuild 1467 BLAKE2B ff662a5f00944f42ceccaa347486745528b94083fc5ff4053a28253d9cbd26d7ba46688d95ed8c7d1e50f01e692f3f16f26e01ffcc8973a4fef31c6f2c58b07b SHA512 d79f8e7fd1609fe1f4d746a363b14e05d8b68a3b1359cdc2215a03759ba68880f0bff46d2519f420c50f088eae84596d2686be428604f678a716f3c10d002f4c
-EBUILD awscli-1.19.96.ebuild 1467 BLAKE2B ff662a5f00944f42ceccaa347486745528b94083fc5ff4053a28253d9cbd26d7ba46688d95ed8c7d1e50f01e692f3f16f26e01ffcc8973a4fef31c6f2c58b07b SHA512 d79f8e7fd1609fe1f4d746a363b14e05d8b68a3b1359cdc2215a03759ba68880f0bff46d2519f420c50f088eae84596d2686be428604f678a716f3c10d002f4c
-EBUILD awscli-1.19.97.ebuild 1467 BLAKE2B ff662a5f00944f42ceccaa347486745528b94083fc5ff4053a28253d9cbd26d7ba46688d95ed8c7d1e50f01e692f3f16f26e01ffcc8973a4fef31c6f2c58b07b SHA512 d79f8e7fd1609fe1f4d746a363b14e05d8b68a3b1359cdc2215a03759ba68880f0bff46d2519f420c50f088eae84596d2686be428604f678a716f3c10d002f4c
-EBUILD awscli-1.19.98.ebuild 1467 BLAKE2B ff662a5f00944f42ceccaa347486745528b94083fc5ff4053a28253d9cbd26d7ba46688d95ed8c7d1e50f01e692f3f16f26e01ffcc8973a4fef31c6f2c58b07b SHA512 d79f8e7fd1609fe1f4d746a363b14e05d8b68a3b1359cdc2215a03759ba68880f0bff46d2519f420c50f088eae84596d2686be428604f678a716f3c10d002f4c
-EBUILD awscli-1.19.99.ebuild 1467 BLAKE2B ff662a5f00944f42ceccaa347486745528b94083fc5ff4053a28253d9cbd26d7ba46688d95ed8c7d1e50f01e692f3f16f26e01ffcc8973a4fef31c6f2c58b07b SHA512 d79f8e7fd1609fe1f4d746a363b14e05d8b68a3b1359cdc2215a03759ba68880f0bff46d2519f420c50f088eae84596d2686be428604f678a716f3c10d002f4c
+EBUILD awscli-1.19.104.ebuild 1467 BLAKE2B ff662a5f00944f42ceccaa347486745528b94083fc5ff4053a28253d9cbd26d7ba46688d95ed8c7d1e50f01e692f3f16f26e01ffcc8973a4fef31c6f2c58b07b SHA512 d79f8e7fd1609fe1f4d746a363b14e05d8b68a3b1359cdc2215a03759ba68880f0bff46d2519f420c50f088eae84596d2686be428604f678a716f3c10d002f4c
+EBUILD awscli-1.19.105.ebuild 1467 BLAKE2B ff662a5f00944f42ceccaa347486745528b94083fc5ff4053a28253d9cbd26d7ba46688d95ed8c7d1e50f01e692f3f16f26e01ffcc8973a4fef31c6f2c58b07b SHA512 d79f8e7fd1609fe1f4d746a363b14e05d8b68a3b1359cdc2215a03759ba68880f0bff46d2519f420c50f088eae84596d2686be428604f678a716f3c10d002f4c
+EBUILD awscli-1.19.97.ebuild 1465 BLAKE2B 0414a41a1f6a9234c4c74ed23e4ce30b1801ce885e556b290ede026239d537d38912c4557b11985e8e25d95916fbae319876900c46e89e5858ea051ee6a18373 SHA512 ed3d2f988845db9dfff03a8c64373a19dd7719945370e374092403c8a022a9a2f6acd294ed1ad857a40c76730a9a4c42d5a1da4b84cc5f37401317f63b19694f
 MISC metadata.xml 446 BLAKE2B ec9df05d20b2bb8838cd4dfd9671124c638130e9ef249041ecadae1f9ec8894f143bbfa12bde776b02e3bca073f36a836c2a7d3575f5d4a1dbe64dec8fab1367 SHA512 bf0f41deac11dcc66ce93e230d7892215501d10b4fbb0fa5b83d7003185037b6d90dfe7ec2e06ed4bed3ff3f0966280cd4316ad0293a7b4921aaabeb2c85a635
diff --git a/app-admin/awscli/awscli-1.19.102.ebuild b/app-admin/awscli/awscli-1.19.102.ebuild
deleted file mode 100644
index ff429f8d3a3e..000000000000
--- a/app-admin/awscli/awscli-1.19.102.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit bash-completion-r1 distutils-r1
-
-DESCRIPTION="Universal Command Line Environment for AWS"
-HOMEPAGE="https://pypi.org/project/awscli/"
-#SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-SRC_URI="https://github.com/aws/aws-cli/archive/${PV}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/aws-cli-${PV}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
-
-# botocore is x.(y+1).z
-BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 1)).$(ver_cut 3-)"
-RDEPEND="
-	>=dev-python/botocore-${BOTOCORE_PV}[${PYTHON_USEDEP}]
-	dev-python/colorama[${PYTHON_USEDEP}]
-	dev-python/docutils[${PYTHON_USEDEP}]
-	dev-python/rsa[${PYTHON_USEDEP}]
-	>=dev-python/s3transfer-0.4.0[${PYTHON_USEDEP}]
-	dev-python/pyyaml[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests --install nose
-
-PATCHES=(
-	"${FILESDIR}"/awscli-1.19.47-py39.patch
-)
-
-python_test() {
-	distutils_install_for_testing
-	# integration tests require AWS credentials and Internet access
-	nosetests -v tests/{functional,unit} ||
-		die "Tests failed for ${EPYTHON}"
-}
-
-python_install_all() {
-	newbashcomp bin/aws_bash_completer aws
-
-	insinto /usr/share/zsh/site-functions
-	newins bin/aws_zsh_completer.sh _aws
-
-	distutils-r1_python_install_all
-
-	rm "${ED}"/usr/bin/{aws.cmd,aws_bash_completer,aws_zsh_completer.sh} || die
-}
diff --git a/app-admin/awscli/awscli-1.19.100.ebuild b/app-admin/awscli/awscli-1.19.104.ebuild
index ff429f8d3a3e..ff429f8d3a3e 100644
--- a/app-admin/awscli/awscli-1.19.100.ebuild
+++ b/app-admin/awscli/awscli-1.19.104.ebuild
diff --git a/app-admin/awscli/awscli-1.19.101.ebuild b/app-admin/awscli/awscli-1.19.105.ebuild
index ff429f8d3a3e..ff429f8d3a3e 100644
--- a/app-admin/awscli/awscli-1.19.101.ebuild
+++ b/app-admin/awscli/awscli-1.19.105.ebuild
diff --git a/app-admin/awscli/awscli-1.19.47-r1.ebuild b/app-admin/awscli/awscli-1.19.47-r1.ebuild
deleted file mode 100644
index b5ba7214649c..000000000000
--- a/app-admin/awscli/awscli-1.19.47-r1.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-PYTHON_COMPAT=( python3_{7,8,9} )
-
-inherit bash-completion-r1 distutils-r1
-
-DESCRIPTION="Universal Command Line Environment for AWS"
-HOMEPAGE="https://pypi.org/project/awscli/"
-#SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-SRC_URI="https://github.com/aws/aws-cli/archive/${PV}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/aws-cli-${PV}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
-
-RDEPEND="
-	=dev-python/botocore-1.20*[${PYTHON_USEDEP}]
-	dev-python/colorama[${PYTHON_USEDEP}]
-	dev-python/docutils[${PYTHON_USEDEP}]
-	dev-python/rsa[${PYTHON_USEDEP}]
-	>=dev-python/s3transfer-0.3.0[${PYTHON_USEDEP}]
-	dev-python/pyyaml[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests --install nose
-
-PATCHES=(
-	"${FILESDIR}"/awscli-1.19.47-py39.patch
-)
-
-python_test() {
-	distutils_install_for_testing
-	# integration tests require AWS credentials and Internet access
-	nosetests -v tests/{functional,unit} ||
-		die "Tests failed for ${EPYTHON}"
-}
-
-python_install_all() {
-	newbashcomp bin/aws_bash_completer aws
-
-	insinto /usr/share/zsh/site-functions
-	newins bin/aws_zsh_completer.sh _aws
-
-	distutils-r1_python_install_all
-
-	rm "${ED}"/usr/bin/{aws.cmd,aws_bash_completer,aws_zsh_completer.sh} || die
-}
diff --git a/app-admin/awscli/awscli-1.19.78.ebuild b/app-admin/awscli/awscli-1.19.78.ebuild
deleted file mode 100644
index d57c79858b9f..000000000000
--- a/app-admin/awscli/awscli-1.19.78.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-PYTHON_COMPAT=( python3_{7..9} )
-
-inherit bash-completion-r1 distutils-r1
-
-DESCRIPTION="Universal Command Line Environment for AWS"
-HOMEPAGE="https://pypi.org/project/awscli/"
-#SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-SRC_URI="https://github.com/aws/aws-cli/archive/${PV}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/aws-cli-${PV}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
-
-# botocore is x.(y+1).z
-BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 1)).$(ver_cut 3-)"
-RDEPEND="
-	>=dev-python/botocore-${BOTOCORE_PV}[${PYTHON_USEDEP}]
-	dev-python/colorama[${PYTHON_USEDEP}]
-	dev-python/docutils[${PYTHON_USEDEP}]
-	dev-python/rsa[${PYTHON_USEDEP}]
-	>=dev-python/s3transfer-0.4.0[${PYTHON_USEDEP}]
-	dev-python/pyyaml[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests --install nose
-
-PATCHES=(
-	"${FILESDIR}"/awscli-1.19.47-py39.patch
-)
-
-python_test() {
-	distutils_install_for_testing
-	# integration tests require AWS credentials and Internet access
-	nosetests -v tests/{functional,unit} ||
-		die "Tests failed for ${EPYTHON}"
-}
-
-python_install_all() {
-	newbashcomp bin/aws_bash_completer aws
-
-	insinto /usr/share/zsh/site-functions
-	newins bin/aws_zsh_completer.sh _aws
-
-	distutils-r1_python_install_all
-
-	rm "${ED}"/usr/bin/{aws.cmd,aws_bash_completer,aws_zsh_completer.sh} || die
-}
diff --git a/app-admin/awscli/awscli-1.19.79.ebuild b/app-admin/awscli/awscli-1.19.79.ebuild
deleted file mode 100644
index d57c79858b9f..000000000000
--- a/app-admin/awscli/awscli-1.19.79.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-PYTHON_COMPAT=( python3_{7..9} )
-
-inherit bash-completion-r1 distutils-r1
-
-DESCRIPTION="Universal Command Line Environment for AWS"
-HOMEPAGE="https://pypi.org/project/awscli/"
-#SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-SRC_URI="https://github.com/aws/aws-cli/archive/${PV}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/aws-cli-${PV}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
-
-# botocore is x.(y+1).z
-BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 1)).$(ver_cut 3-)"
-RDEPEND="
-	>=dev-python/botocore-${BOTOCORE_PV}[${PYTHON_USEDEP}]
-	dev-python/colorama[${PYTHON_USEDEP}]
-	dev-python/docutils[${PYTHON_USEDEP}]
-	dev-python/rsa[${PYTHON_USEDEP}]
-	>=dev-python/s3transfer-0.4.0[${PYTHON_USEDEP}]
-	dev-python/pyyaml[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests --install nose
-
-PATCHES=(
-	"${FILESDIR}"/awscli-1.19.47-py39.patch
-)
-
-python_test() {
-	distutils_install_for_testing
-	# integration tests require AWS credentials and Internet access
-	nosetests -v tests/{functional,unit} ||
-		die "Tests failed for ${EPYTHON}"
-}
-
-python_install_all() {
-	newbashcomp bin/aws_bash_completer aws
-
-	insinto /usr/share/zsh/site-functions
-	newins bin/aws_zsh_completer.sh _aws
-
-	distutils-r1_python_install_all
-
-	rm "${ED}"/usr/bin/{aws.cmd,aws_bash_completer,aws_zsh_completer.sh} || die
-}
diff --git a/app-admin/awscli/awscli-1.19.80.ebuild b/app-admin/awscli/awscli-1.19.80.ebuild
deleted file mode 100644
index d57c79858b9f..000000000000
--- a/app-admin/awscli/awscli-1.19.80.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-PYTHON_COMPAT=( python3_{7..9} )
-
-inherit bash-completion-r1 distutils-r1
-
-DESCRIPTION="Universal Command Line Environment for AWS"
-HOMEPAGE="https://pypi.org/project/awscli/"
-#SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-SRC_URI="https://github.com/aws/aws-cli/archive/${PV}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/aws-cli-${PV}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
-
-# botocore is x.(y+1).z
-BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 1)).$(ver_cut 3-)"
-RDEPEND="
-	>=dev-python/botocore-${BOTOCORE_PV}[${PYTHON_USEDEP}]
-	dev-python/colorama[${PYTHON_USEDEP}]
-	dev-python/docutils[${PYTHON_USEDEP}]
-	dev-python/rsa[${PYTHON_USEDEP}]
-	>=dev-python/s3transfer-0.4.0[${PYTHON_USEDEP}]
-	dev-python/pyyaml[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests --install nose
-
-PATCHES=(
-	"${FILESDIR}"/awscli-1.19.47-py39.patch
-)
-
-python_test() {
-	distutils_install_for_testing
-	# integration tests require AWS credentials and Internet access
-	nosetests -v tests/{functional,unit} ||
-		die "Tests failed for ${EPYTHON}"
-}
-
-python_install_all() {
-	newbashcomp bin/aws_bash_completer aws
-
-	insinto /usr/share/zsh/site-functions
-	newins bin/aws_zsh_completer.sh _aws
-
-	distutils-r1_python_install_all
-
-	rm "${ED}"/usr/bin/{aws.cmd,aws_bash_completer,aws_zsh_completer.sh} || die
-}
diff --git a/app-admin/awscli/awscli-1.19.82.ebuild b/app-admin/awscli/awscli-1.19.82.ebuild
deleted file mode 100644
index d57c79858b9f..000000000000
--- a/app-admin/awscli/awscli-1.19.82.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-PYTHON_COMPAT=( python3_{7..9} )
-
-inherit bash-completion-r1 distutils-r1
-
-DESCRIPTION="Universal Command Line Environment for AWS"
-HOMEPAGE="https://pypi.org/project/awscli/"
-#SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-SRC_URI="https://github.com/aws/aws-cli/archive/${PV}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/aws-cli-${PV}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
-
-# botocore is x.(y+1).z
-BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 1)).$(ver_cut 3-)"
-RDEPEND="
-	>=dev-python/botocore-${BOTOCORE_PV}[${PYTHON_USEDEP}]
-	dev-python/colorama[${PYTHON_USEDEP}]
-	dev-python/docutils[${PYTHON_USEDEP}]
-	dev-python/rsa[${PYTHON_USEDEP}]
-	>=dev-python/s3transfer-0.4.0[${PYTHON_USEDEP}]
-	dev-python/pyyaml[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests --install nose
-
-PATCHES=(
-	"${FILESDIR}"/awscli-1.19.47-py39.patch
-)
-
-python_test() {
-	distutils_install_for_testing
-	# integration tests require AWS credentials and Internet access
-	nosetests -v tests/{functional,unit} ||
-		die "Tests failed for ${EPYTHON}"
-}
-
-python_install_all() {
-	newbashcomp bin/aws_bash_completer aws
-
-	insinto /usr/share/zsh/site-functions
-	newins bin/aws_zsh_completer.sh _aws
-
-	distutils-r1_python_install_all
-
-	rm "${ED}"/usr/bin/{aws.cmd,aws_bash_completer,aws_zsh_completer.sh} || die
-}
diff --git a/app-admin/awscli/awscli-1.19.83.ebuild b/app-admin/awscli/awscli-1.19.83.ebuild
deleted file mode 100644
index d57c79858b9f..000000000000
--- a/app-admin/awscli/awscli-1.19.83.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-PYTHON_COMPAT=( python3_{7..9} )
-
-inherit bash-completion-r1 distutils-r1
-
-DESCRIPTION="Universal Command Line Environment for AWS"
-HOMEPAGE="https://pypi.org/project/awscli/"
-#SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-SRC_URI="https://github.com/aws/aws-cli/archive/${PV}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/aws-cli-${PV}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
-
-# botocore is x.(y+1).z
-BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 1)).$(ver_cut 3-)"
-RDEPEND="
-	>=dev-python/botocore-${BOTOCORE_PV}[${PYTHON_USEDEP}]
-	dev-python/colorama[${PYTHON_USEDEP}]
-	dev-python/docutils[${PYTHON_USEDEP}]
-	dev-python/rsa[${PYTHON_USEDEP}]
-	>=dev-python/s3transfer-0.4.0[${PYTHON_USEDEP}]
-	dev-python/pyyaml[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests --install nose
-
-PATCHES=(
-	"${FILESDIR}"/awscli-1.19.47-py39.patch
-)
-
-python_test() {
-	distutils_install_for_testing
-	# integration tests require AWS credentials and Internet access
-	nosetests -v tests/{functional,unit} ||
-		die "Tests failed for ${EPYTHON}"
-}
-
-python_install_all() {
-	newbashcomp bin/aws_bash_completer aws
-
-	insinto /usr/share/zsh/site-functions
-	newins bin/aws_zsh_completer.sh _aws
-
-	distutils-r1_python_install_all
-
-	rm "${ED}"/usr/bin/{aws.cmd,aws_bash_completer,aws_zsh_completer.sh} || die
-}
diff --git a/app-admin/awscli/awscli-1.19.84.ebuild b/app-admin/awscli/awscli-1.19.84.ebuild
deleted file mode 100644
index d57c79858b9f..000000000000
--- a/app-admin/awscli/awscli-1.19.84.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-PYTHON_COMPAT=( python3_{7..9} )
-
-inherit bash-completion-r1 distutils-r1
-
-DESCRIPTION="Universal Command Line Environment for AWS"
-HOMEPAGE="https://pypi.org/project/awscli/"
-#SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-SRC_URI="https://github.com/aws/aws-cli/archive/${PV}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/aws-cli-${PV}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
-
-# botocore is x.(y+1).z
-BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 1)).$(ver_cut 3-)"
-RDEPEND="
-	>=dev-python/botocore-${BOTOCORE_PV}[${PYTHON_USEDEP}]
-	dev-python/colorama[${PYTHON_USEDEP}]
-	dev-python/docutils[${PYTHON_USEDEP}]
-	dev-python/rsa[${PYTHON_USEDEP}]
-	>=dev-python/s3transfer-0.4.0[${PYTHON_USEDEP}]
-	dev-python/pyyaml[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests --install nose
-
-PATCHES=(
-	"${FILESDIR}"/awscli-1.19.47-py39.patch
-)
-
-python_test() {
-	distutils_install_for_testing
-	# integration tests require AWS credentials and Internet access
-	nosetests -v tests/{functional,unit} ||
-		die "Tests failed for ${EPYTHON}"
-}
-
-python_install_all() {
-	newbashcomp bin/aws_bash_completer aws
-
-	insinto /usr/share/zsh/site-functions
-	newins bin/aws_zsh_completer.sh _aws
-
-	distutils-r1_python_install_all
-
-	rm "${ED}"/usr/bin/{aws.cmd,aws_bash_completer,aws_zsh_completer.sh} || die
-}
diff --git a/app-admin/awscli/awscli-1.19.85.ebuild b/app-admin/awscli/awscli-1.19.85.ebuild
deleted file mode 100644
index d57c79858b9f..000000000000
--- a/app-admin/awscli/awscli-1.19.85.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-PYTHON_COMPAT=( python3_{7..9} )
-
-inherit bash-completion-r1 distutils-r1
-
-DESCRIPTION="Universal Command Line Environment for AWS"
-HOMEPAGE="https://pypi.org/project/awscli/"
-#SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-SRC_URI="https://github.com/aws/aws-cli/archive/${PV}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/aws-cli-${PV}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
-
-# botocore is x.(y+1).z
-BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 1)).$(ver_cut 3-)"
-RDEPEND="
-	>=dev-python/botocore-${BOTOCORE_PV}[${PYTHON_USEDEP}]
-	dev-python/colorama[${PYTHON_USEDEP}]
-	dev-python/docutils[${PYTHON_USEDEP}]
-	dev-python/rsa[${PYTHON_USEDEP}]
-	>=dev-python/s3transfer-0.4.0[${PYTHON_USEDEP}]
-	dev-python/pyyaml[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests --install nose
-
-PATCHES=(
-	"${FILESDIR}"/awscli-1.19.47-py39.patch
-)
-
-python_test() {
-	distutils_install_for_testing
-	# integration tests require AWS credentials and Internet access
-	nosetests -v tests/{functional,unit} ||
-		die "Tests failed for ${EPYTHON}"
-}
-
-python_install_all() {
-	newbashcomp bin/aws_bash_completer aws
-
-	insinto /usr/share/zsh/site-functions
-	newins bin/aws_zsh_completer.sh _aws
-
-	distutils-r1_python_install_all
-
-	rm "${ED}"/usr/bin/{aws.cmd,aws_bash_completer,aws_zsh_completer.sh} || die
-}
diff --git a/app-admin/awscli/awscli-1.19.86.ebuild b/app-admin/awscli/awscli-1.19.86.ebuild
deleted file mode 100644
index d57c79858b9f..000000000000
--- a/app-admin/awscli/awscli-1.19.86.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-PYTHON_COMPAT=( python3_{7..9} )
-
-inherit bash-completion-r1 distutils-r1
-
-DESCRIPTION="Universal Command Line Environment for AWS"
-HOMEPAGE="https://pypi.org/project/awscli/"
-#SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-SRC_URI="https://github.com/aws/aws-cli/archive/${PV}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/aws-cli-${PV}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
-
-# botocore is x.(y+1).z
-BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 1)).$(ver_cut 3-)"
-RDEPEND="
-	>=dev-python/botocore-${BOTOCORE_PV}[${PYTHON_USEDEP}]
-	dev-python/colorama[${PYTHON_USEDEP}]
-	dev-python/docutils[${PYTHON_USEDEP}]
-	dev-python/rsa[${PYTHON_USEDEP}]
-	>=dev-python/s3transfer-0.4.0[${PYTHON_USEDEP}]
-	dev-python/pyyaml[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests --install nose
-
-PATCHES=(
-	"${FILESDIR}"/awscli-1.19.47-py39.patch
-)
-
-python_test() {
-	distutils_install_for_testing
-	# integration tests require AWS credentials and Internet access
-	nosetests -v tests/{functional,unit} ||
-		die "Tests failed for ${EPYTHON}"
-}
-
-python_install_all() {
-	newbashcomp bin/aws_bash_completer aws
-
-	insinto /usr/share/zsh/site-functions
-	newins bin/aws_zsh_completer.sh _aws
-
-	distutils-r1_python_install_all
-
-	rm "${ED}"/usr/bin/{aws.cmd,aws_bash_completer,aws_zsh_completer.sh} || die
-}
diff --git a/app-admin/awscli/awscli-1.19.87.ebuild b/app-admin/awscli/awscli-1.19.87.ebuild
deleted file mode 100644
index ff429f8d3a3e..000000000000
--- a/app-admin/awscli/awscli-1.19.87.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit bash-completion-r1 distutils-r1
-
-DESCRIPTION="Universal Command Line Environment for AWS"
-HOMEPAGE="https://pypi.org/project/awscli/"
-#SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-SRC_URI="https://github.com/aws/aws-cli/archive/${PV}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/aws-cli-${PV}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
-
-# botocore is x.(y+1).z
-BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 1)).$(ver_cut 3-)"
-RDEPEND="
-	>=dev-python/botocore-${BOTOCORE_PV}[${PYTHON_USEDEP}]
-	dev-python/colorama[${PYTHON_USEDEP}]
-	dev-python/docutils[${PYTHON_USEDEP}]
-	dev-python/rsa[${PYTHON_USEDEP}]
-	>=dev-python/s3transfer-0.4.0[${PYTHON_USEDEP}]
-	dev-python/pyyaml[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests --install nose
-
-PATCHES=(
-	"${FILESDIR}"/awscli-1.19.47-py39.patch
-)
-
-python_test() {
-	distutils_install_for_testing
-	# integration tests require AWS credentials and Internet access
-	nosetests -v tests/{functional,unit} ||
-		die "Tests failed for ${EPYTHON}"
-}
-
-python_install_all() {
-	newbashcomp bin/aws_bash_completer aws
-
-	insinto /usr/share/zsh/site-functions
-	newins bin/aws_zsh_completer.sh _aws
-
-	distutils-r1_python_install_all
-
-	rm "${ED}"/usr/bin/{aws.cmd,aws_bash_completer,aws_zsh_completer.sh} || die
-}
diff --git a/app-admin/awscli/awscli-1.19.88.ebuild b/app-admin/awscli/awscli-1.19.88.ebuild
deleted file mode 100644
index ff429f8d3a3e..000000000000
--- a/app-admin/awscli/awscli-1.19.88.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit bash-completion-r1 distutils-r1
-
-DESCRIPTION="Universal Command Line Environment for AWS"
-HOMEPAGE="https://pypi.org/project/awscli/"
-#SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-SRC_URI="https://github.com/aws/aws-cli/archive/${PV}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/aws-cli-${PV}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
-
-# botocore is x.(y+1).z
-BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 1)).$(ver_cut 3-)"
-RDEPEND="
-	>=dev-python/botocore-${BOTOCORE_PV}[${PYTHON_USEDEP}]
-	dev-python/colorama[${PYTHON_USEDEP}]
-	dev-python/docutils[${PYTHON_USEDEP}]
-	dev-python/rsa[${PYTHON_USEDEP}]
-	>=dev-python/s3transfer-0.4.0[${PYTHON_USEDEP}]
-	dev-python/pyyaml[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests --install nose
-
-PATCHES=(
-	"${FILESDIR}"/awscli-1.19.47-py39.patch
-)
-
-python_test() {
-	distutils_install_for_testing
-	# integration tests require AWS credentials and Internet access
-	nosetests -v tests/{functional,unit} ||
-		die "Tests failed for ${EPYTHON}"
-}
-
-python_install_all() {
-	newbashcomp bin/aws_bash_completer aws
-
-	insinto /usr/share/zsh/site-functions
-	newins bin/aws_zsh_completer.sh _aws
-
-	distutils-r1_python_install_all
-
-	rm "${ED}"/usr/bin/{aws.cmd,aws_bash_completer,aws_zsh_completer.sh} || die
-}
diff --git a/app-admin/awscli/awscli-1.19.89.ebuild b/app-admin/awscli/awscli-1.19.89.ebuild
deleted file mode 100644
index ff429f8d3a3e..000000000000
--- a/app-admin/awscli/awscli-1.19.89.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit bash-completion-r1 distutils-r1
-
-DESCRIPTION="Universal Command Line Environment for AWS"
-HOMEPAGE="https://pypi.org/project/awscli/"
-#SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-SRC_URI="https://github.com/aws/aws-cli/archive/${PV}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/aws-cli-${PV}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
-
-# botocore is x.(y+1).z
-BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 1)).$(ver_cut 3-)"
-RDEPEND="
-	>=dev-python/botocore-${BOTOCORE_PV}[${PYTHON_USEDEP}]
-	dev-python/colorama[${PYTHON_USEDEP}]
-	dev-python/docutils[${PYTHON_USEDEP}]
-	dev-python/rsa[${PYTHON_USEDEP}]
-	>=dev-python/s3transfer-0.4.0[${PYTHON_USEDEP}]
-	dev-python/pyyaml[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests --install nose
-
-PATCHES=(
-	"${FILESDIR}"/awscli-1.19.47-py39.patch
-)
-
-python_test() {
-	distutils_install_for_testing
-	# integration tests require AWS credentials and Internet access
-	nosetests -v tests/{functional,unit} ||
-		die "Tests failed for ${EPYTHON}"
-}
-
-python_install_all() {
-	newbashcomp bin/aws_bash_completer aws
-
-	insinto /usr/share/zsh/site-functions
-	newins bin/aws_zsh_completer.sh _aws
-
-	distutils-r1_python_install_all
-
-	rm "${ED}"/usr/bin/{aws.cmd,aws_bash_completer,aws_zsh_completer.sh} || die
-}
diff --git a/app-admin/awscli/awscli-1.19.90.ebuild b/app-admin/awscli/awscli-1.19.90.ebuild
deleted file mode 100644
index ff429f8d3a3e..000000000000
--- a/app-admin/awscli/awscli-1.19.90.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit bash-completion-r1 distutils-r1
-
-DESCRIPTION="Universal Command Line Environment for AWS"
-HOMEPAGE="https://pypi.org/project/awscli/"
-#SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-SRC_URI="https://github.com/aws/aws-cli/archive/${PV}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/aws-cli-${PV}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
-
-# botocore is x.(y+1).z
-BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 1)).$(ver_cut 3-)"
-RDEPEND="
-	>=dev-python/botocore-${BOTOCORE_PV}[${PYTHON_USEDEP}]
-	dev-python/colorama[${PYTHON_USEDEP}]
-	dev-python/docutils[${PYTHON_USEDEP}]
-	dev-python/rsa[${PYTHON_USEDEP}]
-	>=dev-python/s3transfer-0.4.0[${PYTHON_USEDEP}]
-	dev-python/pyyaml[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests --install nose
-
-PATCHES=(
-	"${FILESDIR}"/awscli-1.19.47-py39.patch
-)
-
-python_test() {
-	distutils_install_for_testing
-	# integration tests require AWS credentials and Internet access
-	nosetests -v tests/{functional,unit} ||
-		die "Tests failed for ${EPYTHON}"
-}
-
-python_install_all() {
-	newbashcomp bin/aws_bash_completer aws
-
-	insinto /usr/share/zsh/site-functions
-	newins bin/aws_zsh_completer.sh _aws
-
-	distutils-r1_python_install_all
-
-	rm "${ED}"/usr/bin/{aws.cmd,aws_bash_completer,aws_zsh_completer.sh} || die
-}
diff --git a/app-admin/awscli/awscli-1.19.91.ebuild b/app-admin/awscli/awscli-1.19.91.ebuild
deleted file mode 100644
index ff429f8d3a3e..000000000000
--- a/app-admin/awscli/awscli-1.19.91.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit bash-completion-r1 distutils-r1
-
-DESCRIPTION="Universal Command Line Environment for AWS"
-HOMEPAGE="https://pypi.org/project/awscli/"
-#SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-SRC_URI="https://github.com/aws/aws-cli/archive/${PV}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/aws-cli-${PV}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
-
-# botocore is x.(y+1).z
-BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 1)).$(ver_cut 3-)"
-RDEPEND="
-	>=dev-python/botocore-${BOTOCORE_PV}[${PYTHON_USEDEP}]
-	dev-python/colorama[${PYTHON_USEDEP}]
-	dev-python/docutils[${PYTHON_USEDEP}]
-	dev-python/rsa[${PYTHON_USEDEP}]
-	>=dev-python/s3transfer-0.4.0[${PYTHON_USEDEP}]
-	dev-python/pyyaml[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests --install nose
-
-PATCHES=(
-	"${FILESDIR}"/awscli-1.19.47-py39.patch
-)
-
-python_test() {
-	distutils_install_for_testing
-	# integration tests require AWS credentials and Internet access
-	nosetests -v tests/{functional,unit} ||
-		die "Tests failed for ${EPYTHON}"
-}
-
-python_install_all() {
-	newbashcomp bin/aws_bash_completer aws
-
-	insinto /usr/share/zsh/site-functions
-	newins bin/aws_zsh_completer.sh _aws
-
-	distutils-r1_python_install_all
-
-	rm "${ED}"/usr/bin/{aws.cmd,aws_bash_completer,aws_zsh_completer.sh} || die
-}
diff --git a/app-admin/awscli/awscli-1.19.92.ebuild b/app-admin/awscli/awscli-1.19.92.ebuild
deleted file mode 100644
index ff429f8d3a3e..000000000000
--- a/app-admin/awscli/awscli-1.19.92.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit bash-completion-r1 distutils-r1
-
-DESCRIPTION="Universal Command Line Environment for AWS"
-HOMEPAGE="https://pypi.org/project/awscli/"
-#SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-SRC_URI="https://github.com/aws/aws-cli/archive/${PV}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/aws-cli-${PV}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
-
-# botocore is x.(y+1).z
-BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 1)).$(ver_cut 3-)"
-RDEPEND="
-	>=dev-python/botocore-${BOTOCORE_PV}[${PYTHON_USEDEP}]
-	dev-python/colorama[${PYTHON_USEDEP}]
-	dev-python/docutils[${PYTHON_USEDEP}]
-	dev-python/rsa[${PYTHON_USEDEP}]
-	>=dev-python/s3transfer-0.4.0[${PYTHON_USEDEP}]
-	dev-python/pyyaml[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests --install nose
-
-PATCHES=(
-	"${FILESDIR}"/awscli-1.19.47-py39.patch
-)
-
-python_test() {
-	distutils_install_for_testing
-	# integration tests require AWS credentials and Internet access
-	nosetests -v tests/{functional,unit} ||
-		die "Tests failed for ${EPYTHON}"
-}
-
-python_install_all() {
-	newbashcomp bin/aws_bash_completer aws
-
-	insinto /usr/share/zsh/site-functions
-	newins bin/aws_zsh_completer.sh _aws
-
-	distutils-r1_python_install_all
-
-	rm "${ED}"/usr/bin/{aws.cmd,aws_bash_completer,aws_zsh_completer.sh} || die
-}
diff --git a/app-admin/awscli/awscli-1.19.93.ebuild b/app-admin/awscli/awscli-1.19.93.ebuild
deleted file mode 100644
index ff429f8d3a3e..000000000000
--- a/app-admin/awscli/awscli-1.19.93.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit bash-completion-r1 distutils-r1
-
-DESCRIPTION="Universal Command Line Environment for AWS"
-HOMEPAGE="https://pypi.org/project/awscli/"
-#SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-SRC_URI="https://github.com/aws/aws-cli/archive/${PV}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/aws-cli-${PV}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
-
-# botocore is x.(y+1).z
-BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 1)).$(ver_cut 3-)"
-RDEPEND="
-	>=dev-python/botocore-${BOTOCORE_PV}[${PYTHON_USEDEP}]
-	dev-python/colorama[${PYTHON_USEDEP}]
-	dev-python/docutils[${PYTHON_USEDEP}]
-	dev-python/rsa[${PYTHON_USEDEP}]
-	>=dev-python/s3transfer-0.4.0[${PYTHON_USEDEP}]
-	dev-python/pyyaml[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests --install nose
-
-PATCHES=(
-	"${FILESDIR}"/awscli-1.19.47-py39.patch
-)
-
-python_test() {
-	distutils_install_for_testing
-	# integration tests require AWS credentials and Internet access
-	nosetests -v tests/{functional,unit} ||
-		die "Tests failed for ${EPYTHON}"
-}
-
-python_install_all() {
-	newbashcomp bin/aws_bash_completer aws
-
-	insinto /usr/share/zsh/site-functions
-	newins bin/aws_zsh_completer.sh _aws
-
-	distutils-r1_python_install_all
-
-	rm "${ED}"/usr/bin/{aws.cmd,aws_bash_completer,aws_zsh_completer.sh} || die
-}
diff --git a/app-admin/awscli/awscli-1.19.94.ebuild b/app-admin/awscli/awscli-1.19.94.ebuild
deleted file mode 100644
index ff429f8d3a3e..000000000000
--- a/app-admin/awscli/awscli-1.19.94.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit bash-completion-r1 distutils-r1
-
-DESCRIPTION="Universal Command Line Environment for AWS"
-HOMEPAGE="https://pypi.org/project/awscli/"
-#SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-SRC_URI="https://github.com/aws/aws-cli/archive/${PV}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/aws-cli-${PV}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
-
-# botocore is x.(y+1).z
-BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 1)).$(ver_cut 3-)"
-RDEPEND="
-	>=dev-python/botocore-${BOTOCORE_PV}[${PYTHON_USEDEP}]
-	dev-python/colorama[${PYTHON_USEDEP}]
-	dev-python/docutils[${PYTHON_USEDEP}]
-	dev-python/rsa[${PYTHON_USEDEP}]
-	>=dev-python/s3transfer-0.4.0[${PYTHON_USEDEP}]
-	dev-python/pyyaml[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests --install nose
-
-PATCHES=(
-	"${FILESDIR}"/awscli-1.19.47-py39.patch
-)
-
-python_test() {
-	distutils_install_for_testing
-	# integration tests require AWS credentials and Internet access
-	nosetests -v tests/{functional,unit} ||
-		die "Tests failed for ${EPYTHON}"
-}
-
-python_install_all() {
-	newbashcomp bin/aws_bash_completer aws
-
-	insinto /usr/share/zsh/site-functions
-	newins bin/aws_zsh_completer.sh _aws
-
-	distutils-r1_python_install_all
-
-	rm "${ED}"/usr/bin/{aws.cmd,aws_bash_completer,aws_zsh_completer.sh} || die
-}
diff --git a/app-admin/awscli/awscli-1.19.95.ebuild b/app-admin/awscli/awscli-1.19.95.ebuild
deleted file mode 100644
index ff429f8d3a3e..000000000000
--- a/app-admin/awscli/awscli-1.19.95.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit bash-completion-r1 distutils-r1
-
-DESCRIPTION="Universal Command Line Environment for AWS"
-HOMEPAGE="https://pypi.org/project/awscli/"
-#SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-SRC_URI="https://github.com/aws/aws-cli/archive/${PV}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/aws-cli-${PV}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
-
-# botocore is x.(y+1).z
-BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 1)).$(ver_cut 3-)"
-RDEPEND="
-	>=dev-python/botocore-${BOTOCORE_PV}[${PYTHON_USEDEP}]
-	dev-python/colorama[${PYTHON_USEDEP}]
-	dev-python/docutils[${PYTHON_USEDEP}]
-	dev-python/rsa[${PYTHON_USEDEP}]
-	>=dev-python/s3transfer-0.4.0[${PYTHON_USEDEP}]
-	dev-python/pyyaml[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests --install nose
-
-PATCHES=(
-	"${FILESDIR}"/awscli-1.19.47-py39.patch
-)
-
-python_test() {
-	distutils_install_for_testing
-	# integration tests require AWS credentials and Internet access
-	nosetests -v tests/{functional,unit} ||
-		die "Tests failed for ${EPYTHON}"
-}
-
-python_install_all() {
-	newbashcomp bin/aws_bash_completer aws
-
-	insinto /usr/share/zsh/site-functions
-	newins bin/aws_zsh_completer.sh _aws
-
-	distutils-r1_python_install_all
-
-	rm "${ED}"/usr/bin/{aws.cmd,aws_bash_completer,aws_zsh_completer.sh} || die
-}
diff --git a/app-admin/awscli/awscli-1.19.96.ebuild b/app-admin/awscli/awscli-1.19.96.ebuild
deleted file mode 100644
index ff429f8d3a3e..000000000000
--- a/app-admin/awscli/awscli-1.19.96.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit bash-completion-r1 distutils-r1
-
-DESCRIPTION="Universal Command Line Environment for AWS"
-HOMEPAGE="https://pypi.org/project/awscli/"
-#SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-SRC_URI="https://github.com/aws/aws-cli/archive/${PV}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/aws-cli-${PV}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
-
-# botocore is x.(y+1).z
-BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 1)).$(ver_cut 3-)"
-RDEPEND="
-	>=dev-python/botocore-${BOTOCORE_PV}[${PYTHON_USEDEP}]
-	dev-python/colorama[${PYTHON_USEDEP}]
-	dev-python/docutils[${PYTHON_USEDEP}]
-	dev-python/rsa[${PYTHON_USEDEP}]
-	>=dev-python/s3transfer-0.4.0[${PYTHON_USEDEP}]
-	dev-python/pyyaml[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests --install nose
-
-PATCHES=(
-	"${FILESDIR}"/awscli-1.19.47-py39.patch
-)
-
-python_test() {
-	distutils_install_for_testing
-	# integration tests require AWS credentials and Internet access
-	nosetests -v tests/{functional,unit} ||
-		die "Tests failed for ${EPYTHON}"
-}
-
-python_install_all() {
-	newbashcomp bin/aws_bash_completer aws
-
-	insinto /usr/share/zsh/site-functions
-	newins bin/aws_zsh_completer.sh _aws
-
-	distutils-r1_python_install_all
-
-	rm "${ED}"/usr/bin/{aws.cmd,aws_bash_completer,aws_zsh_completer.sh} || die
-}
diff --git a/app-admin/awscli/awscli-1.19.97.ebuild b/app-admin/awscli/awscli-1.19.97.ebuild
index ff429f8d3a3e..4221a0155f55 100644
--- a/app-admin/awscli/awscli-1.19.97.ebuild
+++ b/app-admin/awscli/awscli-1.19.97.ebuild
@@ -15,7 +15,7 @@ S="${WORKDIR}/aws-cli-${PV}"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 
 # botocore is x.(y+1).z
 BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 1)).$(ver_cut 3-)"
diff --git a/app-admin/awscli/awscli-1.19.98.ebuild b/app-admin/awscli/awscli-1.19.98.ebuild
deleted file mode 100644
index ff429f8d3a3e..000000000000
--- a/app-admin/awscli/awscli-1.19.98.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit bash-completion-r1 distutils-r1
-
-DESCRIPTION="Universal Command Line Environment for AWS"
-HOMEPAGE="https://pypi.org/project/awscli/"
-#SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-SRC_URI="https://github.com/aws/aws-cli/archive/${PV}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/aws-cli-${PV}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
-
-# botocore is x.(y+1).z
-BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 1)).$(ver_cut 3-)"
-RDEPEND="
-	>=dev-python/botocore-${BOTOCORE_PV}[${PYTHON_USEDEP}]
-	dev-python/colorama[${PYTHON_USEDEP}]
-	dev-python/docutils[${PYTHON_USEDEP}]
-	dev-python/rsa[${PYTHON_USEDEP}]
-	>=dev-python/s3transfer-0.4.0[${PYTHON_USEDEP}]
-	dev-python/pyyaml[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests --install nose
-
-PATCHES=(
-	"${FILESDIR}"/awscli-1.19.47-py39.patch
-)
-
-python_test() {
-	distutils_install_for_testing
-	# integration tests require AWS credentials and Internet access
-	nosetests -v tests/{functional,unit} ||
-		die "Tests failed for ${EPYTHON}"
-}
-
-python_install_all() {
-	newbashcomp bin/aws_bash_completer aws
-
-	insinto /usr/share/zsh/site-functions
-	newins bin/aws_zsh_completer.sh _aws
-
-	distutils-r1_python_install_all
-
-	rm "${ED}"/usr/bin/{aws.cmd,aws_bash_completer,aws_zsh_completer.sh} || die
-}
diff --git a/app-admin/awscli/awscli-1.19.99.ebuild b/app-admin/awscli/awscli-1.19.99.ebuild
deleted file mode 100644
index ff429f8d3a3e..000000000000
--- a/app-admin/awscli/awscli-1.19.99.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit bash-completion-r1 distutils-r1
-
-DESCRIPTION="Universal Command Line Environment for AWS"
-HOMEPAGE="https://pypi.org/project/awscli/"
-#SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-SRC_URI="https://github.com/aws/aws-cli/archive/${PV}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/aws-cli-${PV}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
-
-# botocore is x.(y+1).z
-BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 1)).$(ver_cut 3-)"
-RDEPEND="
-	>=dev-python/botocore-${BOTOCORE_PV}[${PYTHON_USEDEP}]
-	dev-python/colorama[${PYTHON_USEDEP}]
-	dev-python/docutils[${PYTHON_USEDEP}]
-	dev-python/rsa[${PYTHON_USEDEP}]
-	>=dev-python/s3transfer-0.4.0[${PYTHON_USEDEP}]
-	dev-python/pyyaml[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests --install nose
-
-PATCHES=(
-	"${FILESDIR}"/awscli-1.19.47-py39.patch
-)
-
-python_test() {
-	distutils_install_for_testing
-	# integration tests require AWS credentials and Internet access
-	nosetests -v tests/{functional,unit} ||
-		die "Tests failed for ${EPYTHON}"
-}
-
-python_install_all() {
-	newbashcomp bin/aws_bash_completer aws
-
-	insinto /usr/share/zsh/site-functions
-	newins bin/aws_zsh_completer.sh _aws
-
-	distutils-r1_python_install_all
-
-	rm "${ED}"/usr/bin/{aws.cmd,aws_bash_completer,aws_zsh_completer.sh} || die
-}
diff --git a/app-admin/conserver/Manifest b/app-admin/conserver/Manifest
index 051fccb336dd..036e2b6696f9 100644
--- a/app-admin/conserver/Manifest
+++ b/app-admin/conserver/Manifest
@@ -3,5 +3,5 @@ AUX conserver.confd-r1 133 BLAKE2B 6f3029a06b34458f70ef8370c35c09ea69a4d005aad17
 AUX conserver.initd-r1 428 BLAKE2B 574fa8611e928b17e70b1da522060c230b3f51ef0daf8babeeb9635f9652d01f06de1fa4309a213b6b2bca77099a17910aa5d6790bccc4e4e8f7f8fc0ba42458 SHA512 f0dcea7fddec5165fb00c452aa0b56c3eaa0919e96e5bf1ff4e80000b01fe80134bc4ee8a584114fcad56c6d5caa467d229b8b54bc8b4145dd2fa76871336c7d
 AUX conserver.pam-pambase 194 BLAKE2B ad284008c94f4c19b911a93279b12893a1c686806b22f7f19500e7216c19768ab161f9ba5cf2405d9d46f412a08c0cb04de0bc05ead15fb75da931575c2c3be2 SHA512 5368394be5b9d97e0ae751d84fbb4848aa27fd57b1a2eea8c7919e56246e390985deca80f0019c2104034103f73ac382a5ab2129113a0ff0b63b0b8bd83648c9
 DIST conserver-8.2.6.tar.gz 437315 BLAKE2B 9f62bb8ac91b57759c6b08d5a6ff31727a547c1991d322d75350a879a247925bbb1bbcab25b8a3d99a2ce6a997ba9f2e6c35338588e913055b29f3574e00e434 SHA512 3b7769675fd0edfd3727e5e84785f33c037b9e7a17c8c69c0ce48a447ea3b7de916e217c0f3b808b8350818b7bc702c917ea7a122ed96ae6b73f81ff0b5ae283
-EBUILD conserver-8.2.6-r1.ebuild 2314 BLAKE2B ab1d3085be3bc6709356f0ec73fe156309ed17aaa0deb6b6188e2cc62ac44eb68e98bed735dfd4902fe1b5e168f2331a9095193af9851c5d7507406cfff170ca SHA512 c2d6216eb4aab36de3590c69f7ddc4e1c20c09bc1808b55e709e82d5d207767862250d09c8296f06781f76b261e36221806a8dc63226b2c454e7c9f5d28810f2
+EBUILD conserver-8.2.6-r2.ebuild 2351 BLAKE2B f3702aac647c402eda148a64767b7d352815370b92de0be697b68b28400eabb62d625dd21e8ff842d8785a79bf1f4e03cda75b7ceb82ead2d04c8902338229cc SHA512 70160664e5abc664b04356b1cd40a844106f5aea678cbe512fa9cd5aed4a9eecbc23bdd378936b2887254d72eb756d4629fd2cde09c65b6ba49f3e333bf865a1
 MISC metadata.xml 1408 BLAKE2B 01acca9d16d6bf1f182d0c582f7c69f1c89a697a3b2fe44a589368faa4aa5117c6e7382214464497bc305cc38bab8f860a86460ebfe57d6b4af74bc4f0781b12 SHA512 604c18ac8e93c5d37a465e61f541a29ea6a5143518a153e5a39da820af53d8859e2ef4fe212ddeaad5e2cebed83735e55f61afda12c5cc0bcbf828d1a8238b3d
diff --git a/app-admin/conserver/conserver-8.2.6-r1.ebuild b/app-admin/conserver/conserver-8.2.6-r2.ebuild
index 34a51420681c..6385d383e52a 100644
--- a/app-admin/conserver/conserver-8.2.6-r1.ebuild
+++ b/app-admin/conserver/conserver-8.2.6-r2.ebuild
@@ -15,7 +15,9 @@ KEYWORDS="~alpha amd64 ~ia64 ppc ppc64 ~sparc x86"
 IUSE="debug ipv6 freeipmi kerberos pam ssl test tcpd"
 RESTRICT="!test? ( test )"
 
-DEPEND="debug? ( dev-libs/dmalloc:= )
+DEPEND="net-libs/libnsl
+	virtual/libcrypt:=
+	debug? ( dev-libs/dmalloc:= )
 	freeipmi? ( sys-libs/freeipmi:= )
 	kerberos? (
 		virtual/krb5
diff --git a/app-admin/doas/Manifest b/app-admin/doas/Manifest
index d00f7472e71e..69e890f0d91d 100644
--- a/app-admin/doas/Manifest
+++ b/app-admin/doas/Manifest
@@ -1,3 +1,3 @@
 DIST OpenDoas-6.8.1.tar.gz 32398 BLAKE2B cdaa01efaf3d164bcf6993693c86039fa4866dc1ce619731b455985ca1ebb5ebec889b540f4720c590318202de8a4b2fdf5d715f2170346818e706857b5adfa3 SHA512 d96fe1cdd70e9211de9996ad05bcf7a127facd02af48f7ab2561869d9d16708f1b61722c6e6b9fe15a62e9ef501e09b1ba444b7b43a066f1895e543ebc9402e7
-EBUILD doas-6.8.1.ebuild 1325 BLAKE2B 56415a510bf24adbb6eb0939330d767b9c81d60b0f058f23bb81b2d7907aba83dd74f697acc4a450f0dbbdd303edb901cda1eb719f866dc7c5d64391404b49d2 SHA512 b5661cc423a209c959945304e20ed30f531d6399423ead251d2ed9f9ae09f8b6e31d02bbd1f32f226629711b73e8d48d3fa4112ae21e00bc318f1cec31008260
+EBUILD doas-6.8.1-r1.ebuild 1355 BLAKE2B 0283d5a6535c46ed3dbcb3bbdf3aefd6beac4ffdba0bfb68d3e840dcc9c71a59f84647042e060f7f9a49634124b130d08a441f01b567734f5161dec2ba863812 SHA512 4ab87324a68230c9ab418c0e97b8a24ef12fb53536bed890461dd7e8ddf0bfdc8e34f0bca9b8c41bd32ea07bb7b9059d2302d2740d0730457c9d8f39fe166c38
 MISC metadata.xml 557 BLAKE2B 69a4a6528247efce28e3da9d035f1c4cdc83854a2ca78b83a75be542e8aad9874ed74fb6e07f5b7811d8fa23d1cf1adb11d9a86a687e4b6649709aef2bbaea56 SHA512 b89cfe499bf3fa4630a29ad3966f538e2c111710e4cfd035c945490394c8577ce1150cdecaff1f1548774d8b219b66b6f7faebc95861e1093edc9445fb5b7ffc
diff --git a/app-admin/doas/doas-6.8.1.ebuild b/app-admin/doas/doas-6.8.1-r1.ebuild
index 60e9377fd334..87b3c2c97b6d 100644
--- a/app-admin/doas/doas-6.8.1.ebuild
+++ b/app-admin/doas/doas-6.8.1-r1.ebuild
@@ -18,7 +18,8 @@ KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
 IUSE="pam persist"
 
 BDEPEND="virtual/yacc"
-RDEPEND="pam? ( sys-libs/pam )"
+RDEPEND="pam? ( sys-libs/pam )
+	!pam? ( virtual/libcrypt:= )"
 DEPEND="${RDEPEND}"
 
 src_prepare() {
diff --git a/app-admin/exo/Manifest b/app-admin/exo/Manifest
index d334acc9378f..9e9759f58a1e 100644
--- a/app-admin/exo/Manifest
+++ b/app-admin/exo/Manifest
@@ -1,3 +1,3 @@
-DIST exo-1.32.2.tar.gz 5228606 BLAKE2B 785150ba6e7a1e0c4bb730bfc21f158798844d0c76dad6cbc5e185df901c675ddb77c4a4e1ddab7fb37ffd40ecc22464ff8773dc8200c3fbba37662299694c0a SHA512 4b4904b517efdc89a0e929565e72d249a02b74300b46d03ae26fe38bbe1c2150091cf02e7af2c2a558048032efb3fb4cf76266cd959a6e7a48d5172f07d187aa
-EBUILD exo-1.32.2.ebuild 704 BLAKE2B 4116e696998dc4fbada1247aa9d0bc1bf0c863bc9325df342ea73010a6f8d573568472f418fd3e47a347b7a5e9a922dd8797beb5085e1dac9404c2d239b09ad9 SHA512 17e48fa4c79ec343769f7c6d7d90a29f7255c3b985bd31680d0fb3c9db82370eff26a9737b7a1911adf1a5e992a394972b3cffbcaf53a58b741e71e302e8de1f
+DIST exo-1.33.0.tar.gz 5227893 BLAKE2B 17272d6a614aa7b4441d3de73ffebda3244c0ce98e3d74e85c013c3410cf0d414cfcac958ba67eadebfbc84d6c3969bb8563f62a8a9531e6cdd09ac3dfa2526f SHA512 4c17cd8752862de70885a65d43d2ee69a6bed6e96d858423e308188a868b1732137c4bf811b1baae0e9b8a8425f8755d57a3711b333c50dd291fe1e22c19d91c
+EBUILD exo-1.33.0.ebuild 704 BLAKE2B 4116e696998dc4fbada1247aa9d0bc1bf0c863bc9325df342ea73010a6f8d573568472f418fd3e47a347b7a5e9a922dd8797beb5085e1dac9404c2d239b09ad9 SHA512 17e48fa4c79ec343769f7c6d7d90a29f7255c3b985bd31680d0fb3c9db82370eff26a9737b7a1911adf1a5e992a394972b3cffbcaf53a58b741e71e302e8de1f
 MISC metadata.xml 333 BLAKE2B 7158aba785c9b503c94098e7d68a820475660172b369a4adce5c68a50f21741db69e58ed9e946b792cd30a8e7b9506efaad35e48f508c4e292ee224be9b34c1b SHA512 0a6b2be31cf0944ea9077c8b2cd9da50dfd87568be72bc00f44822930487f8bcaf2da4324c5a3a35cbdfd69173673122660f3dba3e4189205d45e6b75c1c1f67
diff --git a/app-admin/exo/exo-1.32.2.ebuild b/app-admin/exo/exo-1.33.0.ebuild
index 49b1772f318b..49b1772f318b 100644
--- a/app-admin/exo/exo-1.32.2.ebuild
+++ b/app-admin/exo/exo-1.33.0.ebuild
diff --git a/app-admin/git-credential-gopass/Manifest b/app-admin/git-credential-gopass/Manifest
index 9a74c8e5c230..f7ac83d19de8 100644
--- a/app-admin/git-credential-gopass/Manifest
+++ b/app-admin/git-credential-gopass/Manifest
@@ -183,5 +183,5 @@ DIST gotest.tools%2F@v%2Fv2.2.0+incompatible.zip 88327 BLAKE2B 8730134244a00fb47
 DIST gotest.tools%2Fv3%2F@v%2Fv3.0.2.mod 194 BLAKE2B c322e2469b51e719e88bf9d9461c9a888afbdc1e214d9260b08324623e5828ce14b9dafdd42febc839e354f242e5ec53e78c9f61bd70338abc6de06090dd8197 SHA512 795de820e4a8622de316ee1b391a9c92476b3a67eee387278cd79f818c275df687ccacc60afbba20491dd813e442fa5a10d84b8b138f712c5a8705e884cb1d42
 DIST gotest.tools%2Fv3%2F@v%2Fv3.0.2.zip 92950 BLAKE2B 14dac4350033f9f437fbf2472b1a245bd5a66ba7650f1a0dee2c5e005002a6050b325f062f892982f563ee5914ee3d26e4cdd9d20593029ab8a6932733aeaf1f SHA512 d85150c7a380874323c46fc493847ee12515ef50fa928da808dc5f03d91f65691dbd06473485afab5f5b5fa7b815bdab9ce19e62f69bad407b267a34397d5c40
 DIST rsc.io%2Fqr%2F@v%2Fv0.2.0.mod 17 BLAKE2B c37ef4c1d8928ffad995abcb6f2ac59d2a0c6a329e6b198b18f8d802794793cef874b6b9eebc05d2cad4b17f300b4f752f5e1d78d7cc798e3596387551dac8f9 SHA512 89fa51351e90323df1f25ff8c33410ead21746cc4fe0a7c54dfb0423ff1285406b000920eadbba59ae105c545388b79cc66899aac78650452addd19d5f1f9815
-EBUILD git-credential-gopass-1.12.0.ebuild 9991 BLAKE2B 7b13960d952ae285db0985f17a2aab3c340c768b2b20f45debc785ad0a5326dc3280cc476aa266b4d807c124906c0020845c189c8b9cc81e873992467f3bb282 SHA512 a90b016e2817acc3a67a43965b150a65803d7d9f6c2ad531afb85914b56c1c213c9e7abe0c919efaf8c07e788a211c41c51a4b1a6865be91fad9d722164a1ff9
+EBUILD git-credential-gopass-1.12.0.ebuild 10038 BLAKE2B 4eedae7bf20526ec36fceac0ea7a69933fc45f9e4ba926927e5be1ccacfc8be6c71cbd6d5b300d910ca5c587531150ffc3704b083ec32e5b06a8e1bc96d4ba87 SHA512 8fc39a49d7a7a7e4fee09d84e708c1da5ee01f0d1f3b920029e04d8e54a37b41de1bcd4fe0ff28c3dbc49811430f497572a7de9b97ee0fadf3dca9aa3d40399a
 MISC metadata.xml 342 BLAKE2B 0182aa365eb89931833c7245170b2b53962f2226d479ddd5f6b6d7aae99bddfa054f76a7772b8716e2071f911f75773a6526d1bf5220f9cf8266b0fa2c416c84 SHA512 7662d3b076fcf6267ea43ec5438e9cb6ab23c6fcc92ef577227c8716cf37195fe7f03021f171a34851b342c6ee8dea95888589ed31573f5eef127ada0bab3a27
diff --git a/app-admin/git-credential-gopass/git-credential-gopass-1.12.0.ebuild b/app-admin/git-credential-gopass/git-credential-gopass-1.12.0.ebuild
index ef58e5b95018..a5f4da6556cd 100644
--- a/app-admin/git-credential-gopass/git-credential-gopass-1.12.0.ebuild
+++ b/app-admin/git-credential-gopass/git-credential-gopass-1.12.0.ebuild
@@ -201,10 +201,12 @@ SRC_URI="https://github.com/gopasspw/git-credential-gopass/archive/v${PV}.tar.gz
 
 LICENSE="MIT Apache-2.0 BSD MPL-2.0 BSD-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~ppc64 ~x86"
 
 RESTRICT="strip test"
 
+QA_PRESTRIPPED="usr/bin/git-credential-gopass"
+
 DEPEND=">=dev-lang/go-1.16"
 RDEPEND="
 	dev-vcs/git
diff --git a/app-admin/gopass-hibp/Manifest b/app-admin/gopass-hibp/Manifest
index 43e9890123e0..35f94a118ff1 100644
--- a/app-admin/gopass-hibp/Manifest
+++ b/app-admin/gopass-hibp/Manifest
@@ -201,5 +201,5 @@ DIST gopkg.in%2Fyaml.v3%2F@v%2Fv3.0.0-20210107192922-496545a6307b.zip 105245 BLA
 DIST gotest.tools%2F@v%2Fv2.2.0+incompatible.mod 20 BLAKE2B 25d11078b1caa5a705f3ae32f28d155683dfe0109d96531b1fc20e632acdc2f8429395975e6509f5dc78bc042b5e70e90fa2daa9790c39eb3422cbc189fb21af SHA512 5a73bc54777766425ba833348d2986408baedcaff86acf1648384bbcb31e302b0b0de38e1a92d53083551e35c62f375262497c0d5a37c9fb39824ae68fe8113e
 DIST gotest.tools%2Fv3%2F@v%2Fv3.0.2.mod 194 BLAKE2B c322e2469b51e719e88bf9d9461c9a888afbdc1e214d9260b08324623e5828ce14b9dafdd42febc839e354f242e5ec53e78c9f61bd70338abc6de06090dd8197 SHA512 795de820e4a8622de316ee1b391a9c92476b3a67eee387278cd79f818c275df687ccacc60afbba20491dd813e442fa5a10d84b8b138f712c5a8705e884cb1d42
 DIST rsc.io%2Fqr%2F@v%2Fv0.2.0.mod 17 BLAKE2B c37ef4c1d8928ffad995abcb6f2ac59d2a0c6a329e6b198b18f8d802794793cef874b6b9eebc05d2cad4b17f300b4f752f5e1d78d7cc798e3596387551dac8f9 SHA512 89fa51351e90323df1f25ff8c33410ead21746cc4fe0a7c54dfb0423ff1285406b000920eadbba59ae105c545388b79cc66899aac78650452addd19d5f1f9815
-EBUILD gopass-hibp-1.12.0.ebuild 10988 BLAKE2B 611ae32df9dcd28160e07a69f1ee3fddf93901d1ea99f210d48362fe3d90338baeb1c97fe6344289293839a8162fe928241dd5c9daa6975a69081ee9b3e157f6 SHA512 4aed82f266cbb3770cd9ef26074aca55e79a637a7bd3881a76278202420a30ab44c67c2a6c5a246685eca67e01a26cacd0501d05ac9d5584537619a304111821
+EBUILD gopass-hibp-1.12.0.ebuild 11025 BLAKE2B 0667e5b8777539bbc30ddee26244a57651c08a1b5a4c84bfd6f47318d91cc4ad92a6cf6b5bcee862ab1c98c1ed96d8ce1196537b8aeea8c81b51423160f0ae65 SHA512 f6d6d6ba8a0cd6a515cffceaf656b6f0aca129a02b9769ad4e3a9049dc12dd4ac89fcd3874da883f5dee70c021a1081ead00489dce4355f4907d6a92ec518fc4
 MISC metadata.xml 332 BLAKE2B c53268eb86cf9b8af3cfe6fb66e2e014c8d99f7ec99808883d2f4e655ced6ae74df3f4fa2f6cfd71ae8ef7ca23e84bd677704aa580def76757371d2770ede52f SHA512 894d24fa0ae741f15c7ad4c73acae59f9b573ec470777aa9754756142a1c05af9d640afe4f542a860c1f0763bc624813d9f409f1c55f3c5ba4fd10a4bc97c864
diff --git a/app-admin/gopass-hibp/gopass-hibp-1.12.0.ebuild b/app-admin/gopass-hibp/gopass-hibp-1.12.0.ebuild
index 96b912147296..28470bd3144f 100644
--- a/app-admin/gopass-hibp/gopass-hibp-1.12.0.ebuild
+++ b/app-admin/gopass-hibp/gopass-hibp-1.12.0.ebuild
@@ -219,10 +219,12 @@ SRC_URI="https://github.com/gopasspw/gopass-hibp/archive/v${PV}.tar.gz -> ${P}.t
 
 LICENSE="MIT Apache-2.0 BSD MPL-2.0 BSD-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~ppc64 ~x86"
 
 RESTRICT="strip test"
 
+QA_PRESTRIPPED="usr/bin/gopass-hibp"
+
 DEPEND=">=dev-lang/go-1.16"
 RDEPEND="
 	dev-vcs/git
diff --git a/app-admin/gopass-jsonapi/Manifest b/app-admin/gopass-jsonapi/Manifest
index aca36f48e4c5..49f83ba3b67c 100644
--- a/app-admin/gopass-jsonapi/Manifest
+++ b/app-admin/gopass-jsonapi/Manifest
@@ -228,5 +228,5 @@ DIST mvdan.cc%2Funparam%2F@v%2Fv0.0.0-20210104141923-aac4ce9116a7.mod 244 BLAKE2
 DIST mvdan.cc%2Funparam%2F@v%2Fv0.0.0-20210104141923-aac4ce9116a7.zip 28293 BLAKE2B 325f352f8d612c4a577e75b1bf5e1953d57c5397691a0294fbc94d637018f7c9f05b7afb73f1164778bf460d72a42087acddbd65cfdabcbd099348567227dcc6 SHA512 b6234c470e7206ad7ab762fc70f8d3fa87ef6a57198941317018f20fe0e849f90161118e6a3e64b3d46b62ed2cf0db38ec161f73c29ca3ac78323ed63bc498b5
 DIST rsc.io%2Fqr%2F@v%2Fv0.2.0.mod 17 BLAKE2B c37ef4c1d8928ffad995abcb6f2ac59d2a0c6a329e6b198b18f8d802794793cef874b6b9eebc05d2cad4b17f300b4f752f5e1d78d7cc798e3596387551dac8f9 SHA512 89fa51351e90323df1f25ff8c33410ead21746cc4fe0a7c54dfb0423ff1285406b000920eadbba59ae105c545388b79cc66899aac78650452addd19d5f1f9815
 DIST rsc.io%2Fqr%2F@v%2Fv0.2.0.zip 23674 BLAKE2B 86c738bd62b56b84e8029cb3a963f882a8a735dba19566bacf07dae0a146d0a66917153999995c3f0a9fb9698d874f25c6207b8a90d8e12e82cfecbef343a9bd SHA512 169f87e5c57dbcc4d1a289481faca3c3889f0fe019f797374b86e001a3f2893db3e8180be2651c7cb541d30822fe357c7401d75f15303ee8f549227c9b3ec485
-EBUILD gopass-jsonapi-1.11.1.ebuild 12028 BLAKE2B 45fd14de5369f099ef0f39e4d0355fe88d9354f9f00238f21173a22a8d584c9628fc47bd8c3805a653ea7ef9a75c43c48dcd1816cc19cf84d752db6f8a02187c SHA512 1bcf0bbe0f0192d95ba15cd7f5067d587514ec5fb4fc64d58c402e47edbbdc901f93b6d24bd22e840f355e9dfb31b533313bb420b185c2f39d959b1ab183d867
+EBUILD gopass-jsonapi-1.11.1.ebuild 12068 BLAKE2B f3baf3f9c11748e8fe08e2e34ef104fbc140a6b663da701e3bb77fb4444c04f6287b4ad226581332cf0cec5793f358bc0dc14a68a67b0e11f909a476df214581 SHA512 973a602f6667ecd7186dfabe1fa41371d1475d50cfede6c7dfd787128b16346d40906fcbf098aac67b19ebe1d9fd436c69752e396443488dc8c8e895b107d6f9
 MISC metadata.xml 335 BLAKE2B 565147b9c5d1e1ba77bed1305fdce5e28a045eba8c6817ee41337b377b1822e38fd212be5b6699798b2c171f1956e49b02fda39f6749083773d5e5aaed862a96 SHA512 cd39bf06f1b9cc8065933fd83af0c178f713c7fd11cde1bef64aea3ff86bc2dcddbf30280ae5dbebc8af24b554a201210631b4707ab7d162941d4131a9bd2849
diff --git a/app-admin/gopass-jsonapi/gopass-jsonapi-1.11.1.ebuild b/app-admin/gopass-jsonapi/gopass-jsonapi-1.11.1.ebuild
index f78f8bd945f3..a82962ebc852 100644
--- a/app-admin/gopass-jsonapi/gopass-jsonapi-1.11.1.ebuild
+++ b/app-admin/gopass-jsonapi/gopass-jsonapi-1.11.1.ebuild
@@ -246,10 +246,12 @@ SRC_URI="https://github.com/gopasspw/gopass-jsonapi/archive/v${PV}.tar.gz -> ${P
 
 LICENSE="MIT Apache-2.0 BSD MPL-2.0 BSD-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~ppc64 ~x86"
 
 RESTRICT="strip test"
 
+QA_PRESTRIPPED="usr/bin/gopass-jsonapi"
+
 DEPEND=">=dev-lang/go-1.16"
 RDEPEND="
 	dev-vcs/git
diff --git a/app-admin/gopass-summon-provider/Manifest b/app-admin/gopass-summon-provider/Manifest
index 815f8d06f9f4..f5bbd84d1400 100644
--- a/app-admin/gopass-summon-provider/Manifest
+++ b/app-admin/gopass-summon-provider/Manifest
@@ -132,5 +132,5 @@ DIST gotest.tools%2F@v%2Fv2.2.0+incompatible.zip 88327 BLAKE2B 8730134244a00fb47
 DIST gotest.tools%2Fv3%2F@v%2Fv3.0.2.mod 194 BLAKE2B c322e2469b51e719e88bf9d9461c9a888afbdc1e214d9260b08324623e5828ce14b9dafdd42febc839e354f242e5ec53e78c9f61bd70338abc6de06090dd8197 SHA512 795de820e4a8622de316ee1b391a9c92476b3a67eee387278cd79f818c275df687ccacc60afbba20491dd813e442fa5a10d84b8b138f712c5a8705e884cb1d42
 DIST gotest.tools%2Fv3%2F@v%2Fv3.0.2.zip 92950 BLAKE2B 14dac4350033f9f437fbf2472b1a245bd5a66ba7650f1a0dee2c5e005002a6050b325f062f892982f563ee5914ee3d26e4cdd9d20593029ab8a6932733aeaf1f SHA512 d85150c7a380874323c46fc493847ee12515ef50fa928da808dc5f03d91f65691dbd06473485afab5f5b5fa7b815bdab9ce19e62f69bad407b267a34397d5c40
 DIST rsc.io%2Fqr%2F@v%2Fv0.2.0.mod 17 BLAKE2B c37ef4c1d8928ffad995abcb6f2ac59d2a0c6a329e6b198b18f8d802794793cef874b6b9eebc05d2cad4b17f300b4f752f5e1d78d7cc798e3596387551dac8f9 SHA512 89fa51351e90323df1f25ff8c33410ead21746cc4fe0a7c54dfb0423ff1285406b000920eadbba59ae105c545388b79cc66899aac78650452addd19d5f1f9815
-EBUILD gopass-summon-provider-1.12.0.ebuild 7399 BLAKE2B 3c3e896c2868b47164b85c8d9f279fe266a5c6e65a3f4a36b157e13dd0e2c1f6df00d884ff87ebe9390758d9d81c8edf6bf1cec52c6d052180143319e6a0f336 SHA512 fe74c5935fb516632656c30ebc4525f045f7b3fc08ef0f2733dc9e2ff381b43edabb91bfe7501e4524c3efb6fb1435d896e0638d04cb20cd80da1112d434536e
+EBUILD gopass-summon-provider-1.12.0.ebuild 7447 BLAKE2B 43f783402b8c5a23f2c9fa64f2aced993bd3e748222547381e530dd8610798622d091c1c0f96800afab0c6a91dfee1b0bf29d3caedd066a861233b8bab765e5d SHA512 7c65dfe6bb5e2acfa75e57566dba0977df6ad9c8d193a043b709c8cd82b3899d8748fc9fc13dd23785b49a857c254ef63119810c6077c779e0e2cee9bb4e827d
 MISC metadata.xml 343 BLAKE2B 11be794126406d9585558cf8c01895535336a3610a52e8e5671f2872406af740ab3a627d1faa721eed3188583ae6523b4a6ee1f9693f46f645076c91e9e41024 SHA512 efec79a299147e1c2e37b457d8d5f149998eb79fac18bd136a9b5e4ff3e63afbfd57897e1bad61200ec4c760dc13873cf8035cd2b5f5bcd5018f6c08d6d44651
diff --git a/app-admin/gopass-summon-provider/gopass-summon-provider-1.12.0.ebuild b/app-admin/gopass-summon-provider/gopass-summon-provider-1.12.0.ebuild
index 15f2213fb6c8..835f6990981c 100644
--- a/app-admin/gopass-summon-provider/gopass-summon-provider-1.12.0.ebuild
+++ b/app-admin/gopass-summon-provider/gopass-summon-provider-1.12.0.ebuild
@@ -150,10 +150,12 @@ SRC_URI="https://github.com/gopasspw/gopass-summon-provider/archive/v${PV}.tar.g
 
 LICENSE="MIT Apache-2.0 BSD MPL-2.0 BSD-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~ppc64 ~x86"
 
 RESTRICT="strip test"
 
+QA_PRESTRIPPED="usr/bin/gopass-summon-provider"
+
 DEPEND=">=dev-lang/go-1.16"
 RDEPEND="
 	dev-vcs/git
diff --git a/app-admin/gopass/Manifest b/app-admin/gopass/Manifest
index 580a73ab4315..118e7497772c 100644
--- a/app-admin/gopass/Manifest
+++ b/app-admin/gopass/Manifest
@@ -31,19 +31,16 @@ DIST cloud.google.com%2Fgo%2Fstorage%2F@v%2Fv1.5.0.mod 953 BLAKE2B c520f4cc8fbb6
 DIST cloud.google.com%2Fgo%2Fstorage%2F@v%2Fv1.6.0.mod 736 BLAKE2B 2337ea8dca35e9407e0b4fbb200e5465cf3338fe2eb3420444b1fa4805312f52cf9ade3e2e70d9dcc4973edcfcb1fe597d132032829133808c4842ad76f4c69b SHA512 e1e51b6a44ac17f31a09b6fefea0840fd92febeeaf97ef8ce960825473b5acbab5ade353f89d5d48b5a85ebf2b928f727ec9a3f58c8e39afbec4fbb9c22e44c0
 DIST cloud.google.com%2Fgo%2Fstorage%2F@v%2Fv1.8.0.mod 622 BLAKE2B 621e3faa3335ebec92c376298699510d800c2653c3680a438095c3dd9d6ba1f83f13a0302f316beea786b8f606ff3b4f62d21abe63d72f3f5c4e12fb81f61511 SHA512 409dad03104a4ac6b4a8c6da3540ab382345c86e48732f2b37d64ae2bc1c721d9f0a1ed0824a36085baa7102d2626e84f44706b16297623e8deb58fa9e24ba38
 DIST dmitri.shuralyov.com%2Fgpu%2Fmtl%2F@v%2Fv0.0.0-20190408044501-666a987793e9.mod 36 BLAKE2B b430ef9388b0dfe932b201495a00275a6036338c99160d7362556be1e25924584b0802061d193533f23b1f76719dfd6a9484572babd25f1af0e53fd9bf07ac00 SHA512 196affe091247f94ceda4b56629bd62d4ee2b397f2c0f56c9534c02e43531b46705ad33543b58c1a4fc7a48e25e5923db087fe0485a93966a4086581c0d1d3e1
-DIST filippo.io%2Fage%2F@v%2Fv1.0.0-beta4.mod 133 BLAKE2B 4140d5578e9738f5f0edff83413628bcf7506e8844873be8427ab9203cb9f76ee5074cd9586fbdf6195927a74bf476c1ac622f2d9e65c884e77a727979bd6791 SHA512 192ccd509f32ea420df41a82089c720228423e16e4bcba0d667f73d92c246086c0a354643bb85f68435b5231f91b7c3364b2eda0a865196f0d991b0ec3c8b5b7
-DIST filippo.io%2Fage%2F@v%2Fv1.0.0-beta4.zip 50964 BLAKE2B ec82c1c2cc70f7de63f8b3c83fcaf85c5f4f07b166fecb520e48ad4ef0aab865193311b2f6af650e840c0019d5915e7f7361931fcb569ba8873f5f6daeeda353 SHA512 22f86d62c7a6325a294db906d3733d0904e769e9a837d12821f856842b1adac58882d6a2141c972bb804bb1829b97deb7f93427dd460dbb2d137714f854b6475
 DIST filippo.io%2Fage%2F@v%2Fv1.0.0-rc.1.mod 95 BLAKE2B 21644c06fa9277a526af6678d02c707a980e8b61c6cdc57793ffefbd167ee8370dea7a981f10c77fce342b3bf37d5a4329d7684caa50072beab810518431c167 SHA512 d0230c24b46b399aaa398ab6638eeea0f0d632fa3ab181ebb9faa44917419417a4301ae38d3eb9d8f2630f48efc3f565988727773b5334800f2c75bc0705fe47
 DIST filippo.io%2Fage%2F@v%2Fv1.0.0-rc.1.zip 67280 BLAKE2B f6f51f239ed42494c214c059e2112281268c03f2503d120058f303d3d5adae59a875bf590d6e831077ecae5a5a291bda595e86205511796f9adb1079ecff5da9 SHA512 b5ddcdc0b562ca7b8246cb4b0329836f56d0ed5a7bd9a4dbb094781bfb2cf75ec574cb18fea556f8bbb4a4465012f41d6b76eee1e4a962a870ec55f20b51c2b9
+DIST filippo.io%2Fage%2F@v%2Fv1.0.0-rc.3.mod 193 BLAKE2B 9372aca6d8e095767062b8a4d2440195082ef1c16e93743066ffd5f4bcb64734645365cf15dfc447a091250174c8e2fe313c1cb457745ddd319536ab7b6355fb SHA512 5b77b48b60d033914ac7eb2dadea743d272223e1772213b4fbd323211a6919503d828d21d055a0846123c3008663fe3684406fdf2f0385cc8b0ba0f12808a466
+DIST filippo.io%2Fage%2F@v%2Fv1.0.0-rc.3.zip 88634 BLAKE2B 15d7ca87b6aa6e26618652f583af84f5bb3099d62b20aa3afd74611e43c9497599f722dd3abcf12961e2e75418246cbe1f1a0678c4adf09e8bb72923d30314cf SHA512 3cd864963e2289d2a1c0134eb76eabb20f426b72e09d5b819823c39f98ea9216572249d55413bae5b7c0a3b93916f97a84a3ab0dff6a828d4bd90a25d2fddf89
+DIST filippo.io%2Fedwards25519%2F@v%2Fv1.0.0-beta.3.mod 40 BLAKE2B bd9471e49922bbabdc776224c508b0b6abe1a140718f37bf99c62c5ec0fe77d94ce3c5d03dcfd673e1df0250779929535cc11f7a44d1e8957627ea6dd99a4702 SHA512 8cbfb9981941ccdb0f1c0848e267a7c4e9b14fbe6d0507e2f4faf3cb1b494657f33eb70bdf07602ed90f39c1d9b3713b7be95cd761f0d7a8f04fa99ece99386e
+DIST filippo.io%2Fedwards25519%2F@v%2Fv1.0.0-beta.3.zip 84404 BLAKE2B 8e04457aa65ff295afde6913b152a5294f5e8b2d8c081e4ca89f78cddd9f5013c8528d417877a8eba11ce0ceac885ff968a96777499abfaa3110f0405c27f3ed SHA512 7fb52e1050f25d41d32022a8ab6a7f6bbbcedd47e4fc435311b3c498ea575831a754b9a3ded66dfd8d8d22f768877039285d7093f9e08328574182f3fd07b7fd
 DIST github.com%2F!burnt!sushi%2Ftoml%2F@v%2Fv0.3.1.mod 34 BLAKE2B ce54a247aef91043830bdf0603c8452ba38eceb1495af6e7a74c9119234a0dc5cd080cb25258c28f5e270acf91189a5ed33e361cbf17de2be5e37dadbda1d90d SHA512 320941bc3b7fb8bc595e6135cbc513a7583d129f0cd92508055291e141191066303cf75148e25198c21f6c6c539a790ea3210f3ecf5de6a2a03b70c753091146
-DIST github.com%2F!burnt!sushi%2Ftoml%2F@v%2Fv0.3.1.zip 56132 BLAKE2B 5edcfe991d7fc40094d637bae8d8d6f1f897ab3d3786ade2bb80287738103264520681ced8d30d2037253206c32d3f867f4d024a571cb9aad030ebc451e198eb SHA512 43ed64ae515738487e9b75a2290d0b2bc25e83c021a9f29b21487c37adbf34e74e1e7d3d5ec0dfe678c8396356f95c3993a5f5610d1791ff62056cd182a4272f
 DIST github.com%2F!burnt!sushi%2Fxgb%2F@v%2Fv0.0.0-20160522181843-27f122750802.mod 33 BLAKE2B d234bf9be3dd919cb1f8d33750a24dca68c90fea110fd0ff62f0dba86d2ebbfc66d55fea62745b6383c5607bc91cfd78c9d2cf12df251397e85995c04707caa2 SHA512 dbfa64ac31b25fdbff12110c6f9815abfde65f281e40852e7165499a2cefb6656c74fe0b82f0f018304daa02b83b421e9c15654efabad39787c69c1b2996a79d
-DIST github.com%2Fatotto%2Fclipboard%2F@v%2Fv0.1.2.mod 35 BLAKE2B 15461787708b56993bf7904db63ae2a711c78fe67157ff2adec29bcdce2f6c29b7ef5d997ed7a0123ab24b0f3069d3833405849924037ca4da8c05032725706a SHA512 49d95d7db5b42c6948c50dcbee20a5ec6b554e78f8ee4beec2303b318d6289a32be807084806bd17ee8e680e58c2693f753614fdb6788f424c9d7496790b20ba
-DIST github.com%2Fatotto%2Fclipboard%2F@v%2Fv0.1.2.zip 7610 BLAKE2B 98f86c3092146db7614ab394d67f720bc3a8852576c0ede1f7ff053df2222d8811274d0ba981efa7dc2c8fc3350c360f21ed45f429ecbcfd2a2da8663a209079 SHA512 5df11a2def2b93ec0465fffaeee22cf12802fd63574dccf977a6153aaddbe95c2a3ce20388fa3c3dba0b41d0cafbfa827ab9e6c311cfeb491e5b09aa907cb6cb
 DIST github.com%2Fatotto%2Fclipboard%2F@v%2Fv0.1.4.mod 35 BLAKE2B 15461787708b56993bf7904db63ae2a711c78fe67157ff2adec29bcdce2f6c29b7ef5d997ed7a0123ab24b0f3069d3833405849924037ca4da8c05032725706a SHA512 49d95d7db5b42c6948c50dcbee20a5ec6b554e78f8ee4beec2303b318d6289a32be807084806bd17ee8e680e58c2693f753614fdb6788f424c9d7496790b20ba
 DIST github.com%2Fatotto%2Fclipboard%2F@v%2Fv0.1.4.zip 8606 BLAKE2B 47f87ff503a7c47ef7062b0ac3ddab26f8f3d322d27a746ccc1950cb6cb9571237b694eab48f95e1253800dd297df58c0c2ca67b21040e151cff634ebcbdde4a SHA512 5a6d9bc0761469bcf803cbb9d1aa43cc784171a81e53df8c4a14bd56e52db6ee7cd8a45e2fc81ce75bbe19f00cb53be3e170fab9ac3e73e83deaf09b799a9e1a
-DIST github.com%2Fblang%2Fsemver%2F@v%2Fv0.0.0-20190414182527-1a9109f8c4a1.mod 31 BLAKE2B 15785a01a9f07d2cfe324a1ece5c8188395300b11821621fe13427b702cb9f452ebe125566c3c2648d2d83139add9ad6224d00536aaea7b16306eb62f67f8184 SHA512 5f7f52012aa82bdc43bd89d1491fbe00091299554bd85dbfc07f0cc757fcf44f4499df97a4f19c234ce70fbb7af0f4c54c13ffd547ef0a733365ea9c68dd0297
-DIST github.com%2Fblang%2Fsemver%2F@v%2Fv0.0.0-20190414182527-1a9109f8c4a1.zip 21256 BLAKE2B 7b97d839138a150071d5c23287761f25dc778ce0be309e740dcc2e80902b15575647295c0b82de0737c5de96a04847c078caac89519ceaeb763ebfb8861946f3 SHA512 cb924d643de6a8f38fdb1b8b512ca17e7df4bd93f397280e89a659f90d4ca937cc33a98bea851371275b6ffaa83220e275fa36a9095631d2784b16f4515d0366
 DIST github.com%2Fblang%2Fsemver%2Fv4%2F@v%2Fv4.0.0.mod 43 BLAKE2B 0bb8e89eb31061bf2d38a3ffef58a48d3fa9a0dee26aeaaad7f38119d76ab9f34f0bb8ea4bddf277b9dea40acfaceff8925d32eb3386e898d6da9916b55bd647 SHA512 3fd19a3f311a3d0a6faa4488daa0932c661c27aad69568efbfa8aac052b175e2934055f7563c081718fb8a5ae560316a0e884a0f904694d9dd128f61dee2ecb9
 DIST github.com%2Fblang%2Fsemver%2Fv4%2F@v%2Fv4.0.0.zip 17076 BLAKE2B 93c0e7eb4b46ebfdb442e42b18ad6ff9e531d17b8ea3f140dc5e7cf8a9a4f46263df409b449f157a66f3af34be33a9c35a935533e172a3d6d918cb8c5a127d40 SHA512 ec0402d9a33a5930b3c667e65620c48bc36446e1ccedc608aa1429f9c45d15e7dbed9d00a05f09c7b9b0f933a52525ea7c376c269017e237837887bf95700d70
 DIST github.com%2Fcaspr-io%2Fyamlpath%2F@v%2Fv0.0.0-20200722075116-502e8d113a9b.mod 135 BLAKE2B 972a300b4bfdb286beb205187939882ea19895d492a2deee1529d8aeb390e6825c09fabb4d40f5ba12eecbba80d4663eb8a37c88a4c7fbb7d064f29ca6f52ed3 SHA512 b3b127f9b95a0b40135dd5891ccd0a07de9fcdb010ea8566619fea1096353258e65c6a0aef50e3cd9d199635aca014de1e2e396dcda14b38b9cdb1f8f5930876
@@ -51,7 +48,6 @@ DIST github.com%2Fcaspr-io%2Fyamlpath%2F@v%2Fv0.0.0-20200722075116-502e8d113a9b.
 DIST github.com%2Fcenkalti%2Fbackoff%2F@v%2Fv2.2.1+incompatible.mod 35 BLAKE2B 6b99dc9054d6616c7f66e1f0a76a11cadf095b8661aa92aaa97aaac4c2fd943a972f9947fa64167241747f633ca9f2a74e9ddd122dc39a083223912886e04b24 SHA512 b21cab6683819e3029097ac203e35963aa69e47c32cd88017f640f976da0fb64dae5a62d9c76f64868618be6df14603c9a72f24333d1639e654eedb5125421ab
 DIST github.com%2Fcenkalti%2Fbackoff%2F@v%2Fv2.2.1+incompatible.zip 14190 BLAKE2B 068cbd85a43c03d801420e794a87bca8d06aac5650cbd8597eff929bb3634edf85f33342b9b111626f995a340f77c76f60aa436c25654f47b3ed5c87af847c17 SHA512 cba946a17b3237fc696dcf45a7d2ab8e08795aa9a6b6a2dc9bf032cc26b15933d5b2d799a30e6631dbf6b2913c8cbf4f1833c6eedfe45b954a6cc1b6703a1b4a
 DIST github.com%2Fcensus-instrumentation%2Fopencensus-proto%2F@v%2Fv0.2.1.mod 58 BLAKE2B d724c8e5ab039b227f3c437ba570398b789f53fe80db6f8e57fd2cb2199a5e7acef24d7451f9b27a4da464770660d31fc785c7165deafbc35009718851329fc6 SHA512 23d6171dbcf339c72fe25ab7a7e70cb385dffd654998824fac0f6b6464717873332d39fe1f96101414f5e2d240faaab0b960da2e31c08ef98443aa238bbf02d4
-DIST github.com%2Fcheggaaa%2Fpb%2F@v%2Fv1.0.29.mod 212 BLAKE2B 96a3430ed3030a25f9264f4eadce7424c385a031932829b4975143af2ec4ea64af9119f6cdfe5242b1ac83c5d6f3b577516c36e9ba534e768ba1fe48b907b3dd SHA512 cd34cadb035275e861d1ce0c1abe3c49ed4a1300b3467767f4106cebf001ac36c33a48036ba6135748d887e7bda4a81afeaa70e18e2ac695c53ccc7e0c41d41b
 DIST github.com%2Fchzyer%2Flogex%2F@v%2Fv1.1.10.mod 31 BLAKE2B 683f04ea11a77fcee27cfc84f41a1974ca6d61ee854dc77f072493358099ec03e94f01b5cd5cbb5ef69c856dc36790b660a3e90d7d520fd553e572f1b01a2304 SHA512 0e40cd7ff22a86cd23b49b509f5b5653f67e31ca67a07ab82743f56e5504f126cb2c11d88da644afbaf024dffa657560a420ec6d82f6b463452ad8a8bdb576d2
 DIST github.com%2Fchzyer%2Flogex%2F@v%2Fv1.1.10.zip 5802 BLAKE2B 7e7b32a77adacd47318e42255dbbb59c85b38dbd3f80adf2795ed3b2d01ed714e8c6f1139b91c6ce19066414acd53eed14762806f28b6978bddb918fe756414b SHA512 4021b26f08a3fb25b71a3191445c9be56424f3f118f5a4839ee8957a9cabeeb33f8d5e4735ffdbccc20b84b45e4a61d3da9c2ecb6cceef6638901143bb6ea339
 DIST github.com%2Fchzyer%2Freadline%2F@v%2Fv0.0.0-20180603132655-2972be24d48e.mod 34 BLAKE2B b1e2e3052b202324b63ddd8e580c76da40ff0bdf1df2e9e2f3d7b2f5287d75469a544e1a586352130ce636bb08c9d4ca517f0fd49c892bc17365412cb791dcaa SHA512 c0d4f293bac15a26df2433bb909794b75ecbc5cb4ffdb33a8fbf3c8f421597780eb6bb036cfb11a8346ec959ceb8e36efa8ebb84d8ebbd606485735ba171f98d
@@ -61,24 +57,20 @@ DIST github.com%2Fchzyer%2Ftest%2F@v%2Fv0.0.0-20180213035817-a1ea475d72b1.zip 50
 DIST github.com%2Fclient9%2Fmisspell%2F@v%2Fv0.3.4.mod 35 BLAKE2B 45d27e6bbd9255a355b6bd14ac839c7d87fabb393693a8b862ad974017af01309e5d36fa99d4925905c1617c0d90b5263b54cd95af2dbab186e293936dc86459 SHA512 ca8192c6321468b4332eb63c765a5798150dce9312873123b48d9ec67ebb4229cffc7b7e8054b8b0a6f45611f08130008031edf33da3468bb9a4ee9455fa02a5
 DIST github.com%2Fcncf%2Fudpa%2Fgo%2F@v%2Fv0.0.0-20191209042840-269d4d468f6f.mod 170 BLAKE2B 68adbd7d4176fc66228fa579cbbffb2239322158a9fe1226a106a2db6a7210cf9811ec30fbed4bd26e260906a214b9546d178cc1f6efef57866d378cda457166 SHA512 3877a1f5b47e6316c7a4d4e14959b355381eb3a32fb11270c646617b9908299d7dc806869d21b1fa6faca7a326f168dd1a268735cd1d532be2c318ddf9237014
 DIST github.com%2Fcpuguy83%2Fgo-md2man%2Fv2%2F@v%2Fv2.0.0-20190314233015-f79a8a8ca69d.mod 217 BLAKE2B 4232fdc22064d42e7b97efa666b5345f93d53d40ba11231778e5d17bc7d48c6178d27f4e8678d2139ba4e40a90d46a6caeab1a9696b76db5aa361fc17d3c8c93 SHA512 000449de8fe27ac12c5e7614bfb48a31d506b582ce2deaf0a0709d3673c9fad41e3b97e25df872609c5a190e899a56755d2d9f974a38523c51c9fa3af521d73d
-DIST github.com%2Fcpuguy83%2Fgo-md2man%2Fv2%2F@v%2Fv2.0.0-20190314233015-f79a8a8ca69d.zip 12266 BLAKE2B 93705895ca63c348ac5397fe8531214f5745a3be6f5760f9d3fbf67fd85b917dab4a2077376251a005bcf07450df1fe0b0114feacc5f92c6facbb2da637beacd SHA512 284116b4f2778ee7981e3aa5583c4e685afd8434e36ca647f0c72c5bb308e87bc3bfae8c83acd259c9da75549339aa382663b7103e4033b2418e314106923c0f
 DIST github.com%2Fcpuguy83%2Fgo-md2man%2Fv2%2F@v%2Fv2.0.0.mod 217 BLAKE2B 4232fdc22064d42e7b97efa666b5345f93d53d40ba11231778e5d17bc7d48c6178d27f4e8678d2139ba4e40a90d46a6caeab1a9696b76db5aa361fc17d3c8c93 SHA512 000449de8fe27ac12c5e7614bfb48a31d506b582ce2deaf0a0709d3673c9fad41e3b97e25df872609c5a190e899a56755d2d9f974a38523c51c9fa3af521d73d
 DIST github.com%2Fcpuguy83%2Fgo-md2man%2Fv2%2F@v%2Fv2.0.0.zip 11426 BLAKE2B 645000d6293b81d736462fbd50a8f96483b39d07e5bb56e5a6d2fbef55a760499237f963e4b45eabe34b955280997f8218c656eb6db0a1a35093d2ab8f17cc63 SHA512 140a934e4d50fc1e5bb36bc3bfebc05863b32a50fbb6e203abb3aee1f9e9cd1c2af6ee5e0757f9d6199522c30e06377a3c94842d877513e5c9339ef7d1dcbc9c
 DIST github.com%2Fcreack%2Fpty%2F@v%2Fv1.1.9.mod 39 BLAKE2B 71e70b038748ac19649698b1c0e59af99ce0b1c5d7c9177e8c55751eea9e82d4828b27dabb17cc04978142c9fb7a54d90c062a7cc3fdbb86116034026e40baf6 SHA512 9cf1687520933d3d6bbec9d7c51472998d3bdbe1b3d2a7478fca80f9e7944f9040a2b8ec7d49f1458bd46a5121bae4810d314725add41efd413319a5006b944a
 DIST github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv1.1.0.mod 34 BLAKE2B 7e09c2779bf7a84a9271e31522ebbe600a1c11b107d651d91f58c8373e4336332a3a881f3e12b382543d75f20398af66085fcb3e780eed341e870e9c30f29267 SHA512 5e079462f7e0dff0efda71f580aa185700cfa936b718a19d0e2a8c63212e47a07022dca0c282832d48e5165aae8e82aeeeb2ac3664268f1148fc772010fb860e
 DIST github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv1.1.1.mod 34 BLAKE2B 7e09c2779bf7a84a9271e31522ebbe600a1c11b107d651d91f58c8373e4336332a3a881f3e12b382543d75f20398af66085fcb3e780eed341e870e9c30f29267 SHA512 5e079462f7e0dff0efda71f580aa185700cfa936b718a19d0e2a8c63212e47a07022dca0c282832d48e5165aae8e82aeeeb2ac3664268f1148fc772010fb860e
 DIST github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv1.1.1.zip 60320 BLAKE2B 86bdbc333e5c23ccf4f805945ca9f2aecc5c242d2ae824d20127eceaa2bf7bbab239ff2799572a2c8fa206166a36e97d5eccc8fc5021743d8ad32f39cd53b9eb SHA512 7b4e4df2fea731e23e05437f26f24e32b2e99028d685b72e3a726c1cb616ada4a77ca4fb9db4a6fae48178cc5172e724b74499bc776d63a9110cb97377d5edeb
-DIST github.com%2Fdominikschulz%2Fgithub-releases%2F@v%2Fv0.0.3.mod 48 BLAKE2B 6d45c07a9caf59fe567db0a9ee6559e1b6bf9d0cf29319b92dd2fb20de10f60e478b6c90cf9c65c3761c33007c78ecceb6e75990bc118e59ba50e91e74abce81 SHA512 fd3c622c8677770dbd7f6afcea139839603f2d5cb74e3a8413964cf61f0b673f08b510d8b70ff8c17196f14cacf4a78d91622d0d7c410810cefcd26381aea47d
-DIST github.com%2Fdominikschulz%2Fgithub-releases%2F@v%2Fv0.0.3.zip 2957 BLAKE2B a0c29f8a47edebae63c9276f9e7f6420a865eaa82c6ad57c43312b974163ceb251b293eb37e03b50cee9b26bb72764cab1d1d1b2842a60b38f6f84455eb6a7b1 SHA512 f24d07d37bc5e59ef29b687ebdd9401f5f72ea049388cc808f62555873914e79cebcc88ce48265b4ec3945c5d5529abdca56a0581106fc5fc06514ff6f00f11c
-DIST github.com%2Fdustin%2Fgo-humanize%2F@v%2Fv1.0.0.mod 37 BLAKE2B f097ba062c5ae93b06edbf7827cc21a40d6bf6d2130c44fc8002344e860b3471742cf930e505a74a6a2af3a77a6dcc7d01b103d01f6f208c96dd9ca713c96344 SHA512 be96d9da23cc31932c1001e2ed367e55d06ccf2af41cc106e83b92fb866b61110d06ff224797c942b9ab6104bdcba4542f2214b9fb2d88df63e69be8158c6e2b
 DIST github.com%2Fenvoyproxy%2Fgo-control-plane%2F@v%2Fv0.9.0.mod 378 BLAKE2B 571b914afee85b0d13a567132dd40a80f60224e20685279cfaa1e5e875897c8e0fc94d7097992881495f4c0c090b27c87f6d95db0161e1064434ca0434ae06dd SHA512 f0135b61ef0638fe384c875786abbf8ed9a93836f6ed29d19a2e9a626cf6d6c6a252146352eb32298b826e93bb61b8c733f8a6aa683e5856ebec37cccc64ce58
 DIST github.com%2Fenvoyproxy%2Fgo-control-plane%2F@v%2Fv0.9.1-0.20191026205805-5f8ba28d4473.mod 378 BLAKE2B 571b914afee85b0d13a567132dd40a80f60224e20685279cfaa1e5e875897c8e0fc94d7097992881495f4c0c090b27c87f6d95db0161e1064434ca0434ae06dd SHA512 f0135b61ef0638fe384c875786abbf8ed9a93836f6ed29d19a2e9a626cf6d6c6a252146352eb32298b826e93bb61b8c733f8a6aa683e5856ebec37cccc64ce58
 DIST github.com%2Fenvoyproxy%2Fgo-control-plane%2F@v%2Fv0.9.4.mod 471 BLAKE2B bc51330df71ca612b3a573a93a8ebe57ef4e677157835221dfc5f7bcbada1fd90f7a6a3a002cbde08c6a95642477789d532ddc80e7ecae1f9e6e7c081364e970 SHA512 323c4b1c27bdc5bfb1795f1353d21ad6b7a2056bb0b364adab5960aabb7bea20ab3287ba60685df130abddbd66c3d82dc98a291aff1849dbce8c182c63c7b0bf
 DIST github.com%2Fenvoyproxy%2Fprotoc-gen-validate%2F@v%2Fv0.1.0.mod 49 BLAKE2B d910253a9c976078b790d134a9d75e53cbde427e7733ab9e09c9060b312a5749aa083fc48263501e3339a580cc409b5859dafb820a4465827e7fba4eaca31ecd SHA512 755a3d173d43e70ca40fde2d5ce16c405365da90ff595003ef64598c9b9734b7200fe07a16fd555e4209f83e5e17561d18227c46a5f25a41976ff7ac024cb9aa
 DIST github.com%2Ffatih%2Fcolor%2F@v%2Fv1.10.0.mod 126 BLAKE2B 3ad1240496ce1f7c94c224a1eca571a3671851bdfebb40b243cb4aec90e329c820788c6080083e138240b9aa0a6e980701e12349058a1fd7e9c972faf7085fd6 SHA512 d7e895c4a2e515a0d20f8839b4f6d52f3aa3d000b97cecc99fbeeb5080e53c260ebc3aba0ca6ea180a2f5c88d5ae303fb94a257cb55aa9430773f6f5b4048d87
 DIST github.com%2Ffatih%2Fcolor%2F@v%2Fv1.10.0.zip 12593 BLAKE2B 359ee7d5efadf7957871e7fbe9671683380966044426e0318f582a5050fdc11a1168493aa7dc4690bd44eb75543536dd8390d37e14a9ac408d64374c20102e76 SHA512 205d595d76ba552b654c7c991d4df0cebddf1323915404749f28634f2bd881798f291e9dc1666a10fa00fe1fd95bb2afb091e7936a02d18082dbb4d21ee5cdac
-DIST github.com%2Ffatih%2Fcolor%2F@v%2Fv1.9.0.mod 126 BLAKE2B 629ef676ff997553b93c44e9024e6b3d613b51e276d2ffb65bd9042ec1cb0455124e5ea7c5dd0e69599a25031ed536cb3356321e37248921fd8287b47656104a SHA512 a61784b08b335d2a893688c279cf6f4b1ca222c3bc8236fd24536aad2b185fa718805c9022e1ce142bd87e39fed639fdc9035c9ea9ff110e985cd01cd612e9a0
-DIST github.com%2Ffatih%2Fcolor%2F@v%2Fv1.9.0.zip 12428 BLAKE2B caf7a05e79d8b7dca069966765705619ee15800d8276d968bdf4385bc1141cc06b24755ac49c65caafdde5d8b34869df1f7e42ca302ee6a80b9ac7edd8a803d2 SHA512 c757f8455ce261c06749eda03ba807ba8b2427f0a14b0b62a6ee4e9d1ba220986e6f122b061fed6f44d68e4802864a988c722604b52989a4e31761e0e7ea8163
+DIST github.com%2Ffatih%2Fcolor%2F@v%2Fv1.12.0.mod 126 BLAKE2B 3ad1240496ce1f7c94c224a1eca571a3671851bdfebb40b243cb4aec90e329c820788c6080083e138240b9aa0a6e980701e12349058a1fd7e9c972faf7085fd6 SHA512 d7e895c4a2e515a0d20f8839b4f6d52f3aa3d000b97cecc99fbeeb5080e53c260ebc3aba0ca6ea180a2f5c88d5ae303fb94a257cb55aa9430773f6f5b4048d87
+DIST github.com%2Ffatih%2Fcolor%2F@v%2Fv1.12.0.zip 12823 BLAKE2B e96e2f6181cc92fd6f7006bd19b89d68d57abf2d8ea35cb0e58a670cbdb03b9aba6ab916289254f5cdc41b641d7e1d6d37ce239f0399e94dbeeb6db0685f8aaf SHA512 d78e12fe8706e0eabf04a57212a013768d7b82f7eb45b675f424d0c92cf0a741cd42a423a4538cfb04d03242ac873cc41f0f0c9d01a3b5cc2c31c9dcffe6c132
 DIST github.com%2Fgo-gl%2Fglfw%2F@v%2Fv0.0.0-20190409004039-e6da0acd62b1.mod 29 BLAKE2B 1cefa73995b3d0b4206aea263f55c672b675dd22d42c61a92f7380b6e726f2d7ea40e0a9e456181f34808f5386eae3c485bd2872857caf1824254fe4a55cb635 SHA512 a709c650da5d5f513e94891b88c26697826fafebc1ca964fb9544415637ca14e3b9f1f4ddcf738e28032e10a2d39b619678ec5c8d44cc0a1dff738c75645e2f8
 DIST github.com%2Fgo-gl%2Fglfw%2Fv3.3%2Fglfw%2F@v%2Fv0.0.0-20191125211704-12ad95a8df72.mod 48 BLAKE2B 7d441b7bef1f34bd7065c63630add910d504ba5a2897d6a0b7cf9c9456337b8e55e1ffd9e12cb3fb8c7f021e51cc045ea41cdf62f2c33555f4b61aeda07c332b SHA512 06dd140361d7cc1af9e37de85402631a5310d34198e20d6ce1521dca15d1fba1dc9e40b512a30b8e850e105e9fbcfe0691b298d092eb92b79da564532dba721e
 DIST github.com%2Fgo-gl%2Fglfw%2Fv3.3%2Fglfw%2F@v%2Fv0.0.0-20200222043503-6f7a984d4dc4.mod 48 BLAKE2B 7d441b7bef1f34bd7065c63630add910d504ba5a2897d6a0b7cf9c9456337b8e55e1ffd9e12cb3fb8c7f021e51cc045ea41cdf62f2c33555f4b61aeda07c332b SHA512 06dd140361d7cc1af9e37de85402631a5310d34198e20d6ce1521dca15d1fba1dc9e40b512a30b8e850e105e9fbcfe0691b298d092eb92b79da564532dba721e
@@ -117,25 +109,23 @@ DIST github.com%2Fgoogle%2Fbtree%2F@v%2Fv0.0.0-20180813153112-4030bb1f1f0c.mod 3
 DIST github.com%2Fgoogle%2Fbtree%2F@v%2Fv1.0.0.mod 31 BLAKE2B 910f367210db741c9f31a77f8eaaea348d3accbf0f219efbed95a780b93e2416fe64dd420ae45ff13da94a8f2a0c7b19850b13e1d9fc6cc1249d327bf04b5fd9 SHA512 f2ff873ecf0144b7f434810af1b49f66f09b4bcadc91d99201465a6ce36c7e7f05996f52800be287dcb3b62e14b75fcebb7c32be0eeda6bb0a15a23058c2d410
 DIST github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.2.0.mod 32 BLAKE2B 7c7baa1e29b9806fb97e0d557200e8722f2d373e149127307efa285cdfedb36dd57355168554d1a1bada62144e6a6a00c4d3246aa9afc7d0ffae0f087459c552 SHA512 7229d917bb0c788b07297e1b09b8f7952f951998a56f17ea1f69ff7c2f565a5686b212f42f45c6b8351905d6740a2ec5a235e493daa531ae00cb709faf67ae45
 DIST github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.3.0.mod 40 BLAKE2B c717b6aaf18662c20120746a021b0ca878e7b190b3456cab24ec98032390a85b0af8540295e470647d403bf1beb582c8f8a74fa7129c4cbf747257206235c5a5 SHA512 351dc24af135b9c9d714aadce40fe9fa1ec05a35a4df90af79926d5119c3f33a6510ab9d78243748d7dad10bd2178f47d342ea2389972b88d5e9b4be6dee7daa
-DIST github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.3.0.zip 99332 BLAKE2B d95e04036796b0687ccfe18e2cae196efa87fbfe7a763a219860a82117f5a7ac594af005d67698289a9fa0f19b9c397f850ebcc8f6b2e2390fcc6463e95dd47a SHA512 6922e27a1a67c4e858880ca338f68ed80bc01175801b2194a900ba265c00eb482c29e785c564e9afb8f60288593b315ae8af6c8f366d35475678003440115d26
 DIST github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.3.1.mod 40 BLAKE2B c717b6aaf18662c20120746a021b0ca878e7b190b3456cab24ec98032390a85b0af8540295e470647d403bf1beb582c8f8a74fa7129c4cbf747257206235c5a5 SHA512 351dc24af135b9c9d714aadce40fe9fa1ec05a35a4df90af79926d5119c3f33a6510ab9d78243748d7dad10bd2178f47d342ea2389972b88d5e9b4be6dee7daa
 DIST github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.4.0.mod 105 BLAKE2B ffd22df03c1b351fb766a97818d46cc6aebeef365632d5263c90cf45a4acffdf5811da10ea2cd4747bc9691f74661c0b655961a065ed15a0194eeb4d1d12ca9b SHA512 cb203760fc6ca9c9d64811cf1342752faa5a95f27934c298407dc865f9561081210dd1b82b15ee2f5337b70d4c55d102d8884b5b9a5f70d9cbf85227a32b9713
 DIST github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.4.1.mod 105 BLAKE2B ffd22df03c1b351fb766a97818d46cc6aebeef365632d5263c90cf45a4acffdf5811da10ea2cd4747bc9691f74661c0b655961a065ed15a0194eeb4d1d12ca9b SHA512 cb203760fc6ca9c9d64811cf1342752faa5a95f27934c298407dc865f9561081210dd1b82b15ee2f5337b70d4c55d102d8884b5b9a5f70d9cbf85227a32b9713
 DIST github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.5.0.mod 105 BLAKE2B ffd22df03c1b351fb766a97818d46cc6aebeef365632d5263c90cf45a4acffdf5811da10ea2cd4747bc9691f74661c0b655961a065ed15a0194eeb4d1d12ca9b SHA512 cb203760fc6ca9c9d64811cf1342752faa5a95f27934c298407dc865f9561081210dd1b82b15ee2f5337b70d4c55d102d8884b5b9a5f70d9cbf85227a32b9713
 DIST github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.5.1.mod 105 BLAKE2B ffd22df03c1b351fb766a97818d46cc6aebeef365632d5263c90cf45a4acffdf5811da10ea2cd4747bc9691f74661c0b655961a065ed15a0194eeb4d1d12ca9b SHA512 cb203760fc6ca9c9d64811cf1342752faa5a95f27934c298407dc865f9561081210dd1b82b15ee2f5337b70d4c55d102d8884b5b9a5f70d9cbf85227a32b9713
 DIST github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.5.2.mod 105 BLAKE2B ffd22df03c1b351fb766a97818d46cc6aebeef365632d5263c90cf45a4acffdf5811da10ea2cd4747bc9691f74661c0b655961a065ed15a0194eeb4d1d12ca9b SHA512 cb203760fc6ca9c9d64811cf1342752faa5a95f27934c298407dc865f9561081210dd1b82b15ee2f5337b70d4c55d102d8884b5b9a5f70d9cbf85227a32b9713
-DIST github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.5.2.zip 127156 BLAKE2B 1d06924d2e9fadaefa1a506c16830c88e983c3d14b3bb9a82c216879531ffb664dc90de8fbf3b6025ae8b5e7cee1a9ecb900a7eabb85f6144d304fab7cacf21f SHA512 365bb5271fded39749a69bdfaee6e29740b26b84e0a737fedab3e50cc0416a098f0ed0a14704dc1ec9bc1eb81b8827de4a151024f5ea3e6c75a9fb9abfc14d62
 DIST github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.5.5.mod 105 BLAKE2B ffd22df03c1b351fb766a97818d46cc6aebeef365632d5263c90cf45a4acffdf5811da10ea2cd4747bc9691f74661c0b655961a065ed15a0194eeb4d1d12ca9b SHA512 cb203760fc6ca9c9d64811cf1342752faa5a95f27934c298407dc865f9561081210dd1b82b15ee2f5337b70d4c55d102d8884b5b9a5f70d9cbf85227a32b9713
 DIST github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.5.5.zip 130974 BLAKE2B 6e4efb8abb584c3839c7b1ab80c8060c125b695bddddd44c57f72c0fbf9de85d40595ecff57f57ddb533e34dbe72a95e0e8043d91d462d68818699f194766e90 SHA512 9cff1690cb177e70b1d67ddd305e4317e3d1ef2825f5f3ed4639210f7f2ee6e89ff03970495757b922f16fade5fafae5cc14c8da2b95694faa3fa48c63f3313d
+DIST github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.5.6.mod 105 BLAKE2B ffd22df03c1b351fb766a97818d46cc6aebeef365632d5263c90cf45a4acffdf5811da10ea2cd4747bc9691f74661c0b655961a065ed15a0194eeb4d1d12ca9b SHA512 cb203760fc6ca9c9d64811cf1342752faa5a95f27934c298407dc865f9561081210dd1b82b15ee2f5337b70d4c55d102d8884b5b9a5f70d9cbf85227a32b9713
+DIST github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.5.6.zip 132988 BLAKE2B 48845d9df9bc0766f93a141ddc1989fcf850d76273824d62ee11297774703bed33b1dcbe77817b6eb417769ed11249d8089d248631a8c6669a75a6d34e048653 SHA512 22df4fc49c44a1e73eb72295195633bc04b67fda27df452893ae77932879b62b344455b880972e78022a61dafb30eba8b5b6a872f6c66e093323fd5d1c086466
 DIST github.com%2Fgoogle%2Fgo-github%2F@v%2Fv17.0.0+incompatible.mod 35 BLAKE2B 87a5884f51a766419a5bfaca4d6b317f2e86680e7347d29dba287e4c2004db6b8a8afcb2b2b8145cc3f9a502b768105eab89ba0f3e99db44427fd3eab9d3ac8c SHA512 6d285a58dc91fb57f990b76b3c2634247bee990ec1bb3e0f11b19fe1edb3b9b1998030def12b20a6f05c574965ddcefda6883121f5aae70c695e031e72425178
 DIST github.com%2Fgoogle%2Fgo-github%2F@v%2Fv17.0.0+incompatible.zip 347066 BLAKE2B 5ef49f931c987f9a24880afbd3ca231093bb43f0c059df9110c38ffe3ad54c4de3851cc36cc9af15b49112462cc164b0812c8872d5fb2d61d0cf751040213762 SHA512 3a24fd40eec7d23c69143355338019544fcc935b01f63f604419a5d7b5f1222e89de7e28dc86454e57e262f9bee5e4333395f3b8d7392c6e87b7e8c442e05709
 DIST github.com%2Fgoogle%2Fgo-github%2Fv33%2F@v%2Fv33.0.0.mod 362 BLAKE2B df8bcb1ec2a89c95f9c6be6d13c130834aa54fb65d3a46678c886861ca2380b25bee37ef706827d2bb83891eda02a0ac058dbbb3f3eefccea0a0a3c3163d7b8c SHA512 3730fb221251367677890a98170487b1a17d948300e0f7f712bbbcda4813a755b5524c65066b2d2bab4551bb5192bdc7233466594a0fe295cd84e0e7ba503967
 DIST github.com%2Fgoogle%2Fgo-github%2Fv33%2F@v%2Fv33.0.0.zip 459801 BLAKE2B 020b83847e805b201143cf388269ea771d568fcff04544707360a41db56de905d822ce27e72cd06b57268c742dc7bf1355de20a43e42f611a55a815b393be374 SHA512 76df5a582009021bc29bd15a149700d244fcc4515b5dca3c7c23895f7f181a88bf7f8d557410783116ba5af0bf0807b3d7ae1e0d4f29b9d9a7029ba845678112
 DIST github.com%2Fgoogle%2Fgo-querystring%2F@v%2Fv1.0.0.mod 40 BLAKE2B 081291e204018d8256655052c8f518c8d489818e899a6932325f2efe7a33dd7228f1bab1fe31f190c2cd1a022b8f320c2a779910231122de430bdb6c196ca95e SHA512 b47c833f93e2d2f9746276fb7608dfe01295cead6b0c9cad36863e9c6da80e3abe8e7d79afb113fe382f73b641fcfd717090a8d6ca2d94bf2807fec07cd57574
-DIST github.com%2Fgoogle%2Fgo-querystring%2F@v%2Fv1.0.0.zip 9151 BLAKE2B 853a982f1c3b2b60fb44e3da969f7cdbeb6e5214c549e47dee57329a9c93c8786bcb2af6e3aab5f7aacf0bf0c70beb26f95c42b796cc2cff5b9b825040cf5a11 SHA512 e13c7622fe1c4ba73fe147255c02d6828f5d5deaea74ee14a97dd689819547b913caef4721838a68490991c710156307cf0487866d200021cf9d774a4600e52e
 DIST github.com%2Fgoogle%2Fgo-querystring%2F@v%2Fv1.1.0.mod 90 BLAKE2B 08333c449398ded36447fe9695e6a525e0a762e692bdf605fcf21ef348e547a956474f9bd3d01dd260615f48e52dac834ce405688e5ea5113d2ae4dd2b4095cb SHA512 48b658163a17a5e9c68cc252289cdd444347feed4ea61a0b5c132f589d9e207d6fb350473f7e9c9d92ecaa3179863eadf4df3b19c8180ff728e23e38ffa081f4
 DIST github.com%2Fgoogle%2Fgo-querystring%2F@v%2Fv1.1.0.zip 13092 BLAKE2B f5a3080614218408e5a9e5559186ca79ab214cc66ced0a3b82e9fc61b65470168c4267c4197a016a3d2ba9465654039319c95ab9fcc78c0b72349aae6e870727 SHA512 3fd2236abeaa0c4669d32e573fb444bbf2d4519cff9682f736a5d26e5f88e2d60b51108108aa4470e71e6e75c2f0b81959dc29c6e764ac26d5341ff6dd7c4db3
-DIST github.com%2Fgoogle%2Fgofuzz%2F@v%2Fv1.0.0.mod 41 BLAKE2B 32370943a480c13662a0847b33fadc7d7f909784d044619ae8b00f03c9f537115448140ef2ea1b47606dbc64d7593e07cc8f9b9000fc5382e4f1ae94ae4086e9 SHA512 3dcfdb76a938cf370310213720ca952c6aa99c8b1b96afe41eb05f1bff15df7d98d279509d921893c0c749337c83d4bf40613813e117c01205859a041716b2ee
 DIST github.com%2Fgoogle%2Fmartian%2F@v%2Fv2.1.0+incompatible.mod 33 BLAKE2B 694b57887cca857fe6950b0df444dc6e3d757dde540c1846ddcd4bb8f96a5eef3f469eaec30cf415541ff2f53acaafffbf4032189122875603d7e5e3dad2ef97 SHA512 cffb5dc1c6531ae9d5998b3a57ba14de5dd8631a36dd48975da07ce5ec052d97b6f632c5d30ab9ab695f178758837aae8a6344c67d57c7a39ca8e9243f8211df
 DIST github.com%2Fgoogle%2Fmartian%2Fv3%2F@v%2Fv3.0.0.mod 106 BLAKE2B 642b1dc88eac799a72044e1cb20ff58c99820a1c82b9fb48db65abad1f4e8609c884ce2b94283b29a88567d6f05974640dc4af3475e394ad106670085fd2e580 SHA512 0e7277a311af830264de9ebf0771f9067ae479da8131a02d6528cda56628ea3d8a50af2d76f718da5b9f51de989424f79bd9f7d58825a8d5cf958f2fd02797fa
 DIST github.com%2Fgoogle%2Fpprof%2F@v%2Fv0.0.0-20181206194817-3ea8567a2e57.mod 31 BLAKE2B 705b12f16ca8f0258457d0972bc8845b553e9e8d9001de0f4a4a548afe23424b0902fee4c84e94bcbc4615401d1369730a60bc57de85aa674300c1a96ad1f128 SHA512 c7e8b1bdd0360b88ccdcfd0cfe73e5cce50010a21db41ec2d533f7863b67930fbb84f430b9ffb663c394256628b05e884b812c040354779e0fdac2a422ac57e9
@@ -146,20 +136,13 @@ DIST github.com%2Fgoogle%2Fpprof%2F@v%2Fv0.0.0-20200229191704-1ebb73c60ed3.mod 3
 DIST github.com%2Fgoogle%2Fpprof%2F@v%2Fv0.0.0-20200430221834-fc25d7d30c6d.mod 368 BLAKE2B 5cc8fedbc9bb93a20e0ae5cb9a69dd5a92ee4a7f55c6b5a93e7925b402b830316038cf99d0c80bec2cf5c8ae1593cb879dd8ad29dbb10b66c64fca856367f816 SHA512 9b278d6667d9380f84c972ee1d383e2b54b460ded5b84e872aa3d64336ab059a8a747c442f4227d60e7dbfb67414ffc98a26bc2507327d9ac85ed1c493a5fc02
 DIST github.com%2Fgoogle%2Fpprof%2F@v%2Fv0.0.0-20200708004538-1a94d8640e99.mod 368 BLAKE2B 5cc8fedbc9bb93a20e0ae5cb9a69dd5a92ee4a7f55c6b5a93e7925b402b830316038cf99d0c80bec2cf5c8ae1593cb879dd8ad29dbb10b66c64fca856367f816 SHA512 9b278d6667d9380f84c972ee1d383e2b54b460ded5b84e872aa3d64336ab059a8a747c442f4227d60e7dbfb67414ffc98a26bc2507327d9ac85ed1c493a5fc02
 DIST github.com%2Fgoogle%2Frenameio%2F@v%2Fv0.1.0.mod 34 BLAKE2B 1eabef50b2977886d7980d7da197828b826c54018766418b3160f5cd512784635e5791a40cc4fb806d52f5ead99f941fae8037872d6cedfd6c851103f3be1a74 SHA512 a46cae976ce90d1cef802eeaa873c059cc9ec3678d5c3c304a9de45f44f20a24d68fa290cfdcf78c4ac222a6d619a005825de8f11e72b9a5af476a0b0180092b
-DIST github.com%2Fgoogle%2Fuuid%2F@v%2Fv1.1.1.mod 30 BLAKE2B 704029826c505198458e86463528ce2c1b209376f376b92d4f05a0f4094d161b45470d04ed3c1b5635397aca3126c25911299711139d794cca3e9b2bb373ee17 SHA512 695f3424e0cc247a069fbd6b94820554e003030eb0e208ba7be38f660c5fc29f74a057e60031ec77918b5b320913d6deabdf19a0f0666b0f5bc5e2724e1fddba
-DIST github.com%2Fgoogle%2Fuuid%2F@v%2Fv1.1.1.zip 21279 BLAKE2B d8013c686f7cd497091f4c7d782b283eb95faa7617d68ec7f8cf937c5925d677d8552c662291e41cf2c137fce163d45fb62dfcde88088225c13e0980fcde3d7e SHA512 f28071ffb6515262fb73276725181a806740688fea8de8d9484e1204fcfe6e5fd437e38a3299acec6bb545deb31373d910a09d92937308176b2043ccc9f5397f
 DIST github.com%2Fgoogleapis%2Fgax-go%2Fv2%2F@v%2Fv2.0.4.mod 88 BLAKE2B 840afaa28e8d5b816289e6556e114311f039b477e5ac86fc1c2ac80b1f8d7729ab6a83b99baa4c03de9634240481feb13900fd4049753b8de839656d6a7cef8f SHA512 31e50016a01fd485775368e2e430959278cb6c03ae6b1871b3d0c173fd43e91654ae87d1758c08daf897e55be8b4044bcb47fc072ec645d16e2594f345b46c73
 DIST github.com%2Fgoogleapis%2Fgax-go%2Fv2%2F@v%2Fv2.0.5.mod 79 BLAKE2B 21f442637ef0be838858e192b563e158bf6ed1f7e06e09a3872fbcd613046b095c5209d9ccd9cc0853ef14947b6b70d4483675505d0905a1d2aab15e7bfdf80a SHA512 2af320b0514b032ee87a92d99d673579981571f325d0d46133e212a639eca274d5a6f8164a7256cfa6c063967b98ace36e637f53d90331903fd6e4a21f1a5a19
 DIST github.com%2Fgopasspw%2Fpinentry%2F@v%2Fv0.0.2.mod 45 BLAKE2B 61206f9a5b541b7dda436106b3c5aeb642b318424abaa71ca9d2386e2d88fc2340d99c6bc1a662a8fdd7673f391a279855439f4db4b609f5063e75cdec887289 SHA512 50c114fb3031402ebd13ef5670639daee2d5cf9a342571b06cc15604489fd93c3d2fe72974f0ab5bcb7680377b7a49c4b4586c803eb37c1bfedb84af25456d62
 DIST github.com%2Fgopasspw%2Fpinentry%2F@v%2Fv0.0.2.zip 5395 BLAKE2B 926f80587dfdc6e8cc1e08080e40753d542b17c0d96a8bf458a574f8325c21b3429264c7c187763458b468d5112d249b0edff65f93c3b06220421f7e3be74cd5 SHA512 08fe52b45688e776b919c47b666a5f6f0992dfba353bd2d11379cd91454834a5ef272f31cb533537b8e5de1a5d6171683647f5b32c6ce945849102cb9fc55cf5
-DIST github.com%2Fgopherjs%2Fgopherjs%2F@v%2Fv0.0.0-20181017120253-0766667cb4d1.mod 36 BLAKE2B d7cd8f31950392cb5de7f4223ff9fe3257568dd0a1c1b81c8b97934ba92379753dc936c81c39e5b553e4101bc7c035ce81c8d669d85ed1d1eee41a74218f3d88 SHA512 35151946ce44fde9d3bde1d0626749ac4bc68cc448736c3b0f056f40a9ae30aef591db614b271df3eba3a96dbc94052ea5bf7ff68749ec980088d60361934771
-DIST github.com%2Fgopherjs%2Fgopherjs%2F@v%2Fv0.0.0-20181017120253-0766667cb4d1.zip 257755 BLAKE2B 13d505a73dd179828fd3dbcbc1dfb90f6bdf8a888bb7ab160713a566472adf63d45491fa29928853d76725c2ffa5ada33e802cf857376c83cd8085a31acb48b5 SHA512 5bb0e61c8622e09cecc099c80cd97cdefbc497d4ad0e88984b2936e7731991e972883eb639be1cc3f56249a97b4f14c6820cda6b1c08e4a2323aaca22b840dea
 DIST github.com%2Fhashicorp%2Ferrwrap%2F@v%2Fv1.0.0.mod 36 BLAKE2B e3101c1f32c24b5d5bd3de55b4f15645e7f0b338cdcfa00d30cc4c063bf4e9e31e68972979e8282d04920ffcb54f112c8c8f6e0e109824e56881a6a699cdf622 SHA512 2b68ca06311d8602f04eb738a68a24951a9187aa70018d938e549cf7b555bf54dadbda5825501436c52f6103bcd220ed170c99e4cf777187e2b997c87f05fb0d
-DIST github.com%2Fhashicorp%2Ferrwrap%2F@v%2Fv1.0.0.zip 9306 BLAKE2B 1172cbdefac5f63dc5dc155b38f1f6e63bafdcc4a9ec057c3714a93251fa88d9cf29aae780587b13dd4eb4af10fde2dd305c4ff774bd843068726c05861ccc4a SHA512 fcecaaf6496b11fb35d01da0d3375508c978b0a319d344c61f77539be199f1f13ed892f2019d5b6d8ee1603c576064203ab87e235bab4b0bcb96d28f9e16e88d
 DIST github.com%2Fhashicorp%2Ferrwrap%2F@v%2Fv1.1.0.mod 36 BLAKE2B e3101c1f32c24b5d5bd3de55b4f15645e7f0b338cdcfa00d30cc4c063bf4e9e31e68972979e8282d04920ffcb54f112c8c8f6e0e109824e56881a6a699cdf622 SHA512 2b68ca06311d8602f04eb738a68a24951a9187aa70018d938e549cf7b555bf54dadbda5825501436c52f6103bcd220ed170c99e4cf777187e2b997c87f05fb0d
 DIST github.com%2Fhashicorp%2Ferrwrap%2F@v%2Fv1.1.0.zip 9497 BLAKE2B 57ea3f82d59d1a6815a0f37a6175648f3be2bea0cd867c3cee1472f50e64097c9723462c4afb543b6eb7a64c687d2098cc1a1e03efece05d9bf89cd1a8174a60 SHA512 8065dc99eacbda55ab187ddcc5ff4792246c8b623b2c978df0bfbb2149c07966ca701dd6f36e7660074f47d082e1654eee0de01347fecd65bbd90f386346e110
-DIST github.com%2Fhashicorp%2Fgo-multierror%2F@v%2Fv1.1.0.mod 96 BLAKE2B ada026bc3e6104973cb7900d638acb7976ee8301e98cea55548fc800d8954997b666d0c605dcf1de0f639932c8834bd13e8f8512e74529a818d3de978f0163d4 SHA512 7276c308f91ed52579965e7e83e839351f2170cef2b58ef67887d5eb926dd21fd502f98ddc84ca8e6f16c81171490c1e2d9a131569b5d6d56a1e2ba28f227451
-DIST github.com%2Fhashicorp%2Fgo-multierror%2F@v%2Fv1.1.0.zip 17595 BLAKE2B 06dae93e8077ab6235d59b57646a162ff31e044624bab3b6ec86c7aaadf49c36b262b957704151db889c515c425630299d396d0b76919403eabf4a3e71098ef6 SHA512 aa4b145476a80d7be7959bf7d0a9a278765496dbf915d083fbc40c5b216a52126af9ba12cf09f9cc178ce53987822ed61c92e2a0295fa977f8a460262e857c30
 DIST github.com%2Fhashicorp%2Fgo-multierror%2F@v%2Fv1.1.1.mod 96 BLAKE2B e834b9619a59e85905dfd9a50233e959874706f35026892af8ab385b2fb78a8f876aa47695fd896fe241c72db5c306da0d7c24f49e3bfcad887ac9e2fe5deae8 SHA512 d44bb68b322c8512c135ca9689bbc603643a4a924dd59c168519761878fff14a394f365fe5d88114f5552a9ed1791f6f9e3f7cc44be08b412f0b3a5eb3efd67c
 DIST github.com%2Fhashicorp%2Fgo-multierror%2F@v%2Fv1.1.1.zip 19419 BLAKE2B e8e9f8e23c550256e8f31341e2a575675c4dc0b720a701023898ba9bd09f1be375d21c9843ce26767fe5b7e7bf6dedbd4807f58807c3497efa1a1d19544e07ae SHA512 054679ee890bfb4f268a614870a100525b996f53bd48dc914200f2f18a4dec30cda59e26c16478259d1e80c35864df6090901595b59fb80a209f30d909e9e9d7
 DIST github.com%2Fhashicorp%2Fgolang-lru%2F@v%2Fv0.5.0.mod 39 BLAKE2B 13f90f934356dd1daefd27a94bb7a8c31f09835ea69f3fc83d343004858c6728bdd6bfaaa919331f7ee04744d18ac37f46a13be9feaa20e24e88ee364991a9b0 SHA512 bc3e0c3b16454e0f079bef539857c22f09ebf11e78ac1744a22f5af87d7297979b7ccdd48e4f59605cac562c268c3cacdbf2745f65be5c934f73f216707120e1
@@ -169,63 +152,30 @@ DIST github.com%2Fhashicorp%2Fgolang-lru%2F@v%2Fv0.5.4.zip 20160 BLAKE2B 19b98d0
 DIST github.com%2Fianlancetaylor%2Fdemangle%2F@v%2Fv0.0.0-20181102032728-5e5cf60278f6.mod 42 BLAKE2B a20b1ee1675ded231069e976e9e3812b116d80b207914ecd1266ce87160bd6fd3c0bdfd7f7afa4a2a4d7891a01cd7e4a7b7bcafa90ae31c5875f6b0eca00268b SHA512 ff238b036db5df69dc734f4a0db4d1fd1a94a04131d64ea20c5268078a645327527f185da4aab38b2aca60da8c6a5f8f118b660f5b0773cc76d7d108a47297c9
 DIST github.com%2Fjsimonetti%2Fpwscheme%2F@v%2Fv0.0.0-20160922125227-76804708ecad.mod 38 BLAKE2B 66807be55b6dea3229c9f7e7c69d5a8d2a32c3d3aceb2d1755ac55853de062aba2285a5bd09e1862ecf2e5931fca7ae34e0fdbe95a8ea4631081218326845ed2 SHA512 efb9c8a70c060e6ca149d62c78b62d389bdcfa46ff8f3a77ae0ba98f3e49799ea42d9c25f04546e2460251be6fcf6b31a6b219da6861666ac7e90da66362cba3
 DIST github.com%2Fjsimonetti%2Fpwscheme%2F@v%2Fv0.0.0-20160922125227-76804708ecad.zip 9214 BLAKE2B ae1104a8066eb6c9c0548ec568845605beace57d4c04059e5701563cac1f4e7596310a5328a9e436c517dd8bd331120fd7bf08d77f81af6df9ec3f023c3e0812 SHA512 f7208bef5d4b97498b847d6436ba675109aea6b961188529a51060ee7f26dd71f524fef6ce89eb298d68f22edd2671ab7c448238bdc8ed23f18ab832cfc3c729
-DIST github.com%2Fjson-iterator%2Fgo%2F@v%2Fv1.1.10.mod 295 BLAKE2B c143c3fdf7abf77b2a2f55a66f8efff4f0e99478a89cd3cfaf50fb042e0da2fda5dd1e203c227597cc2caa7039f269daa48339701233a3e21f898eaa028ecc87 SHA512 395eb3069c417f996120ec06ea8d7a712f6d8915c7398da1f346c5bf5e0fde4492bae0ff3833f3316a41a28d23fc7c9c494db312da72d5cacdf52b2bb95da6ff
-DIST github.com%2Fjson-iterator%2Fgo%2F@v%2Fv1.1.10.zip 138645 BLAKE2B 90b085fefbded221903d24f63cf0fe9f2dc95c215b5ec2f9738c384c9118642425d810ca405bfae689fa1985f4d6a8a44c832f79300ef82fd28419138dbe5630 SHA512 1e1e5ed05000dce783b69b47af8ed0d59b11bb0b1739eb9620b576f67b98976cba9e9227519fe247a1aa3ac9c8c423b4896d1dfd9af6877e5eeaa6514761ba7c
 DIST github.com%2Fjstemmer%2Fgo-junit-report%2F@v%2Fv0.0.0-20190106144839-af01ea7f8024.mod 43 BLAKE2B 02346f7c8a28f8d40ef233bc1fc6f3cee54a54bfd79b374ab7f3435039a5d9f7da5d7fb7824c618d25034cde1d355b503bddd76b804d610828a080ccb2707dc2 SHA512 801663d67d1aead6b01df89e329c8ca969a1f860b5ee2c2018094791060bf6e8cddac8e2d788ac823e32278d4e9ad1dbd72935e4da2cf6e65a34dc97f195ce7c
 DIST github.com%2Fjstemmer%2Fgo-junit-report%2F@v%2Fv0.9.1.mod 51 BLAKE2B 4cf5f813ed021b04c810da33b332dbf44f45594e3657779687cd24391d2a93770f2a0e8999fa5a8b6564da5e08ed9fea1e52394907d518ea14a9568adf263e67 SHA512 c5761bc45d554ee6639c4ca23fefa5fc5c8a7c818f8f18d0b43aaab26c8114615543a1be207f5aedaef53c2dda623edeb7d3ae1c5ce6b72ea42605a1d5c31667
-DIST github.com%2Fjtolds%2Fgls%2F@v%2Fv4.20.0+incompatible.mod 29 BLAKE2B 8efd6f84dfcb696fa2ebf7b09c7405d57457dc67e03a2cc753cddd93698b1b03d84022f241c4b652dd80e0521b2b1ede8127fa15dd47d1f678a7fe1c31fafedc SHA512 3a397e0ee84d8d426eb5a1f39c07d608e0ed53b1d4b2fdbd137d23bf9f401840802d18d5203bc468fac76402c508bfebf49bb20869d8a715e44c49e21fd3da4f
-DIST github.com%2Fjtolds%2Fgls%2F@v%2Fv4.20.0+incompatible.zip 9901 BLAKE2B 0c8cf7ad0809f65d91b9ad5b27759cfedc5efc25194f19effd4b19c35c940461a48a57636ef3c707b27ac614b693ea05830bdef6943f11993bf561ef558cb99d SHA512 08b7201a9aa3294a3fc59bec78fee09f0d1bc7507b50b1d1cb1fa29a523c6870d00b633ea9679c9c86df9841739f46e9d5d9bbf0e3ec15b8ad08e57db67eedc0
 DIST github.com%2Fkballard%2Fgo-shellquote%2F@v%2Fv0.0.0-20180428030007-95032a82bc51.mod 41 BLAKE2B e9dae477e838938303749c4e7f1d0ece371d20bfb8f0d6fbb915a9ec249b82e300ef691c2175137488065828f67b02503576420fc95c2aa40f4fda262526dc7a SHA512 ab1be2f5ee91ad8c24a7c1d3c2277506dd76f85e8511f53e923ea7e0ecba140303c9312f0ecd2e09631e2e6591ad31a3b19e900ec102b486ed9b56c38a0d0c84
 DIST github.com%2Fkballard%2Fgo-shellquote%2F@v%2Fv0.0.0-20180428030007-95032a82bc51.zip 7034 BLAKE2B 7732946a34f604c858bda571c3afee7e0e02720d02127d8b4887f4f0363389b50088727de91b0436f0c943d11de80dfb766208f15665d0b4e5cf68f2a7b00817 SHA512 f9c4eaeeb1380aa5e219a19923cfd51f2612fbf11b7f37c710cdb0dfe20270f8cc7841d50dfd17110b004ec46e4c90329286213e04de481a54094df73efc9fe4
 DIST github.com%2Fkisielk%2Fgotool%2F@v%2Fv1.0.0.mod 35 BLAKE2B 2f43dcbab430f12316fde243db4bafe24372c74d60874b05917269e249a36660309c23da151db31d89c0d0a8fd0f179e2dd7f386af3ca533c95ef74017609af9 SHA512 86aca37f7f94ada381e0528a535b344c8fdbab9e0dcc7b71d716083501ad3d61db701ee159ccfb5455a351fc18a405301abe798037dd1200f9950bdd805d3dc9
-DIST github.com%2Fklauspost%2Fcpuid%2F@v%2Fv1.2.3.mod 34 BLAKE2B 1fea82f0ae24add73e084ada4930a6192f6f1d7afac47e2fd4a018e0167779741e4c948ebe67965751a845fcee894fe88e57a1e42a00a8aba2a6589dc73b30e6 SHA512 c71392a06cc0dea75b46dcab30bc5b374eeb432aaffc678213d5896015cd31ef085387446a8086c3275b97bbfb02c93c0180f7b3bac5fc1cdf1fbe5bf7af9887
-DIST github.com%2Fklauspost%2Fcpuid%2F@v%2Fv1.2.3.zip 364501 BLAKE2B c1ee7b5fc9b4e08d49fecb7dc017293e83d535e25ee098b3336dc5e6be4ebfe475cf6231a78d5a8135d79f5a5feac44a658b24f78b1cf27a1cc8ea5846c6fde8 SHA512 8f63bfa6ae4f589b512e1126600d53a121e932944e25e1b8cf315214304b473c86b1f9d5cbaebe9c112ac397b9a88a217a04204eb12368910e3ba1ceeb823da6
-DIST github.com%2Fklauspost%2Fcpuid%2F@v%2Fv1.3.1.mod 43 BLAKE2B 99324dc9b41ccf0b0012c4732c49c84d206cda9529e4d1ee58bf47266f1eefcb64d227e7ad285dced69c61e5a5d41e84d768bdc45a2a59df6bdb2b953299e6ad SHA512 e5b3325e43c7308becf2c0fffbf969d26624dd1f5a81ac47f91bfcc6adfa5d14f29f32d97cb53814e11a09512da3a0053deed3d0e8dfa3fa21d7ec180a84b0d9
-DIST github.com%2Fklauspost%2Fcpuid%2F@v%2Fv1.3.1.zip 377696 BLAKE2B e61d2572e080ddf8195c86101ba7995c38c124b4eaa918edc9b082448ea0f1ca44b6fca9788277aad332f7786577f6fe52e6c9d4b702c6773a7cecac7ef9f2c4 SHA512 4e191b6dce1ec399df8ed24ec2fd6756f2ec048741005256f076af6b127d43753f3ca0cda89c4f50bd0555b8a830d4994ddfe7cbf00d6e3fef905fbc782667a8
 DIST github.com%2Fkr%2Fpretty%2F@v%2Fv0.1.0.mod 67 BLAKE2B 2e1b4a8a38998179a32db321d331db54f881770a89719410876cdde1799cb8558ca2862bc70838d606540606d05918c4b115cf1c125945a77ed376c2efc4aa85 SHA512 4d841fc7a022e4e09e0a95925ad92a75809a67c30fb88de9190e4a2196383038dab9a5b3294b6a0b4786248977a0e09eea857a34100cbf22f8a52912ce9fa58d
 DIST github.com%2Fkr%2Fpty%2F@v%2Fv1.1.1.mod 25 BLAKE2B 63db8520df2f699bca5a7ccecc44ee04973307d86099cfe66ded30e2ca1bdd76fc3db48cfca0138673c20c6f94061caf219f018b21b9d67231fe959eef338596 SHA512 967fcdce835c12afbf3b12bb204a256f32d46a3da535e2a7250159f62781a163ee107dd2a4fa20743b76bbf52b97e627e11e895c8d5ef73aede37d6a89e326eb
 DIST github.com%2Fkr%2Ftext%2F@v%2Fv0.1.0.mod 64 BLAKE2B 475c51201a379df2cc4ff8c5681b6a7a1524f60d0b8fd0853fef569dea754efabf3425cd4b84e8427db8a6cf3e9b1141d5050d48d5d429cc1ce82162aa70050c SHA512 11d2502a7d241a0edf4e67bcb651a890a12f49d00f8b944cc9eb8f6e9cf5fbb2b2827e696021649bc795ffa275e95ee700e4a1706e03e88fa9ae079f5b9f48ce
-DIST github.com%2Fkr%2Ftext%2F@v%2Fv0.1.0.zip 12591 BLAKE2B 944b0b9a802757e78e3dfb11d6c4d79e0e0d90489d49262b7079e6ea4728328457f8773b392c8a618aacb5fdec78948a16cc852eff71ca6f4fb9eb422c03890b SHA512 3f0d00b0545769ad882e25a9a6f30b96ce4b72a8a46bb3c064907c94e2dda4e499eb32354c149f89752f9bc5d1ee5cb2ee5cafa46e2f65ea329fb432d0c0029f
 DIST github.com%2Fkr%2Ftext%2F@v%2Fv0.2.0.mod 68 BLAKE2B 91222794e2d517a33cb43bb9430e2e7b497ace820ab8c47dcde253226e54f08b922404df7ba7a2dc74555a059e95b81471dc36fc5b63b55e385004fd9a16d61f SHA512 9fbff125d97ce2c4b9b301021a987edbeb686b37927504df4e5c2f0ddbebc8ed28ee5152de7db2eceb0a0fc5728579823dc4145f36df9ba1961b9c2da1ac4461
 DIST github.com%2Fkr%2Ftext%2F@v%2Fv0.2.0.zip 12607 BLAKE2B 40090e35e5bfb0f1570cc11a3d3c3b6f9c4d097ffadb161280ac4dda90e7b74fe3784dbd31a74be243a2a0d6f3f3273f24a0dcb07523c7db8975171327de25d5 SHA512 5fbe5884d311244c5250d4a1b249749a84fc6a50d4d5d6b3967a4bccb317ebb807917fe540f13fea788abd863d7d2f2537a40b57cf156a3f920b15cd8b365ac0
 DIST github.com%2Fmartinhoefling%2Fgoxkcdpwgen%2F@v%2Fv0.0.0-20190331205820-7dc3d102eca3.mod 45 BLAKE2B ca27cda838147e1d68ba10649109192dd05cb2b100910f940579b6bd89b9ecfcbd186b7f6482edee593ff773360abc8ed8ad7c35deb5106fcf498d1394fede80 SHA512 ed4b221709e662bd34be729b9a409caa16ede1b3d82300b5acc45b61e2d28cbcf2baf23d61e61112a0f66c363adc8ed7662a9ff12f9fddebbd198529c101740c
 DIST github.com%2Fmartinhoefling%2Fgoxkcdpwgen%2F@v%2Fv0.0.0-20190331205820-7dc3d102eca3.zip 292019 BLAKE2B 46a3c8f8023a8d1c5f22fe1fdb4bb959f48e9b890b81664a850625e00325ca7a60892166a7ebab0887e45dc4c294084f2dc15cf50aecf66abdcbab2b5ac6ad13 SHA512 5ba20536d8534cd4e95ba441d42db3828770146ff1ec3efeb31e56ff7a75cb528eeb0100f13ba7a3ef70df136ae7b06a0e10057b94fc8194ea188e8679ecfb48
-DIST github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.1.4.mod 80 BLAKE2B 486156a648d66786de2a05b45b054ffbc6ccbb45ffe98230d3b3126ff533fd546af1b348fdcf67b1b3ae9310918869355fc39390a4f67b99cd7a1bbd1c6cf891 SHA512 f69ecc2e8097c17a9c0002181451d56a8a7496f62e87f437802420e9af27c5f80da2be189597759f2a5ee2656dca8c1cf91a5374b8e46919f7a6e0f9579d2526
-DIST github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.1.4.zip 12838 BLAKE2B 668586a4df02fa2d5db174a4ada1245a463946d4bccdef2599b791414af4f10eb07f56c61484977eeb21499db7f9b46f8fea03feebbaae5511504c13e3f7a64d SHA512 c3104e921a94b1a424cbf6936e8e5cdf5823947132f41190c211e050c9c8b7135c7b319eee0667a2b958c9f4fda27b9cbad4436d37b512e269716249dbfbef65
-DIST github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.1.7.mod 160 BLAKE2B 10c23e5a0edbdd398d6913ee8e4665e15ab0c30c6aad4d8e113533d421058858a4c23898f8f360b72cc39922bf9b4e7c6c656faab76ec4616e05285932bfef03 SHA512 60840c731813699f19e9a23f3cc0e890c0b0e8228510b0021aa2696f35f3aefa1fc06eb396c5035214ac185816d5757896da1bfaf59e2dd24ca750f5b792e6c5
-DIST github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.1.7.zip 13682 BLAKE2B d7065d3799d84593a9f7f7d93b8c286b7673505bb292208ba0475573667831ecf1aca5236f4703f1bd4d43e41b7cb688a9abe7502181edc9a76305e2a5842ebf SHA512 60a5dfa6c733fa6f71f2b0fb16ee153b2905f940b5eb7e95ff0d04bd3537961467426a1f6064d079fb164190d6a8b3c4bdeece2bf643057f34f7f96e9842f54f
 DIST github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.1.8.mod 160 BLAKE2B 10c23e5a0edbdd398d6913ee8e4665e15ab0c30c6aad4d8e113533d421058858a4c23898f8f360b72cc39922bf9b4e7c6c656faab76ec4616e05285932bfef03 SHA512 60840c731813699f19e9a23f3cc0e890c0b0e8228510b0021aa2696f35f3aefa1fc06eb396c5035214ac185816d5757896da1bfaf59e2dd24ca750f5b792e6c5
 DIST github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.1.8.zip 13690 BLAKE2B cc3568a99c03ce4ef19e52a8429b485e774eabddc3ab24315a58b149e8168c448bb1fdbaabb8e3eaea918de96cb7411caa000be4585f851edcb26cb0be9f0a7a SHA512 c39ebb2cc99a555054d55ffcefd5680292c66eed23b1ba8a3595259dc24cd42d432b558014066554308f14fc452b7a830f8b10e635d317b5f14ac0e0b24b1528
-DIST github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.11.mod 104 BLAKE2B b8d6df41ff2e8952e12f0518d455969d7a496b8318052ca37ffabc663d9602b9df70385274818af8bf1b50e70a44ade59b0436133e08818ceb385d34a3b44c03 SHA512 218110264da1c7396295627414259fcc65cc9823216d6c03f2a6d7499e17205e540821add3216ba673efda92f1e5bfbb817416874fc745ed1d926c43fdd9bc99
-DIST github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.11.zip 8885 BLAKE2B a9d15d5bb4264391abb906ef4b8ec929ecf61d0bbc781ad37aa36e236cf92f5a97f2035c0c08bb49c85142df10ba129c4c1755ede5bc8ec71743300f60af3d47 SHA512 4430b33d70f0fe35d07aefd6320ca0d8e49b71689d93b49e021e1893f8f9f043f8a6d16705e5517a600a538b3f35fed8f14a69a985b2955e8b6f34c19605c83f
 DIST github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.12.mod 104 BLAKE2B a8f54d5566d54ac27763dd535705d64dddd862f32d23f234b1ffbf759cbf4aa16886c90a96198ae2f4c0d0bc892932f1b8244e8ff0f8150bb87123947d734016 SHA512 7bd9f6a38aa9a16c3569142164389d1c4046170f66b5e9044f7aaa3192e9d2e2ccec486e3bc7fbac868c9693b6d333068c1a34ccd9e79dec1746a86348951503
 DIST github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.12.zip 8902 BLAKE2B 7257687403b9f8f066147fdd4ee1bec7e4b02cfd3fddda8349a89d9b9ea5b93d9bef61280ed48d68adac4dfed7e382ee96886aa0d65d85406fb93dc6fe0c53b1 SHA512 79ba14a04838c509500e6098553e8aadcd7105445387160a8aa1a6d7b0e70f0e807c99036c31faf51920544da2156195174c8530e317a72728719cb0a9a66098
-DIST github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.8.mod 95 BLAKE2B bb0de423d1270e7ec38c7ee345c788b23e2083b05e4f745832327358c4c054ef8d2f3f48d9bb7bc669ddc67796ca0abae164c1d40b2def5f38749d8ee4bd6f32 SHA512 923114bfd285393d06f681ba57db69f042f57d8cd7817a1611c7719121c812de8023a049024165e10112bda31a7f99d3bfe0d4c4f419557ba8909a2d005be405
-DIST github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.8.zip 7430 BLAKE2B becaf402e397202c86c156c3a5b7ee8f785290ca134d87cb36106a9496d18b1b45e97d306c6280c7186976a18307a7ef04d6ffa29a2e6cc2a3dd378fb400ff44 SHA512 1a7efd886840455b37b44b4d0c048b457eae14e509a740455db995e84c98f8fe94449e7dd11c544ff241e784ebeedf0f60c87838adca21fed08146fa3adeeecd
-DIST github.com%2Fmattn%2Fgo-runewidth%2F@v%2Fv0.0.4.mod 37 BLAKE2B f36ba4b667bc5bebbf49062ee5be234891ecc0a2be075c7bf57f5e39ee7fa2657d6bc086ba9a89728468ddd0623d27edb3c357ba4e91f79563bc9747d1d9ae63 SHA512 b891712f639a850e41582c15bcb384a985fad4f8aa86ce2d3f4d2554354aa1a9619667f60837a8280f869fc07dd58dc676c222bac23aaa5b2b00c06284b2f475
-DIST github.com%2Fminio%2Fmd5-simd%2F@v%2Fv1.1.0.mod 90 BLAKE2B e375688bb7c11de48d29d17c72a3e7675fd36d4c214bc39acd6d73386b007b51c34ff050b1b6ebf251f1f1cb98ce0022246ce7280a91f14d2136ee3e226f05c4 SHA512 aa292d2eb3045fa595c28c69fa87c329e6bfe29f2e88d5424b28a5b6270a869cc8455a88a6c076cdc5e6c76e36dd7d2d820ea7a8f3995c0af6374ab5c02ec735
-DIST github.com%2Fminio%2Fmd5-simd%2F@v%2Fv1.1.0.zip 106445 BLAKE2B 5aa2489ac1b0c4dd5c1c633731c7db35a0e84afcfff3d4317025d16e6c7f62e9a06ee1c56072a26ad45716f90fece953dca9b0831bc004c4081eda012d32944f SHA512 431bfd66971e8936204d8bd9b02aafa25e4300b3a3d8d78f63dc8f6e5dd0b436e1987074b5bd52e856759477f6d154625b5f1c565146fad909ce510322721b79
-DIST github.com%2Fminio%2Fminio-go%2Fv7%2F@v%2Fv7.0.7.mod 1133 BLAKE2B ae723eb106864062919adeaa26c981e85e57fcdcba61f7ea95cdf26b64fc330070777118e73d93b5474b51f0f382fc29f39709488f8e730d126bbdfd707c7bea SHA512 6e0354cb2561eb6ee326351bf6151cb64edea4abdb15776415b2267795ec3b7fe67540a748c11b351e5f71f0d1e6a802ecca86335b444e52cf23d0c9b9f608ed
-DIST github.com%2Fminio%2Fminio-go%2Fv7%2F@v%2Fv7.0.7.zip 411371 BLAKE2B 165a91e85c3fe439913174a24dd2e8ee59bbd2578413ea323cd711eb040d4ab7dfdf766544333bc545a1ad7e11436df4d4718d4b5610cbe62632ad2efac0bfb8 SHA512 f0bcddccda3c58cbff5aa8b344edb708083cbc097c8ef0ce4ae3bcd4e758884d99f062baf9acdb3acd79346f2f3e7de88bfe894ba9bc51a43cb691673fa69401
-DIST github.com%2Fminio%2Fsha256-simd%2F@v%2Fv0.1.1.mod 45 BLAKE2B 4868e4a4afda265cf4dd2e7c5a25657237687b3b1ba21d24f280174a05dece76ba902c1447586a7c632a961b8454a1d1c8a0e7d523fabcbf98dddee26d26e341 SHA512 2341ff459cb2432feff920048aac90868260d97c5ff68724b0b7e22c8e5c65da2b4055026d74578983020e24506d2f064e47e3fa247a4560a37951e205cd0a15
-DIST github.com%2Fminio%2Fsha256-simd%2F@v%2Fv0.1.1.zip 84306 BLAKE2B a22f077e8a63a951ca47f6d62a6de017245ae81ad57f788996c9efc722a5df7bf3ef9cda993ac8c524d75a95a2218732471d46d21e8bfc56f324ed8b126ba1ff SHA512 7732e181c4a620e81e77d261addf74c7d7edaa50fe41f13512124650a572ec258ebac8a4144bffa3107115f9c65968cc67a3aa5de8c8dbfffbcffceecfccbc63
-DIST github.com%2Fminio%2Fsio%2F@v%2Fv0.2.1.mod 159 BLAKE2B 1df4da30bba4bec94231b2f822fe0b545d28d17c5bf75dc3b812b32f2c19a7b4bc9ca88dded2ef18db9fd2c1dbd3343901571afa6c615ef22895c201336d1bea SHA512 ca2e78af641abb84d7bca56ff00e03ceb3a5105d98cd1187ebaede80fb8572279b233c1159c292a4b5b9942ce9005797eeb04700b53707b03c80f91a5c492452
+DIST github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.13.mod 104 BLAKE2B a8f54d5566d54ac27763dd535705d64dddd862f32d23f234b1ffbf759cbf4aa16886c90a96198ae2f4c0d0bc892932f1b8244e8ff0f8150bb87123947d734016 SHA512 7bd9f6a38aa9a16c3569142164389d1c4046170f66b5e9044f7aaa3192e9d2e2ccec486e3bc7fbac868c9693b6d333068c1a34ccd9e79dec1746a86348951503
+DIST github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.13.zip 8623 BLAKE2B f4cc66d4782f84b13cc940e1235b8a76acb823c5f07baf15948e7e108e79d02154c3a7ac2a87b83ffdbf2f862f35bac436038b7ed2726a09b943269dc7321b14 SHA512 ecb1ef28f64bf0d0b713be8be6b338130aa2d7ea747d3644e79de6f0593ed0e5720e8100ff37cdf90798a28955e1854672e756fe364639c04d6bcaedc4c6bbeb
 DIST github.com%2Fmitchellh%2Fgo-homedir%2F@v%2Fv1.1.0.mod 39 BLAKE2B e28ca0cdd6db21c4b97e47151a6c11487314f26d5a259f9d7f5581f3d92648a57d931e1d6b004597f76cf10916fbe14728c99192e24b6da674de2cdc9cc4e78e SHA512 a2b7ed5a25e6dcab620357d5c216546bdb554edbc6fd927a0703e788d7e7a10a743471d10f5c7cc56ad829ab35c7272c61d210e55947363447832e924844e9ee
 DIST github.com%2Fmitchellh%2Fgo-homedir%2F@v%2Fv1.1.0.zip 4163 BLAKE2B 7e00360086a04fb62a46ba20a10ac3460b364aa6ee09bf46f9769980c086db04aad45c4cbaa809a218f207c086876678d708a74d0a7679a48cf62b0b5edd48b7 SHA512 06bd620730c303df004e1d6a06a1aab8d83551d594c28e42f8d43613153ac28e6a5dcffaede69c84b2b49027b62581851a332f1397a2d6df9a46078510f7d1e2
 DIST github.com%2Fmitchellh%2Fgo-ps%2F@v%2Fv1.0.0.mod 43 BLAKE2B b6996dd7e1e75268f4018828d23802d360e28d700e6be0c0fecc9a17fd4ba79e00e81aff04166b461295b95f7225f12a1fc22bc5462ffe6a0f7eeb35e58aee5c SHA512 eb0cee04d26b4a0acf1b45504ab73931c10f98ebd41a6d96788aad477178f8172da402757c1fb8853ac513fff0aadbe3a9a4f74134c88cf9e26928896af55785
 DIST github.com%2Fmitchellh%2Fgo-ps%2F@v%2Fv1.0.0.zip 11977 BLAKE2B 885bab4a5c6632cb919fadde65d0c7257c15030e8c12e545705fdafa498a55a941154fb39d572e623db85a5672e85edd473d3411d24e5dbe64b4836d169da62d SHA512 046a755112a19a9fc80e25e5031185394d25da265b67a07fcc0eb3091168f47ed14c8c502b9ffd35d93d60056a6e2dc0d540e8149ddf402a5cc20d57776e312d
-DIST github.com%2Fmodern-go%2Fconcurrent%2F@v%2Fv0.0.0-20180228061459-e0a39a4cb421.mod 39 BLAKE2B a4d082021123db99b5d72a1d8d0011a517a79ff7b07238f0f01e550be684f18be03907b6280e673aaabee5ea837ce14b9e4daf278a23605c8dca8fba76bf40ac SHA512 4f29e15b1d18a8952c14f5142aa863b77b7be820129512cfeb3f8bc3335ff637a8a86c0284832a20543abc2c5351a3c0f992d52db895385e45f176af899b5844
-DIST github.com%2Fmodern-go%2Fconcurrent%2F@v%2Fv0.0.0-20180228061459-e0a39a4cb421.zip 6840 BLAKE2B fd31c7c067d62fa45add54abba9b29b205bd525e389b37eaced2f3c99ecd1a748a9a248e32c44820d4003cec7b598b3786163af26a6142ec789b246a6025c979 SHA512 3351800fe88326135f6f9b401d8d6ee9ceb83a5a30865d103dba4d22198a48751e79d9b5a8a964705107049924ab9bef128186a5796b6cde33d89a3a921f6b9d
-DIST github.com%2Fmodern-go%2Fconcurrent%2F@v%2Fv0.0.0-20180306012644-bacd9c7ef1dd.mod 39 BLAKE2B a4d082021123db99b5d72a1d8d0011a517a79ff7b07238f0f01e550be684f18be03907b6280e673aaabee5ea837ce14b9e4daf278a23605c8dca8fba76bf40ac SHA512 4f29e15b1d18a8952c14f5142aa863b77b7be820129512cfeb3f8bc3335ff637a8a86c0284832a20543abc2c5351a3c0f992d52db895385e45f176af899b5844
-DIST github.com%2Fmodern-go%2Fconcurrent%2F@v%2Fv0.0.0-20180306012644-bacd9c7ef1dd.zip 10936 BLAKE2B b045256d37d4973e88d0d9c6dbad7397160ddd7b3102ea8420f92be2e8c3ebf6362f350eff10b52fc7fb447d98b00f07c2bc1da3f6e442ebdb8e90103492c8c5 SHA512 e7986e7dfb362e346309cf77ee3969c2881056959e34db07d2dfa0e505106844b7424270d8f17f1a89d335071688e98b992ac81e8ffe0c98c8a0e3d145144d4c
-DIST github.com%2Fmodern-go%2Freflect2%2F@v%2Fv0.0.0-20180701023420-4b7aa43c6742.mod 37 BLAKE2B 3643a4250f81729708917dc751cbff6ab6e37761ca94784062a4eaf243682a9e2c755ce793024cba1737d0eee1c52c29984fe3008a2471ed24a759da87ec7081 SHA512 72fe8dfeed7041bf92af829dd84513f0c97f709d69586a044f830fd3de43deb27d0b02000338e00897a44c57806ad036cafcdb9661b1852ff76886ad92bd83f9
-DIST github.com%2Fmodern-go%2Freflect2%2F@v%2Fv0.0.0-20180701023420-4b7aa43c6742.zip 27732 BLAKE2B e81d64b0ad8f66484eef94d0b8aa352e9923aa3122ece6736536720e03416e05aee4f6d0e0445edc2f1918e0e67330df4e12796af81984c546b04c20b4ce5250 SHA512 4ed6c37c3f6341a596770a186bdca2255456bbbc646231e007dbde73a56eee253a9d00a6b2673eba421193e8a4ba7d8b8bcaf8057bdeb110ac6b56ed0e35b8b6
-DIST github.com%2Fmodern-go%2Freflect2%2F@v%2Fv1.0.1.mod 37 BLAKE2B 3643a4250f81729708917dc751cbff6ab6e37761ca94784062a4eaf243682a9e2c755ce793024cba1737d0eee1c52c29984fe3008a2471ed24a759da87ec7081 SHA512 72fe8dfeed7041bf92af829dd84513f0c97f709d69586a044f830fd3de43deb27d0b02000338e00897a44c57806ad036cafcdb9661b1852ff76886ad92bd83f9
-DIST github.com%2Fmodern-go%2Freflect2%2F@v%2Fv1.0.1.zip 25694 BLAKE2B 59d0a645e3fc29e94a04fbed5329cfaf2162f5779f1c13bfe96c9d979c7acd1b356587b6e30760568607ea15d2088a76bb58e4504e17abf360f2702eb6e8c3c8 SHA512 8fb62179a48e212b74f0e8af79ee1c20479b1725c089c75a12b43bf4936caaf87d42b35f2b7a7de87c60e793347bb185486beb8061e588b8085ac354a3ef8562
 DIST github.com%2Fmuesli%2Fcrunchy%2F@v%2Fv0.4.0.mod 112 BLAKE2B 50b4b6b4d07888fd6bbcc3d88b7f4b542bf2f3c61733319c918104f9f3a8cbbd9c8c2b724751ea2ee4bb09369dee4cf22dca0cd334733826ac882f270300f944 SHA512 bf10719acba9ec2fab1e504fc2a02f542b347cdc4b891237fb9cac81f5aa72882adc25bef2a4a9d43dc33c5d2dfe8f0398c698e65ba74352a8b498b7445e3aa6
 DIST github.com%2Fmuesli%2Fcrunchy%2F@v%2Fv0.4.0.zip 11581 BLAKE2B 6faf8c5d4368c6456db989791fa327e341a791b601e6a561ef3081ffababa7dd0a97190c1e96888f41b1d6af8b9231db09434adad8471737d54b25f515260e7f SHA512 3bf633884ff896d94b70815ad990806ebcb89ab69e297bb3f07b8b186697216053b886eb2029df3769910df7be6f7c99b590606b0a02e5fa46aa5e68281cefb1
-DIST github.com%2Fnbutton23%2Fzxcvbn-go%2F@v%2Fv0.0.0-20180912185939-ae427f1e4c1d.mod 38 BLAKE2B e88cae8efddc7e87d193f1dfa70990188cf6997f38aaf0d22135aaed71abd543291661bf5628d0c3d7dc90e64fa0a7ee58e65db2af21bd160c7733b5971059e2 SHA512 96389bbcfe0ff698d1638ea020d8a6311f7caffce3c9d8ab1fb6da6870dc1685313803af2f79da15ad0d5fbc33e17eb883b2631a2d81fa70dd851fb7133b43da
-DIST github.com%2Fnbutton23%2Fzxcvbn-go%2F@v%2Fv0.0.0-20180912185939-ae427f1e4c1d.zip 881205 BLAKE2B 29945db060d9c8d855f4ec068e1730050de56c0c446e1fa3996c3fc8d1e6d60562f8b29835e572e1db83e761f325cc1a29b1c1aac92528e832c398ad12522c7d SHA512 9995dc61d55f1235e5e7a0a232a0b7b7f34faaf983f21a64f9fc97f455b21326a8d04c3514a3f0e6b8e10a393fea5fc31dc9b3797f41bca07016a893d2e1bd40
 DIST github.com%2Fnbutton23%2Fzxcvbn-go%2F@v%2Fv0.0.0-20210217022336-fa2cb2858354.mod 169 BLAKE2B 7f27ba33f8763028458020a4c1f35bf6ed7bb13cec2cd1ff14e035730fe5d8d281b94e7dc41a721cc36db9bdfcbece6a962d3fe90a7e267f8fd969c04b623669 SHA512 03c4f94700b1c56553e7e0203ed94a4840366fcf4cf9c877b4102fbbb8e54976e183d9b85d8fe6d09291c8e6b701f18f39f310b9229f8829d6e6d9bd0bdc04b7
 DIST github.com%2Fnbutton23%2Fzxcvbn-go%2F@v%2Fv0.0.0-20210217022336-fa2cb2858354.zip 880937 BLAKE2B e553d54c0de0209b0a17e81e7f43fe2df6dc3ca103c095cbd4a33d242533aea4b79f173d8891ec3c1b787c08ebbbf46700012199bc1be080d4bd3465973aa727 SHA512 5117688873c985b262b5e5165eacdb927a41b8ea0622853d71f8e8a02d3979c13b5157e21bbbe6bf94afb4867fddc995e20cf640a283ab97e78c0c60ed20406b
 DIST github.com%2Fniemeyer%2Fpretty%2F@v%2Fv0.0.0-20200227124842-a10e7caefd8e.mod 78 BLAKE2B 7cde27fce0ec4a1c5c2e5205fb962352037c873d6183a6c1d8a9d385fe6a3bc8c9b66590401f8a715960858576d100626889e02361860bde65f8b66074d93837 SHA512 ee531fe5de94a4f4fc57592864a42beaf57be600d3fc11205ff79b44615429ccf46922cc3d80ab8df77b2db31a85bf40248ce0b1e1079d6861f317828b3305ea
@@ -237,47 +187,23 @@ DIST github.com%2Fpmezard%2Fgo-difflib%2F@v%2Fv1.0.0.mod 37 BLAKE2B 94636062c94f
 DIST github.com%2Fpmezard%2Fgo-difflib%2F@v%2Fv1.0.0.zip 12433 BLAKE2B 0c911c9d173080abd8edbbab1f47222343801d8eeae36b4add24773e3282fc2a39283fdf519a3d4483e39cdb7d9509b8570d151f46841ac1a616f312dc4cb0ba SHA512 3b85697185ba85cdef6202444ab6cabeabfad8a03d66b3839a852586b1f91ddae7897a57c8c138d5647022aa44906c7ef3c5339d520f90eeea0742a935da8cf2
 DIST github.com%2Fprometheus%2Fclient_model%2F@v%2Fv0.0.0-20190812154241-14fe0d1b01d4.mod 164 BLAKE2B ed42e8dec25021e488793be8e008c34ab5bdd6b5b884762d69f40d6c8968bb539041920ac7108e685ae56f2ef71b7174245772d96cc8f20463eba71580afae29 SHA512 4e0e6941b43c17cdce0205e9ba3d9fb18937f426ea2ac9a9e53396c906101d6ec2eb501cd8a791ee3ba9a32185f86495e9189134b8a9858134c73238d98ce0f6
 DIST github.com%2Frogpeppe%2Fgo-internal%2F@v%2Fv1.3.0.mod 73 BLAKE2B 21e3545a4518c64daac1cf36e47a2c8e1fc8ab7402372f2e871052d0dd9d83fc2aa44babb2f8751180cb66dcd2af82ed202afbf5ad3a219c4562da23ae8ce185 SHA512 4fd07ae7c00bcc135cc10a0b34ab102a893ed8ea4708f9d38da52f98b09fb66144f970ffd8795476fd6625b25c9e48390a5b1c5c99bd0c8d536a94201dc96613
-DIST github.com%2Frs%2Fxid%2F@v%2Fv1.2.1.mod 25 BLAKE2B 23b4d575cda8259ac3498731524edc19e21e56ca2881d58ab40adad9469eb97d94036eaecd4fa5e78558e852f4c8f4242f830c962843d14779fbef470f3f8f2b SHA512 18a8e8a8b69974b2112578bd8995f31235bcfe49c218b2d0affd6fd5d6b7938687d9f5405d4a228a2ee2960de7960496319a92a26e8b29f6076983c0d07ee66c
-DIST github.com%2Frs%2Fxid%2F@v%2Fv1.2.1.zip 12755 BLAKE2B 3ed8de4c779bec9c9b6bfe63e2d70cd86a73f390bbd46c1da03c2d7d5e0073152c273b44a903314be7fa7a65db702cb4055e0545541a3f3a5c1b62a296748968 SHA512 0911d9b0fbf3c775aa2c1507973bfefda027364ee298ad02a1e52f86c480f4592a7e6fc84f9864030b70b9121a552ef3011437b5deddb1e7faf8ae6271741093
 DIST github.com%2Frussross%2Fblackfriday%2Fv2%2F@v%2Fv2.0.1.mod 42 BLAKE2B 23dbba19737db7327590adaf3988abb9b5548cb3f959a9746a3b745c51f3c1397f071f2573a413a088f58e32959a2210c2b5354c47c263e90ad2ff1506872a5d SHA512 ac376a387fa39fe35dc4d073d8becd74e79f52e9d36b0a6628740dfe0e7c1f4fb6533fc262212663b105afcaa104082e055fa87d20cb3068359faae6dcba7738
-DIST github.com%2Frussross%2Fblackfriday%2Fv2%2F@v%2Fv2.0.1.zip 110026 BLAKE2B 862c858d51e59569c38e1304de08c256752db260cde7f7f44fab41d22695999fe73483d3854166f4e8d3da9b4f8e41b7999d7e44510ab8c2ca6c0120173b77e3 SHA512 992df87104aa66dec048d39496c85819cab19bc890cb2c60326660d011642f49cd926b082d3eb4136b229a6e4893ed023a133e4bf83a4993c534b24e14d77b4d
 DIST github.com%2Frussross%2Fblackfriday%2Fv2%2F@v%2Fv2.1.0.mod 42 BLAKE2B 23dbba19737db7327590adaf3988abb9b5548cb3f959a9746a3b745c51f3c1397f071f2573a413a088f58e32959a2210c2b5354c47c263e90ad2ff1506872a5d SHA512 ac376a387fa39fe35dc4d073d8becd74e79f52e9d36b0a6628740dfe0e7c1f4fb6533fc262212663b105afcaa104082e055fa87d20cb3068359faae6dcba7738
 DIST github.com%2Frussross%2Fblackfriday%2Fv2%2F@v%2Fv2.1.0.zip 122358 BLAKE2B 8f906d748eda31f9e673fd8eb0978eb9ff17484d38cfef9f5cb7dd623005bb971d131dce52a6089f5a41deded4c4dbb956aa9a56da91b5a5b5eba9e3a9100f59 SHA512 11e29cdd7a8baee7995009755582c26eb819efd715e9dfa1442b5743c7bf5752188f0fa8f5ddb3452f05f371a280324406410b683609f6a510277d3e03b30ca0
 DIST github.com%2Fschollz%2Fclosestmatch%2F@v%2Fv0.0.0-20190308193919-1fbe626be92e.mod 39 BLAKE2B 1fe1086bdd2304d771c53f56cb46df742a3e49d6bcd3dfb6f10fd81cd70ff372a34ac31088ef79e51a211068ee248437f5e6dfe4edd739a5719f783fed79b478 SHA512 3e1d6747fa7a97d9ee969060130b0e5bdcf162274f9c5faf66f1974cb7d34e59f569bfe1a2339a71047cc86db2422ce486aaf5d7d47feb61f89b5e6e429c8075
 DIST github.com%2Fschollz%2Fclosestmatch%2F@v%2Fv0.0.0-20190308193919-1fbe626be92e.zip 636486 BLAKE2B 08c35fef4d5561ffa1bc3de75524f50fe1c791559b162aaff74cd6c7a0667ef2c5b8f53cc39a1cd7a3faec4c3137412b2f3b27d94af7b72d7f25fcf9ca32190e SHA512 99a05815aaceedf4eacb645b5180d6591a696d2b51f04d8848c0b3d03a10975a166d1492ee3611aea595f6588e4c48fbcf8de097ef0bad40b2e281c5312093c8
-DIST github.com%2Fsergi%2Fgo-diff%2F@v%2Fv1.1.0.mod 281 BLAKE2B 15a1cb67527ae81338a77cffa1432cd83c798bd7094eadfbc88a7eb79f5236690dc2d5c93e3daefedb396516c41bf05da21b5e12966f69fd2663e7621267d015 SHA512 7af123ea69147856e23249740b882d90213ccc3f19cf698d960dd5950fa3f3f72c600854c5e0bb94977e6c5eab617736dcd20e180eebf599399215ad8c5c0051
-DIST github.com%2Fsergi%2Fgo-diff%2F@v%2Fv1.1.0.zip 55374 BLAKE2B 39f93770143cb70ef29156c1d31247bcab91ca7cc02f4164ed28a98769f1eede3e680b9b41dc55371a4dcbfe27b92bfce546ee2f1ca447f8623fb3fd88174888 SHA512 908f2454a0722d403aa33ea6cd1d40617ae8b84c62efc9a5de0bcf9c40413b6ba8412ac831e4b54b237190131be56e23266a9e18b0b680da5fd588e889985da3
 DIST github.com%2Fshurcoo!l%2Fsanitized_anchor_name%2F@v%2Fv1.0.0.mod 49 BLAKE2B 47bc5235e81d233e28b446ec2403accc442b4cc1ee956a0b7d47b5dac2a525f22bba87d05c3fe09179837860655f27191e073a3f6d7d0dad81c9a750752fe5f8 SHA512 6f6b924c2a3af28ef4342cdf8b83b726f2c409accf19c6ba0a4a47c6ae61857e4b69727fceb9e9e16fb8ce660a7181952714d49b6cafaacb282fa4e8af6e13b3
-DIST github.com%2Fshurcoo!l%2Fsanitized_anchor_name%2F@v%2Fv1.0.0.zip 3399 BLAKE2B 348c2171bf3404d8b69166fd412707d8a348e1d808618036de2ae01fce77e3880fc782ef301f9b4135a19d81ca9ded5cc0cc4fd73d36b66b121b7f0baa73df51 SHA512 d02d5e4b8a24b1709c053138c4128d4bd6347d4adef95d1e25141935cf560fdcfd5c2b7837d6e690f175f1cd5a21b0279ce97b8b3b66d5e0a5006e4103b25f46
-DIST github.com%2Fsirupsen%2Flogrus%2F@v%2Fv1.7.0.mod 242 BLAKE2B 68986e3744d3ae593a16a24b6ce79876723d93cdf96c978c185b14e4fb8d73d379d4ba05e138b412973b465a76a98a458c6606137b0affdd085dbcf20851471e SHA512 ba06d3386a03812f2ce65f0597b932beb62b70b4da92974c5f5ed81c150fb71ce0285a2d9779ec8a40916870b0e4da5c2c8c5591c3687f3b8e829652a01ec1f6
 DIST github.com%2Fskip2%2Fgo-qrcode%2F@v%2Fv0.0.0-20200617195104-da1b6568686e.mod 43 BLAKE2B 7190cd8561b8a4ec93fe2c1512a3207a5d0d81553ad9705b5c91eac8a72ba52d69ef728c3202134787f60b29bff5b9231bba009cb1cf116b1e86bce6e051e441 SHA512 f40e45d730137deb85788b5b5f63140d6e02b5af6892a10352e14599f9eaaf6315b10c8497568f965253b995fe7fa454101db5cd4a8378f0ad3eb10bad9e51ce
 DIST github.com%2Fskip2%2Fgo-qrcode%2F@v%2Fv0.0.0-20200617195104-da1b6568686e.zip 47370 BLAKE2B 7c9d7c015d07c664f15e50b5f84add0149ac2ef72cf4a0aacb46aa5edf15f40b3d61efc95f4bba001bf67f8042a2a29da3a740888b55fad7581738e660435bca SHA512 fcab30f5f11cadfc0e443520d4fb01c567da10048d840588c90fd1f29a9b3adbc28a53beeb0675dd14cf1da0b70553f24b44f5790f98e3f7f4a9f4efeb6782d6
-DIST github.com%2Fsmartystreets%2Fassertions%2F@v%2Fv0.0.0-20180927180507-b2de0cb4f26d.mod 43 BLAKE2B ea265a40bcaaba6e4401504643cb9bc2f775a23792b1802d6c1b665121c49db7d4d850ba03c31087fbd6f344b08349ce00a106e430c8690b8016c95318cf3973 SHA512 222b0edcf745e14eb775eac28668dfa0c52051cbf302ec441b58d75846fc2570a0fc2e616cbec68f6312a1648fd7e6997b6597b160b1a7f84c1c500a42e93e6d
-DIST github.com%2Fsmartystreets%2Fassertions%2F@v%2Fv0.0.0-20180927180507-b2de0cb4f26d.zip 81760 BLAKE2B a5767557b0e96fa3bbbace46e08d6a2167be2c203a44ffaadcf14079a23e906ee9197c8028fb29bdfc596d4f39e7bdd29993a1a520c36c8b08c5c5b6bd6bd2cc SHA512 e204307d5a06550292a4fb6e44912260aa5a7f9fcce0883d8abb324a53673512218982b1893e7d563eb7d6313ac98a8638072aaf7b5d66d359e82832f2a8bb2f
-DIST github.com%2Fsmartystreets%2Fassertions%2F@v%2Fv1.0.0.mod 52 BLAKE2B 3986b09ee44d8abc94fc0348107b410db374fccd11d77b9b0b7790b376a0f79b53bb3c70537d8d68b336ec007774fdb248237b6867b1a5c1802216073592fb0c SHA512 ae6455f8889d8aeea4b555e5c34c9583ffc5990e1772e75e5f6376d9e4d7d9e5f540ed0b04bcf142523347dfc21ae20a57d6de089718877d7db4387d9dc62319
-DIST github.com%2Fsmartystreets%2Fassertions%2F@v%2Fv1.0.0.zip 120718 BLAKE2B 4caa06b2d4c8c61d2688000ea73b7203e52a9f4318d4ce03be8c524389b719870db5fe61ef431131372d1ae1752d5f14b20f4c62faef5ccc630f92f66e746790 SHA512 60eb1355065dfa54084b5c59b88c98f872a94c75541cff15cdaec5cec915f280156d398823abf578853cb54360c3f20e98c090f6e109d1a94f018e88bf7d139b
-DIST github.com%2Fsmartystreets%2Fgoconvey%2F@v%2Fv0.0.0-20190330032615-68dc04aab96a.mod 302 BLAKE2B 69fd290c3e72f4ee0597f480bae8647d80ab5c4acab21ac3ea19e847e3af4ac91a767876fac04c94c2db8bc782a24577d3478d3d0653f673609f2d57d6cc3427 SHA512 24806ff2cbf2719f50bb37cc5ffadeca1b64c7b089a1647695b45d647ddac16332504c7026813b4ab9316e53e755ad0ebbf6db9ca88179d0526ca2634e27e25f
-DIST github.com%2Fsmartystreets%2Fgoconvey%2F@v%2Fv0.0.0-20190330032615-68dc04aab96a.zip 1529663 BLAKE2B f5bac351e33600e56b635602a487b592e9d54623bffdccdf9c6d9ca8eff7f358c8a1de307c2ed6dcdad5c94b9d569ed7efc3eda22044a2ef8aedfba985d7578a SHA512 e3504b80d856f46158f6997bce909f8fd6345d5177b556ca63b63be5d74a7b108e1dd621483478f20ff03932551132a1a80578f3561819072952fafe81c23993
-DIST github.com%2Fsmartystreets%2Fgoconvey%2F@v%2Fv1.6.4.mod 302 BLAKE2B 69fd290c3e72f4ee0597f480bae8647d80ab5c4acab21ac3ea19e847e3af4ac91a767876fac04c94c2db8bc782a24577d3478d3d0653f673609f2d57d6cc3427 SHA512 24806ff2cbf2719f50bb37cc5ffadeca1b64c7b089a1647695b45d647ddac16332504c7026813b4ab9316e53e755ad0ebbf6db9ca88179d0526ca2634e27e25f
-DIST github.com%2Fsmartystreets%2Fgoconvey%2F@v%2Fv1.6.4.zip 1521758 BLAKE2B 653e697d76d392b18c09e5c1c96734a737071667345b9d6ff9c9589bbe74e1c50849dcd7fc00b660adc1aaa30366aa9ca93a94d5eb4e605f7897d9714119f926 SHA512 3bdd2bbeaf755618d9fa7f324814497308361cb0f3f93a7ac84b9fc01b79ab346353ff0a022d3d85e74aef57b3773e03ea9279d0a60de317a1c57d5eca2d1507
 DIST github.com%2Fspf13%2Fpflag%2F@v%2Fv1.0.3.mod 30 BLAKE2B 18c9fb79a291aaf800991a296c8d7b1933cf45bf56082301a64ce17ea64dd15fd304094fd4b0561bd99c48ada545dfe7fa8cf47a15593cd3166eb66657a5e114 SHA512 d08b4540b799cee9c5f088c4e1fe002c9fda86f1634380409eec1404598b84376d3ca26b4c1cbcf58bc19234ab56531ab11db8a00c6dd2e15a53f3b4ae757efc
 DIST github.com%2Fstretchr%2Fobjx%2F@v%2Fv0.1.0.mod 32 BLAKE2B d698910da1ef00a70a1673b8c74105de195020ccd95d1e70c5dd1e1615210886ff9acbc9cfd03f46e99f5223b60b04695b8d362b9e0edd4e485480f802bd229a SHA512 4e366e5a60559a8863cb2a50280deb307d8bf885ca5440cce1b49a084b4cc4583b3481240125f35f161226592a43f2c0a426152f117d79b68c92c72a93f751d5
 DIST github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.1.4.mod 35 BLAKE2B 0357260904c9ba41892132c7e07d2add9b10ce4a09e8db4966219d1f515f917581e2afa0987094c90759634bc2aeb66e758074e023ff331a8337f5090c0102f6 SHA512 5b7ce867497852e4918b8cde5f75ecf2f24b9c95ad112478ac132322e904243f1cea3d16f5731646efb669256dbefc129ac70a499c8b1d25403a14c7e4fad10b
-DIST github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.2.2.mod 35 BLAKE2B 0357260904c9ba41892132c7e07d2add9b10ce4a09e8db4966219d1f515f917581e2afa0987094c90759634bc2aeb66e758074e023ff331a8337f5090c0102f6 SHA512 5b7ce867497852e4918b8cde5f75ecf2f24b9c95ad112478ac132322e904243f1cea3d16f5731646efb669256dbefc129ac70a499c8b1d25403a14c7e4fad10b
-DIST github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.3.0.mod 154 BLAKE2B 60cd7801e7cd33746305cd636b048b25a86270ec3b29a21c3c078c7e95b769bce7e80c2c7c5474113786bd788c7f88f3719e34f02141038e0d161b36e32f39b9 SHA512 bb808fad059f5abd0171e4bdc724411eff2c7e8d303a4ffb3608a00e21bb3cfafe9e83b4b4e9bccd42c9a4331f67ddc6043e3dd5eaa9a122c86626eed43a8383
 DIST github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.4.0.mod 179 BLAKE2B 3bb7cee3118f0d335ade107dfefc3a594dc3883564fe4c9e96d615e179d394a49a3d6cd6584ba9c684772bc3dc6479af6a168dd3841c03957252667384f6ba11 SHA512 243bf1f69c146252164ad72f853773dcc77f15d7c9e9b731bee26a95e7c8f4ce9ed9738db601b01edb82f4b3808873e1f153a6d4a0c97be0babbe65abc0f8d52
-DIST github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.6.1.mod 216 BLAKE2B c597010cf6690e73cd265e800f0f0bbea331fb76217457b6326f5a19481eca044aa5426fa32519870b2f0f4b3bed95768a23d3138dbcc9739b7cf7e044f50668 SHA512 197e6ef15edb27ded67ccfb636c252fe522f0930ff012341a4b593f25b5dd8282e4f658970931cfdeb8f2c5ee0b4ebac6738fe7634bf00896d12270fcbf4b31b
-DIST github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.6.1.zip 98541 BLAKE2B 369a625a7b05ee56619698e8067ee7b99a9d0508db655aefd23cf42f5ee1abb150a6b262be089fce6951f84fe9f1cc0fa46b75830b851888fd17f123852558e7 SHA512 073f44125d4bbce27d69b914385e05028c4d275585e275ff1ee2ffe299059646394163dde2b6b5c175ac9379d388fe34c1c874deda4138121541e2a639d7635f
 DIST github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.7.0.mod 216 BLAKE2B c597010cf6690e73cd265e800f0f0bbea331fb76217457b6326f5a19481eca044aa5426fa32519870b2f0f4b3bed95768a23d3138dbcc9739b7cf7e044f50668 SHA512 197e6ef15edb27ded67ccfb636c252fe522f0930ff012341a4b593f25b5dd8282e4f658970931cfdeb8f2c5ee0b4ebac6738fe7634bf00896d12270fcbf4b31b
 DIST github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.7.0.zip 105564 BLAKE2B 7b082ff11190ff27ce4a3de68896fffbbbf80ebdead7612aa3b06981171974ad2935bee7d5d71cb9ea29b110a82b3e04447248e7b9376e84c8f3f53d5001ae4b SHA512 be80972112f0a3907bde960637cb2c08d6ba4256ca27cfa07de5a0a8e523d0dfbd8e90ae593e5302d7351b7dbddecf69dc3985a9d19b96087732dd886eff371f
-DIST github.com%2Furfave%2Fcli%2Fv2%2F@v%2Fv2.2.0.mod 183 BLAKE2B 43fea991eaa4bf055a796d40ee3a72557fca99711c698b3ef2feec5d175ff6cd1af486f7e3b08c6f95b6035ea5a6c9bd76478264102ce85cb0bf08f22b841957 SHA512 4630a9172936eba1e550a8f6e95847faff6c2a3687900143cb8ad593df1b1f7f793969efb94dbf42a529074f6a4049554773157c3bc4eb7179f435d0af317c90
-DIST github.com%2Furfave%2Fcli%2Fv2%2F@v%2Fv2.2.0.zip 3449475 BLAKE2B 5eff2b47efe3fc06e2b99b939997554e58fc2548310656f990cc44dc1787d061a4bcfdf6010a20bd9d469c6b66dbf16dabc205357f28cd46322a2442a1c3c093 SHA512 087961c76752484ae4be8d7f0b79538638428e35ec47db185f57a6ec07e3b60d55873ee0801919b169acd5a1e36c5150613e528fc051910eafa362830791fda4
 DIST github.com%2Furfave%2Fcli%2Fv2%2F@v%2Fv2.3.0.mod 183 BLAKE2B 664e1cdbf471bca9566e20f34f214a9abd2ce826067d232b177056fecba72e8d87bb9eb9b56dff47f5ab7a8c5aeb5ac6bccc7069738f4b195cef81851b0ccffd SHA512 081cf55720b5ee8f81340d7d9ff9da92ef1be9d7a139d58516b01db8a2d8e020d097f79305dcba18ed2975b49b2ee23bd697e3c0a466adbf8a8e75328e943401
 DIST github.com%2Furfave%2Fcli%2Fv2%2F@v%2Fv2.3.0.zip 3454701 BLAKE2B 5f43a7730268c3bd6d4fcc6b6e27ac23075de3421239c00604b3dbd05f0a65a163a41dce00ec919e2704327419117dfa1f21285b74e44945a615b698b397d465 SHA512 b08d6aa4db1930e6864be6a09bbae416bff657cb25c10350f0a5c7bf92d893240216b6fa243e9d58ac68e684512c1818a70e33e11665b467f6dff6a3433a7e29
 DIST github.com%2Fxrash%2Fsmetrics%2F@v%2Fv0.0.0-20170218160415-a3153f7040e9.mod 33 BLAKE2B cf8b03e2f337d08c85902281a5625feaa388536ff2522b3f0f1d381452af3179d357fe973c877061d45c0ff82c075cad7e0743df2db155317e0bd4b1c5876592 SHA512 2b8cee8b222f55816fd323944727f83de0f2705395057c8eea447bd4274390ebcfa0d96c211d0f185ec8a9eeff0fd3b60f4e8ef48a423f175e7b4c9a689a2b60
-DIST github.com%2Fxrash%2Fsmetrics%2F@v%2Fv0.0.0-20170218160415-a3153f7040e9.zip 1589821 BLAKE2B ff92776e0df9cba4f2f1f3eede7264ed5c3fda1b7c5d1550d9500fad32f2e2a8ad860d3e8f84a369f84d4a7cf8a4b3756db63afe561e169f9c2c409e1fc62b99 SHA512 b4d6e66ba2b9362aa265bdf405beeeb55b31c72d2df59c4faaa6231f0796c4893db5b5acd45ebde4c1cb7e35b1886fa82adb53a0b2b54d52cdf607ebda5ed7d0
-DIST github.com%2Fxrash%2Fsmetrics%2F@v%2Fv0.0.0-20200730060457-89a2a8a1fb0b.mod 33 BLAKE2B cf8b03e2f337d08c85902281a5625feaa388536ff2522b3f0f1d381452af3179d357fe973c877061d45c0ff82c075cad7e0743df2db155317e0bd4b1c5876592 SHA512 2b8cee8b222f55816fd323944727f83de0f2705395057c8eea447bd4274390ebcfa0d96c211d0f185ec8a9eeff0fd3b60f4e8ef48a423f175e7b4c9a689a2b60
-DIST github.com%2Fxrash%2Fsmetrics%2F@v%2Fv0.0.0-20200730060457-89a2a8a1fb0b.zip 1827540 BLAKE2B 0858b3c62e1a18ce64d7612cb716c0754678a9aee956af8fb51fd654f57d532bf5a0a5f4dd28cebcbceb9ffe7ee620a6d0b1a7744f65603069c02f6224d736c6 SHA512 f1469fbdaa90a0d341bc53bf77cb928d2bc80cb41267ec453aedff7d3f56a7b7597019a420b93fc86617ee0b9be584f31f7d4d2ddd66afbf051a9031c5f13c55
 DIST github.com%2Fxrash%2Fsmetrics%2F@v%2Fv0.0.0-20201216005158-039620a65673.mod 33 BLAKE2B cf8b03e2f337d08c85902281a5625feaa388536ff2522b3f0f1d381452af3179d357fe973c877061d45c0ff82c075cad7e0743df2db155317e0bd4b1c5876592 SHA512 2b8cee8b222f55816fd323944727f83de0f2705395057c8eea447bd4274390ebcfa0d96c211d0f185ec8a9eeff0fd3b60f4e8ef48a423f175e7b4c9a689a2b60
 DIST github.com%2Fxrash%2Fsmetrics%2F@v%2Fv0.0.0-20201216005158-039620a65673.zip 1826113 BLAKE2B 8986a78a5252539fc118400d4ba9dbdbe243c6d7868d5c1f91b673a0a279060f91b03e430ff8c7139a74188bfba6ac753e5c86f52fe32e6c45b6307005890a22 SHA512 fb375d6649128cc0485e449ccde0095f5cce862ba08701632fcf3680031ffa631897208c26605c00d8613cde157ee6b0dab47feae2724c405090f35f5819241f
 DIST github.com%2Fyuin%2Fgoldmark%2F@v%2Fv1.1.25.mod 41 BLAKE2B 44917ea3a6fc533933ccd76d1594e19246c682d96311e030eeeeaeac3c126f6cd2c2de67ca410c89738918c5ab0594f1e9b2c2202c48f462c368ad31fb5feff6 SHA512 b7d81f5cbf1b55ebebcbb86ae89899ffec6fcd730144f1719947a76080f587d298d0e37a073a8768d7768ef64fc47b1673104335203a32a557f31e42a4e5a950
@@ -290,14 +216,9 @@ DIST go.opencensus.io%2F@v%2Fv0.22.3.mod 478 BLAKE2B 534d5c63341897b7213d30ae225
 DIST go.opencensus.io%2F@v%2Fv0.22.4.mod 478 BLAKE2B 534d5c63341897b7213d30ae225708b5465b0bc5efd7b42ecfdd7fd67fe6e8fb5ec7a20345b734d07fc2793b41a115dde74a1f80510f3970aaee8f6d4effd7b8 SHA512 62820051cdf582849bd310ca77bba4b2caef82c9e6bb27e7c2de6c3bb1be0af90443770971e893d0eb466832857190a9908633d069880cb1980120c14ef391c0
 DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190308221718-c2843e01d9a2.mod 88 BLAKE2B aec7d0eea1278eb3d1568d5bfb4041267501ad14457ebfcbdbc5fe21473170b8616ca4028f52af2edbfd85922cbe04540b4b0df7f69f63197698143cc5557a7a SHA512 2df49895053b36fed7ea905aa73f86568fbafd79ff0a7976679d8c77cf15025129435d9dbfd89367b611b1aadbea4f4bd1835eb4efa9ea702466e443638d379e
 DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190510104115-cbcb75029529.mod 146 BLAKE2B 6fe18cbe4eb6c3f6c26a4d2f9f309c48eb9ea59017125179cbfd61bb1e62395515c8cb286e1139fbcf54d37dcb2baa1a2f98dcfbcb6178b7f7df3b51929ff5c5 SHA512 f40c7b620b28b5bdc6ce92d43768af71b5869e7f0eb7872dd0f2751eed2bd15a17f7af26bf2dc5c6f7e6b816a174d010bfd22b3f8f5dd72f22dc4e4357dea842
-DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190513172903-22d7a77e9e5f.mod 146 BLAKE2B 6fe18cbe4eb6c3f6c26a4d2f9f309c48eb9ea59017125179cbfd61bb1e62395515c8cb286e1139fbcf54d37dcb2baa1a2f98dcfbcb6178b7f7df3b51929ff5c5 SHA512 f40c7b620b28b5bdc6ce92d43768af71b5869e7f0eb7872dd0f2751eed2bd15a17f7af26bf2dc5c6f7e6b816a174d010bfd22b3f8f5dd72f22dc4e4357dea842
 DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190605123033-f99c8df09eb5.mod 146 BLAKE2B 6fe18cbe4eb6c3f6c26a4d2f9f309c48eb9ea59017125179cbfd61bb1e62395515c8cb286e1139fbcf54d37dcb2baa1a2f98dcfbcb6178b7f7df3b51929ff5c5 SHA512 f40c7b620b28b5bdc6ce92d43768af71b5869e7f0eb7872dd0f2751eed2bd15a17f7af26bf2dc5c6f7e6b816a174d010bfd22b3f8f5dd72f22dc4e4357dea842
 DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20191011191535-87dc89f01550.mod 146 BLAKE2B 6fe18cbe4eb6c3f6c26a4d2f9f309c48eb9ea59017125179cbfd61bb1e62395515c8cb286e1139fbcf54d37dcb2baa1a2f98dcfbcb6178b7f7df3b51929ff5c5 SHA512 f40c7b620b28b5bdc6ce92d43768af71b5869e7f0eb7872dd0f2751eed2bd15a17f7af26bf2dc5c6f7e6b816a174d010bfd22b3f8f5dd72f22dc4e4357dea842
-DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20200323165209-0ec3e9974c59.mod 155 BLAKE2B 8bba3353db8ceb3b9fe40b8fd59aacde169776a4a553a069a04836bbf15e5a9a8d7a2d39feed98dac6cb890198180fda39f26b528ff95f24c5b2bbf6601b45c3 SHA512 7c5a755a03063d47d259fda0a6c2faa63c2f30b98dbac583e106aaa817d6cde3e07551e0b5e08f3a25db4c4ca45a23cebe993ae6f3d39c88deeaf2c7d8086a06
 DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20200622213623-75b288015ac9.mod 155 BLAKE2B 8bba3353db8ceb3b9fe40b8fd59aacde169776a4a553a069a04836bbf15e5a9a8d7a2d39feed98dac6cb890198180fda39f26b528ff95f24c5b2bbf6601b45c3 SHA512 7c5a755a03063d47d259fda0a6c2faa63c2f30b98dbac583e106aaa817d6cde3e07551e0b5e08f3a25db4c4ca45a23cebe993ae6f3d39c88deeaf2c7d8086a06
-DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20200709230013-948cd5f35899.mod 155 BLAKE2B 8bba3353db8ceb3b9fe40b8fd59aacde169776a4a553a069a04836bbf15e5a9a8d7a2d39feed98dac6cb890198180fda39f26b528ff95f24c5b2bbf6601b45c3 SHA512 7c5a755a03063d47d259fda0a6c2faa63c2f30b98dbac583e106aaa817d6cde3e07551e0b5e08f3a25db4c4ca45a23cebe993ae6f3d39c88deeaf2c7d8086a06
-DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20200930160638-afb6bcd081ae.mod 155 BLAKE2B 8bba3353db8ceb3b9fe40b8fd59aacde169776a4a553a069a04836bbf15e5a9a8d7a2d39feed98dac6cb890198180fda39f26b528ff95f24c5b2bbf6601b45c3 SHA512 7c5a755a03063d47d259fda0a6c2faa63c2f30b98dbac583e106aaa817d6cde3e07551e0b5e08f3a25db4c4ca45a23cebe993ae6f3d39c88deeaf2c7d8086a06
-DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20200930160638-afb6bcd081ae.zip 1876107 BLAKE2B 26a90e5dcfe05fac82496bac10442319680f5ab9f7f8e0f48f3994b677d2187f9cf735bb7da92ec74ce280f5c4bbf24893aefe4c859137c198118a3ebfc5557e SHA512 fd50b978909b5b2259da0cc5d4db8fe582b003f4b9c2e387a9491f2648521475c640a21a80d375ba006f0892595cd14c4e1c130a31e7da5a2cbd8b8673feec87
 DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20201221181555-eec23a3978ad.mod 209 BLAKE2B ce8c2a54376fa42fbd394e92db1f08d4c639eb7b5e1b33ba41c8a6ad212ccaf4bc7a7c761c43449177761b06296cce60aed17b0f542978a892b1de054b23286d SHA512 d43d530154c2fda6d171696efbe118c4c021d4f3cb5d8ac9262465e0cc906257330a489f6b950465196bf30c91afeb4d4946b3aada3dc182b5c7307a8e702fc7
 DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20210415154028-4f45737414dc.mod 209 BLAKE2B ae212ac1167b75a96c3b74f33594fa85e980530886edcf3bb58fb5e077793d24e69d1015e8581caafcc78b2d41cc75e4e17e82b2d3f76f10058ff5a715f00641 SHA512 c2a45c244884d6ccc5c4f73b6b3852d28c9ed1d3acd4805ff36292681e5011284af42ab75ebf6274cda4cc3bcd426496515db7eaca2a529500c0e896190f26a8
 DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20210415154028-4f45737414dc.zip 1865333 BLAKE2B 58893c3623e8ae23e9dbb28cfbb4faa45b949b640489e5e8e677b52292afd272da6075d5a9f532fe6089412ea0324b87db31c7bbb5831c35fc817a11892a2aba SHA512 ee1b82519e67b583b967d7426c0a4bab55253039259dcb1ac9bd053a16623a9fe9e9a491e5c540499e69bd20b1f05c2ff4a31e3dd5f8da175ead4b784bb8dc90
@@ -357,8 +278,6 @@ DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200520182314-0ba52f642ac2.mod 181 BLAK
 DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200625001655-4c5254603344.mod 181 BLAKE2B 05d6754fa387bac4a6481ad34fb7b681064fc6443b3f70cba316fe2fd0896050e4a772fd8e1be655130a00bb5feaded4725ffea1c5dd6ba55ba55315aaae34d2 SHA512 54d242da2536da38e292b62a955b3961f7b0a9789fe36c5f7ae93577eeac734a6e5bac21a657cf71d488395278cd7683db538e16a9c853835277a800a9d43471
 DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200707034311-ab3426394381.mod 181 BLAKE2B 05d6754fa387bac4a6481ad34fb7b681064fc6443b3f70cba316fe2fd0896050e4a772fd8e1be655130a00bb5feaded4725ffea1c5dd6ba55ba55315aaae34d2 SHA512 54d242da2536da38e292b62a955b3961f7b0a9789fe36c5f7ae93577eeac734a6e5bac21a657cf71d488395278cd7683db538e16a9c853835277a800a9d43471
 DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200822124328-c89045814202.mod 181 BLAKE2B 05d6754fa387bac4a6481ad34fb7b681064fc6443b3f70cba316fe2fd0896050e4a772fd8e1be655130a00bb5feaded4725ffea1c5dd6ba55ba55315aaae34d2 SHA512 54d242da2536da38e292b62a955b3961f7b0a9789fe36c5f7ae93577eeac734a6e5bac21a657cf71d488395278cd7683db538e16a9c853835277a800a9d43471
-DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20201021035429-f5854403a974.mod 181 BLAKE2B 3d3ddd23252ae7c54121211421c04a53076d3c347a9511c24494ded58863b0e96b2fefbdd10ee783bb3c0089cca1af91358701ef709fbd52a2c2d1fdec011939 SHA512 098a7d7eadb99bc1eb8695f1d86e1ed2ec2f5f625045f3ed77648d4ef7047818cfc449d46c8a6ccf285f95956baf228c1c57d6e281da1f63f67cfa0f93ca4230
-DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20201021035429-f5854403a974.zip 1503642 BLAKE2B 459cd4c9e103f489e029f1d7a4073b9af288c7feb34a7290a4b2c430d7cef6d8d8f85904d13e2549dc64ce47b9b3741c3082c46827988f085d3b32fa44eb81a3 SHA512 3f81ba470596bf5801cb9c80cb3ad84b61ae8d9b7a43d43b6c81bad14a2f7c9f08609a3205811ef7b4bf67d06f3474a7cacf6b42c06b5c9c88082f68082db67d
 DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20210226172049-e18ecbb05110.mod 179 BLAKE2B 509f289757a1f923d7b423a77cc3f1ddb08a2ee3eedb8f5f3869c2011a86121e79f02a34fb73076255e6973c8d66ca47b4690c34d7d3a5d33e1dbd04c4ea092c SHA512 f8ad754f922057fe78b5497cc77089a5eedc774800b2728a3ccd74cc82d83ba1ff00cc2d28110d5535623b733af7e34616f2fe127e68a936b9551395487ec146
 DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20210415231046-e915ea6b2b7d.mod 179 BLAKE2B 1d41797e9cd238f294cd4d01f3115a496d72952d4aa92116e99de7fef6d5881b8e532e4c419c36dbd58a04e4cfd27c814936e5b51ca99f47c9bee8578eb9d71e SHA512 ea5604f4e47cf196e4ab474016327b04c27aab3ef394d19f15a0a34d763f659c1764dea0554de8afbc9ec28168681f1ea1e03a6ef64fc1355f0e0d7c4ef709a1
 DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20210415231046-e915ea6b2b7d.zip 1565776 BLAKE2B eb0064f562896b0e6ae48369150c663f66ed93ced8d05f355e8c6ad7d53b9e6b7f4b1ff5d4c0dfb6a7e5b23e6344a90e9e02304ece8d669578d56bfa9517d27f SHA512 dae90ddd392edd9d13a21e183c1cd1e8ab37c595172612f499dd264a599cd9ea191e5a84a7ae4f26baca2615c6bd18671a63b9844dd4b84a5af13585582b3fc9
@@ -379,7 +298,6 @@ DIST golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20200317015054-43a5402ce75a.mod 25 BLAK
 DIST golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20200625203802-6e8e738ad208.mod 25 BLAKE2B 01f7f78a0324ca728efd4d662ea130d7e200ab25805125e472720ca01feaaf2625b15bf53f51837a6913e35e060a19018928a38851d7445f39e6e42e237dfda2 SHA512 a9dd073f69c5be1153aaab6e84dd3bb1610a0df8b9882ca4c486c6625d4b5201e5032f86e5014421358dff564d93c4e67f20e5fd1d21ed5e259ddfbc90af43c0
 DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20180830151530-49385e6e1522.mod 24 BLAKE2B 64a70c4594f5d3c37d962c1ed07630fba8abeaf534242f8f1509af271684499252af9a2320d5bac8e44064dba344b807535e4e9dd085fc0fb47bd9304120601a SHA512 ffe50fccf7f1d200f2ebc805b190e3f10c5a3184458a38f4590e520d7ce115e1520fbabe56651bbdc2e08da4a8db5ac86d0e88728efde3ab26c64ab4e0cd604c
 DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190215142949-d0b11bdaac8a.mod 24 BLAKE2B 64a70c4594f5d3c37d962c1ed07630fba8abeaf534242f8f1509af271684499252af9a2320d5bac8e44064dba344b807535e4e9dd085fc0fb47bd9304120601a SHA512 ffe50fccf7f1d200f2ebc805b190e3f10c5a3184458a38f4590e520d7ce115e1520fbabe56651bbdc2e08da4a8db5ac86d0e88728efde3ab26c64ab4e0cd604c
-DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190222072716-a9d3bda3a223.mod 24 BLAKE2B 64a70c4594f5d3c37d962c1ed07630fba8abeaf534242f8f1509af271684499252af9a2320d5bac8e44064dba344b807535e4e9dd085fc0fb47bd9304120601a SHA512 ffe50fccf7f1d200f2ebc805b190e3f10c5a3184458a38f4590e520d7ce115e1520fbabe56651bbdc2e08da4a8db5ac86d0e88728efde3ab26c64ab4e0cd604c
 DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190312061237-fead79001313.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
 DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190412213103-97732733099d.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
 DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190502145724-3ef323f4f1fd.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
@@ -404,12 +322,7 @@ DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200501052902-10377860bb8e.mod 33 BLAKE
 DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200511232937-7e40ca221e25.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
 DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200515095857-1151b9dac4a9.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
 DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200523222454-059865788121.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
-DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200625212154-ddb9806d33ae.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
 DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200803210538-64077c9b5642.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
-DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200930185726-fdedc70b468f.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
-DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200930185726-fdedc70b468f.zip 1488130 BLAKE2B 970a205f60773754e7d1768884216cff6b00cc16c63d90182531f4fcd9e60f4b58b6a9e143a18217a2d844d51f63ecb1f08b63ae9a6da83cee109352d1116d3d SHA512 80c5ab291a4d1614136f168b813b5d2cd75d781319b6f7aed3c37f645554c3f8283f7488578490e4d8acf3c24ca514323a0c4649b64dd556613dbf87ced11d61
-DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20201024232916-9f70ab9862d5.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
-DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20201024232916-9f70ab9862d5.zip 1496293 BLAKE2B 5e4cd198d7a461db0dff9b387afd229472214ab6d204c4d55c6bf36ee851a07cd73b61a249603d7f1e7d917097bd9e118ff78b94f45f9d15834ba5b6df897c58 SHA512 167e2b6faac57e06c420b9c7bb7d16db9c30811337176488893807e5ff88aa0b24e90e1ec10ab6e282f1b4fa2e91f2e3d72d12b276da8a85bcf29b7e2df4e25d
 DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20201119102817-f84b799fce68.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
 DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210330210617-4fbd30eecc44.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
 DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210419170143-37df388d1f33.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
@@ -420,11 +333,9 @@ DIST golang.org%2Fx%2Fterm%2F@v%2Fv0.0.0-20210406210042-72f3dc4e9b72.mod 95 BLAK
 DIST golang.org%2Fx%2Fterm%2F@v%2Fv0.0.0-20210406210042-72f3dc4e9b72.zip 22672 BLAKE2B e36e6cfa566c936219702eb086d6fe20936dfd57b58f7643331b116b63dfbfd40e679794d453b9a4c5952d5523a52dc6538ea05466e6a291f9d1240d3a2381c6 SHA512 9dca218e749d2a405b7d7bdc29ce1a3219e5f965103a7cccd5468c861262539c0c13212b28059d27937a9b39ce0e16dff386f92a31b62cb23f3dbb52bf992660
 DIST golang.org%2Fx%2Ftext%2F@v%2Fv0.0.0-20170915032832-14c0d48ead0c.mod 25 BLAKE2B 31009af0fdcd0f8730c9985287e6e364ec4e5183e57e92560dbc80a2010eced51b8a90f01a82b49384268c8a0adbf69d179c205d3f68e0eb459169d2ea9528f0 SHA512 ca081ef7cccd7bbedc6843fbe0c452352661a07e1298cd02ff338ed79d807c6401d613a3cf20011189d2f98a794ffa410547b3e352eb58a6f0a84822285d391d
 DIST golang.org%2Fx%2Ftext%2F@v%2Fv0.3.0.mod 25 BLAKE2B 31009af0fdcd0f8730c9985287e6e364ec4e5183e57e92560dbc80a2010eced51b8a90f01a82b49384268c8a0adbf69d179c205d3f68e0eb459169d2ea9528f0 SHA512 ca081ef7cccd7bbedc6843fbe0c452352661a07e1298cd02ff338ed79d807c6401d613a3cf20011189d2f98a794ffa410547b3e352eb58a6f0a84822285d391d
-DIST golang.org%2Fx%2Ftext%2F@v%2Fv0.3.0.zip 6349244 BLAKE2B 0aa464ac7b7d17fa7ec0627b64cd2301ed4f2819f837807db7a55725950dacb40be899b5148b07ea31b51530818edcccc6444a9800755e1d369ba8f1bce949b0 SHA512 982d78f580a7eac99a0c51e6f1fd2b2c3b91f56cd5e2b96fe960510049f7daf5915264f73f55f05675eee232a52998f9667fa84a9ccba15ed7819e4c93f583a7
 DIST golang.org%2Fx%2Ftext%2F@v%2Fv0.3.1-0.20180807135948-17ff2d5776d2.mod 25 BLAKE2B 31009af0fdcd0f8730c9985287e6e364ec4e5183e57e92560dbc80a2010eced51b8a90f01a82b49384268c8a0adbf69d179c205d3f68e0eb459169d2ea9528f0 SHA512 ca081ef7cccd7bbedc6843fbe0c452352661a07e1298cd02ff338ed79d807c6401d613a3cf20011189d2f98a794ffa410547b3e352eb58a6f0a84822285d391d
 DIST golang.org%2Fx%2Ftext%2F@v%2Fv0.3.2.mod 88 BLAKE2B f3dd520e0e4e9b57feab62ecabb9169f37f1ce49b2846b949f9266f807767d38f55e4aa8ea006229c6f81cfc1e2c9dc0d1e3c186235e416dfb90fe7e04751d07 SHA512 d9361afb453b10c9d02787568ec33ea4c97a115899c6b3d1a1246547a749244e9218475ae5ae9f741d9b355260d2d3c33852673e805fcdd5f26f3ca40f035884
 DIST golang.org%2Fx%2Ftext%2F@v%2Fv0.3.3.mod 97 BLAKE2B ed93c1d43f199d8cbd43cb25edac5de569cb78773d7f3232d59a0a4de6d174c5c100db2b02ca42c51f3e17e0f5e781ba9b5641a512b0dc72dcfaa5f6bd7d451b SHA512 f3f68808ccf5223453f765f59db1ef551b2130069eb83518878961c2d4a2044f9049f8d49df6e67699fcd2645cf90b84d35626590b2cfbca302fcf0eac76dc8b
-DIST golang.org%2Fx%2Ftext%2F@v%2Fv0.3.3.zip 8010747 BLAKE2B 78d999113a75f84966ffd23356e7cf60811b614754936851f197e547657cb6ff40acd074593c9cb6a2ae39ba625b36731c2fc0bc4b2b5ff68a2d377a6c7192db SHA512 024719305765ca737b225fec6268f84fc4c7d17c04e31eadfacafbb24a5f30af61920f4633e95d74dd2a266de40d1d2d13587881a3c22829ffeafb01fd75959f
 DIST golang.org%2Fx%2Ftext%2F@v%2Fv0.3.6.mod 97 BLAKE2B ed93c1d43f199d8cbd43cb25edac5de569cb78773d7f3232d59a0a4de6d174c5c100db2b02ca42c51f3e17e0f5e781ba9b5641a512b0dc72dcfaa5f6bd7d451b SHA512 f3f68808ccf5223453f765f59db1ef551b2130069eb83518878961c2d4a2044f9049f8d49df6e67699fcd2645cf90b84d35626590b2cfbca302fcf0eac76dc8b
 DIST golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20181108054448-85acf8d2951c.mod 25 BLAKE2B ba9e31cf2a4ab0f78a5c67d78026c2ef9571bcff7c820ce212637c8360420af274bfc47cb14bbc3df24457a4d3acb5dee38448a848abbd4e82232bef05b6b2e9 SHA512 6e51811c33b84ddd4a7548013579204266e466bd2e87aa9b6e34892570aa09c607ffa806f8a420474e26ca0e277ab23c81bb07b0ebf2c3b6ed193014c1bc37a7
 DIST golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20190308202827-9d24e82272b4.mod 25 BLAKE2B ba9e31cf2a4ab0f78a5c67d78026c2ef9571bcff7c820ce212637c8360420af274bfc47cb14bbc3df24457a4d3acb5dee38448a848abbd4e82232bef05b6b2e9 SHA512 6e51811c33b84ddd4a7548013579204266e466bd2e87aa9b6e34892570aa09c607ffa806f8a420474e26ca0e277ab23c81bb07b0ebf2c3b6ed193014c1bc37a7
@@ -435,14 +346,12 @@ DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190226205152-f727befe758c.mod 194 BL
 DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190311212946-11955173bddd.mod 87 BLAKE2B 32cb406deea05323b1121386bf61f344f8eda0b5370e95bb73828ce0bea50bee375ae3e9b076b9d683a4d89561709c5e97e45e6b08344fbdf6b03b3ce4398dcd SHA512 18ae9b2f54109b4ec5cdea433ee0e3b7006e4d5ea57022d6e8151d4d364735a6b55cf7b5eb2f43b602ec786b2b6819ad78dfc33151ee1a63a0b1199f54ce34a1
 DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190312151545-0bb0c0a6e846.mod 87 BLAKE2B 32cb406deea05323b1121386bf61f344f8eda0b5370e95bb73828ce0bea50bee375ae3e9b076b9d683a4d89561709c5e97e45e6b08344fbdf6b03b3ce4398dcd SHA512 18ae9b2f54109b4ec5cdea433ee0e3b7006e4d5ea57022d6e8151d4d364735a6b55cf7b5eb2f43b602ec786b2b6819ad78dfc33151ee1a63a0b1199f54ce34a1
 DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190312170243-e65039ee4138.mod 87 BLAKE2B 32cb406deea05323b1121386bf61f344f8eda0b5370e95bb73828ce0bea50bee375ae3e9b076b9d683a4d89561709c5e97e45e6b08344fbdf6b03b3ce4398dcd SHA512 18ae9b2f54109b4ec5cdea433ee0e3b7006e4d5ea57022d6e8151d4d364735a6b55cf7b5eb2f43b602ec786b2b6819ad78dfc33151ee1a63a0b1199f54ce34a1
-DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190328211700-ab21143f2384.mod 87 BLAKE2B 32cb406deea05323b1121386bf61f344f8eda0b5370e95bb73828ce0bea50bee375ae3e9b076b9d683a4d89561709c5e97e45e6b08344fbdf6b03b3ce4398dcd SHA512 18ae9b2f54109b4ec5cdea433ee0e3b7006e4d5ea57022d6e8151d4d364735a6b55cf7b5eb2f43b602ec786b2b6819ad78dfc33151ee1a63a0b1199f54ce34a1
 DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190425150028-36563e24a262.mod 146 BLAKE2B 78e7f7eaadf244c74a90edd8a3e8d092b255cc9246320ca921558467fa02e84ccc68bc6c4d1d5d4baf3c9cab7da37cf6515e4d4889d490d21f374fc4415f1733 SHA512 e9c7b67e28905435e1420333a531e6c0a8f025dc3023f22e5067d5395c8d081bd7993ceeb6ae08c4cd2d1f13aa0f46274a8788e1be085e4b12eaef785f3d7213
 DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190506145303-2d16b83fe98c.mod 146 BLAKE2B 78e7f7eaadf244c74a90edd8a3e8d092b255cc9246320ca921558467fa02e84ccc68bc6c4d1d5d4baf3c9cab7da37cf6515e4d4889d490d21f374fc4415f1733 SHA512 e9c7b67e28905435e1420333a531e6c0a8f025dc3023f22e5067d5395c8d081bd7993ceeb6ae08c4cd2d1f13aa0f46274a8788e1be085e4b12eaef785f3d7213
 DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190524140312-2c0ae7006135.mod 146 BLAKE2B 78e7f7eaadf244c74a90edd8a3e8d092b255cc9246320ca921558467fa02e84ccc68bc6c4d1d5d4baf3c9cab7da37cf6515e4d4889d490d21f374fc4415f1733 SHA512 e9c7b67e28905435e1420333a531e6c0a8f025dc3023f22e5067d5395c8d081bd7993ceeb6ae08c4cd2d1f13aa0f46274a8788e1be085e4b12eaef785f3d7213
 DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190606124116-d0a3d012864b.mod 155 BLAKE2B 538451f0cc08c6752c81241193caad56fcb8fb7a5cdc2ad6840ae44a1f5c3e1539067634352ded872712c84da7046b32053f9634da76c4888eec9046035a0935 SHA512 5823f6ea0fb08243f243a9577cd31397999bb387c8e29312304ca2dd0e73391cad60891a2a1181ac5fb665c1b01824933c295289a5d4cd580fc77f1bd828955b
 DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190621195816-6e04913cbbac.mod 155 BLAKE2B 538451f0cc08c6752c81241193caad56fcb8fb7a5cdc2ad6840ae44a1f5c3e1539067634352ded872712c84da7046b32053f9634da76c4888eec9046035a0935 SHA512 5823f6ea0fb08243f243a9577cd31397999bb387c8e29312304ca2dd0e73391cad60891a2a1181ac5fb665c1b01824933c295289a5d4cd580fc77f1bd828955b
 DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190624222133-a101b041ded4.mod 155 BLAKE2B 538451f0cc08c6752c81241193caad56fcb8fb7a5cdc2ad6840ae44a1f5c3e1539067634352ded872712c84da7046b32053f9634da76c4888eec9046035a0935 SHA512 5823f6ea0fb08243f243a9577cd31397999bb387c8e29312304ca2dd0e73391cad60891a2a1181ac5fb665c1b01824933c295289a5d4cd580fc77f1bd828955b
-DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190624222133-a101b041ded4.zip 2717809 BLAKE2B 829658f02a7bc0dc7b648120cb74e537cb615a54f89d1c0681fd67b06b6ce56cdf3484e61f66c9e90b3c0e6216dd4049ea110ef3d6c6ca4012639edb72b31c64 SHA512 a39312a4be21d0910ba46e26165b3c2c30b1be0b0cdbeeae98b8fbe1914217778e47bad1b227928ed1fa91bbd9399d737a9b2b870098ee4db5d7e7e4963b5c83
 DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190628153133-6cdbf07be9d0.mod 155 BLAKE2B 538451f0cc08c6752c81241193caad56fcb8fb7a5cdc2ad6840ae44a1f5c3e1539067634352ded872712c84da7046b32053f9634da76c4888eec9046035a0935 SHA512 5823f6ea0fb08243f243a9577cd31397999bb387c8e29312304ca2dd0e73391cad60891a2a1181ac5fb665c1b01824933c295289a5d4cd580fc77f1bd828955b
 DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190816200558-6889da9d5479.mod 212 BLAKE2B ab1d99a25eed3af5426d8a58d249b827e4d30a046302df72c7e0b59955e65b636f4645c5c436bb21ec54ec3745b9996bce92d29826ad93cbc9120a06dc19b49a SHA512 6a0316ac3b01aba3f186b5db540a368ab780a821252f7f0975f9e44afea9170c4b3e7027dc5f79a54ebc6af290cbb59b876d3b53bbf26fd05fc3a80a06fae109
 DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190911174233-4f2ddba30aff.mod 212 BLAKE2B ab1d99a25eed3af5426d8a58d249b827e4d30a046302df72c7e0b59955e65b636f4645c5c436bb21ec54ec3745b9996bce92d29826ad93cbc9120a06dc19b49a SHA512 6a0316ac3b01aba3f186b5db540a368ab780a821252f7f0975f9e44afea9170c4b3e7027dc5f79a54ebc6af290cbb59b876d3b53bbf26fd05fc3a80a06fae109
@@ -475,7 +384,6 @@ DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200825202427-b303f430e36d.mod 271 BL
 DIST golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20190717185122-a985d3407aa7.mod 37 BLAKE2B 7449be81e1998a6439070de1a0ddf5bfd1e4971c90c2e358590a9c1c41128bfc1daa42a9bbc3709506df2442ec8420e6354343a095c837be46335c180083f28a SHA512 659d18a7a3a1be45ff6dc9e7475276b82ee7f11c47d39b0c237d7f872836a1dbdfff0902f21d6cd8093663997865da92e3e5a4acf1ad6129f972dc5e667b4f05
 DIST golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20191011141410-1b5146add898.mod 37 BLAKE2B 7449be81e1998a6439070de1a0ddf5bfd1e4971c90c2e358590a9c1c41128bfc1daa42a9bbc3709506df2442ec8420e6354343a095c837be46335c180083f28a SHA512 659d18a7a3a1be45ff6dc9e7475276b82ee7f11c47d39b0c237d7f872836a1dbdfff0902f21d6cd8093663997865da92e3e5a4acf1ad6129f972dc5e667b4f05
 DIST golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20191204190536-9bdfabe68543.mod 37 BLAKE2B 7449be81e1998a6439070de1a0ddf5bfd1e4971c90c2e358590a9c1c41128bfc1daa42a9bbc3709506df2442ec8420e6354343a095c837be46335c180083f28a SHA512 659d18a7a3a1be45ff6dc9e7475276b82ee7f11c47d39b0c237d7f872836a1dbdfff0902f21d6cd8093663997865da92e3e5a4acf1ad6129f972dc5e667b4f05
-DIST golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20191204190536-9bdfabe68543.zip 22282 BLAKE2B 68df6b35d9043f23df13432b80074544f46833467294955ae5706713055d0cc9ababda892853c14e99c80a3571fd4a807a019a098fdd2ca695ba90c577ead5c4 SHA512 c72b8b73f89624889a2874c1b2445cb82f0e545fccf6a7761a278f3f659eb19f5f1c8585641b8f89f2bcfc3817ad2c0e267751cfeeab949e287e43af5df57e28
 DIST golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20200804184101-5ec99f83aff1.mod 37 BLAKE2B 7449be81e1998a6439070de1a0ddf5bfd1e4971c90c2e358590a9c1c41128bfc1daa42a9bbc3709506df2442ec8420e6354343a095c837be46335c180083f28a SHA512 659d18a7a3a1be45ff6dc9e7475276b82ee7f11c47d39b0c237d7f872836a1dbdfff0902f21d6cd8093663997865da92e3e5a4acf1ad6129f972dc5e667b4f05
 DIST golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20200804184101-5ec99f83aff1.zip 22295 BLAKE2B 310f892b8ce32810a1afef53335428d73bc23e749e52d00d7624afea2d10422b1b73507026daf23efd2384b81262c4c7862c22da23f6fb43c1b5f79a51170d5e SHA512 34044424d303f5032d4fd302bbf1aca390d45e876583cc223fddf0d685a6eec2bde0a4c1b82c4e471eb5be97fc8aea9b14695b07940d1ecde806636a85d12051
 DIST google.golang.org%2Fapi%2F@v%2Fv0.13.0.mod 851 BLAKE2B 16f0842a8e0082a8532a7c8f5cf5092cd196a90197b3e05c6fe0275e10390e0b97477f60c07d26b422d0da9289fe3c8f2d8fb8fe2fec63af9e005adc26921724 SHA512 bd693c28b65c1b369f89a6b1926a127c91df98feb137ab5595bf141c1a67e3adcf25f79b4cbf3e4c44755d45b9f4876dacafbf18afa1e8c09fd89a8f9d0e9330
@@ -556,28 +464,17 @@ DIST google.golang.org%2Fprotobuf%2F@v%2Fv1.25.0.mod 186 BLAKE2B 7df4a9ba66d7fcf
 DIST google.golang.org%2Fprotobuf%2F@v%2Fv1.26.0-rc.1.mod 83 BLAKE2B 0e4901ba1d4e31ef22f0f978ee7b7d926ac2cd3a1cb5d8d8a81a33e02f9dc81aad6508280d65659862c3a9bc0667c334cb6cd8c0c532d5fdb3735a415c2a5eca SHA512 a7b2aad691925341e3d1f6d1d1453b68386902a4e2e1c0deb406bc157d04328c5519a01ce938a33a6e358cbd9dc0c2f862c9822bde5314d2eb9d416d7bf789d2
 DIST google.golang.org%2Fprotobuf%2F@v%2Fv1.26.0.mod 123 BLAKE2B 73f875413489557d8f0bbcd665c06356b900f87e2cd9ef0ee5aba218a3a910842912d36dc9e653afa538c99cc723d28327a8bec6eac1f6bd93277d70fa891339 SHA512 d618524aca1cb3e525060bb66b0c8f06c9ad6be5389be228d265dbcdb368442f4f0a7e98f8c9082916b2579d77e627a550904f0b1c058b7d5e45eb7ceb77c2e0
 DIST google.golang.org%2Fprotobuf%2F@v%2Fv1.26.0.zip 1557709 BLAKE2B bc672854cc46d48461bf28395c5be02fe99ff9da1d23e212078e549bf3e2beeaf953cc185e059c73a374f3e2662cb81fd6c3ff53472934964b8461f370b51a78 SHA512 de309c033d05be35503d6073e14ead585db4e6b75d478a674a37f93c7757e914c67bad446cf7ce04ccd49659d1ab2f9a024ee639a7536480ef92bb6b8b52dfdb
-DIST gopass-1.11.0.tar.gz 486905 BLAKE2B 406bd0e136963ff20bc1fcc3823b683f06dcb69dfb95eac689197b8572e9ebd735c89f08ec36d1007920970de0cb982bb63780ad5c21a02c5d34a34e30e2fa6f SHA512 0e971ba04cfc81071d44a2d57acbbe11e7e7706ac04774a7e5c0db6c940a30e64f5ef158e873f912b0d6f4c91a33c2aef4c9cf6b8158f714924c972ade34fb11
 DIST gopass-1.12.6.tar.gz 2172823 BLAKE2B 6f07d3b43653dd0e0028fdd9df16fe3438a5c16c7d268bae90430d445f4db7cb5cb2ff01a8be22543891fe6ad5f438191923416b7d4fdf8a7e2ad004ee9c47f4 SHA512 2e237d1135e79e0236091dac38329ce39aad901fa016366f618d92ddc61246f7496d73d8b7fc4e9e5cb723b60c7798736eb2359a3da5ac1a7dce6fa9bb63ae1b
+DIST gopass-1.12.7.tar.gz 2174920 BLAKE2B 4f1af9b8301a4049cd017831a401508a1c7cae7e240686978141285c3702990862b88c7b458dd010656a2513a114c1f95d01fa33f23d8672b0d89fe4539d7195 SHA512 4ff15a93a5f553970fb41cfe27f984311ee9a8bf572e8250195d5a74f8bef0689c1c15b3e92595b78ee55ba29c8e1e2f25d71b123eab885f418b31a5cabc9029
 DIST gopkg.in%2Fcheck.v1%2F@v%2Fv0.0.0-20161208181325-20d25e280405.mod 25 BLAKE2B 6470f3d94700c4d8b3176d692bdb91646750f2c6a866ff2ef4183aff1de01f024a8757f97b4626ec0355092e5f25e7ded91cd5be845f627d107c58b1daf400d7 SHA512 9ac0f80ef05881387cb2f48f81560f3207fe586ea16495383662e6d62e43d93fac01dfe72e1d0063d3ab065331dab3a8098d7da4f1830ba1aff6f27f8e1bc1b2
 DIST gopkg.in%2Fcheck.v1%2F@v%2Fv1.0.0-20180628173108-788fd7840127.mod 25 BLAKE2B 6470f3d94700c4d8b3176d692bdb91646750f2c6a866ff2ef4183aff1de01f024a8757f97b4626ec0355092e5f25e7ded91cd5be845f627d107c58b1daf400d7 SHA512 9ac0f80ef05881387cb2f48f81560f3207fe586ea16495383662e6d62e43d93fac01dfe72e1d0063d3ab065331dab3a8098d7da4f1830ba1aff6f27f8e1bc1b2
-DIST gopkg.in%2Fcheck.v1%2F@v%2Fv1.0.0-20190902080502-41f04d3bba15.mod 25 BLAKE2B 6470f3d94700c4d8b3176d692bdb91646750f2c6a866ff2ef4183aff1de01f024a8757f97b4626ec0355092e5f25e7ded91cd5be845f627d107c58b1daf400d7 SHA512 9ac0f80ef05881387cb2f48f81560f3207fe586ea16495383662e6d62e43d93fac01dfe72e1d0063d3ab065331dab3a8098d7da4f1830ba1aff6f27f8e1bc1b2
 DIST gopkg.in%2Fcheck.v1%2F@v%2Fv1.0.0-20200227125254-8fa46927fb4f.mod 25 BLAKE2B 6470f3d94700c4d8b3176d692bdb91646750f2c6a866ff2ef4183aff1de01f024a8757f97b4626ec0355092e5f25e7ded91cd5be845f627d107c58b1daf400d7 SHA512 9ac0f80ef05881387cb2f48f81560f3207fe586ea16495383662e6d62e43d93fac01dfe72e1d0063d3ab065331dab3a8098d7da4f1830ba1aff6f27f8e1bc1b2
 DIST gopkg.in%2Fcheck.v1%2F@v%2Fv1.0.0-20200227125254-8fa46927fb4f.zip 41484 BLAKE2B 34fbdc1525bbea7fc6b7f74e74ab407ed03d3b58e25e9b3b79ec35945acce36b7c4be54388c1244d508c7cf67ac6e4f1ff7c9eb5245f01ff27dec82cfe87bdb8 SHA512 713c79551d48a99cc9feed3bcf71b7f1fe95270701787dfb114237bd358ad104d18ce7ca412f65d1ce6b7f94ffb6c01afe28c9b821e1a5378b05c93340aa8a49
 DIST gopkg.in%2Ferrgo.v2%2F@v%2Fv2.1.0.mod 133 BLAKE2B c4ac637e2bf2d6635065be5213d73f23a1870054c58e9f1cce93af4627ed6fdefa96798b0fbbd27666573757f8b4a48c694ddf3f86c98e898124294459500771 SHA512 cac59fd7470fc9d3203dab6b9e881d4182cfca5acf0a19207a9aff2964d42f20422f9a164bb52b2fa73c523e3caafd63028189bd4190a1670870154dbf3e8178
-DIST gopkg.in%2Fini.v1%2F@v%2Fv1.57.0.mod 23 BLAKE2B 4e15082dd2b6e386e93baa78307538fba456343420c52605d453c6309f256e8062ea4b821d70c926096ae58a8feb33c6b796726d2dcc886c58e8293f99ac92a7 SHA512 7650ff592e6f5a0393f794fbdf17a28ad228a2d29ca79685c9ab8d9ec395554f1691b2a0d061e6248cf542f89be4d9a68884f7b24de7c8ddfef9c02cfeedda73
-DIST gopkg.in%2Fini.v1%2F@v%2Fv1.60.1.mod 23 BLAKE2B 4e15082dd2b6e386e93baa78307538fba456343420c52605d453c6309f256e8062ea4b821d70c926096ae58a8feb33c6b796726d2dcc886c58e8293f99ac92a7 SHA512 7650ff592e6f5a0393f794fbdf17a28ad228a2d29ca79685c9ab8d9ec395554f1691b2a0d061e6248cf542f89be4d9a68884f7b24de7c8ddfef9c02cfeedda73
-DIST gopkg.in%2Fini.v1%2F@v%2Fv1.60.1.zip 65711 BLAKE2B edf2b80b00e6b50c1ff3f695f6bde73fa9d6adfe1234e9068cf6119813d1048fffe780ff74914ab6b5a28352a3a7fa7c4f49d7fcfd2da7f7b19775531e5c70a4 SHA512 fbc7524fa5c8e2277282881d2bc599776f0a3b8553ed617904890ef43f7a7a6d14d90ce7fd9957eff9c540c37307940087289154a19ba5bde5cb787cc613c634
 DIST gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.2.mod 95 BLAKE2B adb3684980f1d8e6c23444e91028f8db55f1bc496114eb3508dbecf9917dbc8a0a4bed7c0d761123335a75b9ffe727e180f2d6aa5f84312edb05a798185c8362 SHA512 916ff67ddb6c2ba39905db4277ce42596d9ca5a42f8aa7f47f16335e78d91a1b30419fd1b7b6967b37e248363397ec527b38d2f500b3546edda5d2bce1944379
-DIST gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.2.zip 78275 BLAKE2B 139c8eb7c405dddbb67321eacd25c0af1e5b3f031831266abf6a8e5a5ed12f6381778868383c03433f8ef760d6b42ffbff40150f2fee91dedd0b312f9fe81c7f SHA512 3214b38f348921f6a6d9ef93d4337bb90abd0d101d69d16ad8e38415c22d3b9a85bda873df2eb7a271f9b973ef38b74731405e522e1bb8083c78932762cb5535
 DIST gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.3.mod 95 BLAKE2B adb3684980f1d8e6c23444e91028f8db55f1bc496114eb3508dbecf9917dbc8a0a4bed7c0d761123335a75b9ffe727e180f2d6aa5f84312edb05a798185c8362 SHA512 916ff67ddb6c2ba39905db4277ce42596d9ca5a42f8aa7f47f16335e78d91a1b30419fd1b7b6967b37e248363397ec527b38d2f500b3546edda5d2bce1944379
-DIST gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.4.mod 95 BLAKE2B adb3684980f1d8e6c23444e91028f8db55f1bc496114eb3508dbecf9917dbc8a0a4bed7c0d761123335a75b9ffe727e180f2d6aa5f84312edb05a798185c8362 SHA512 916ff67ddb6c2ba39905db4277ce42596d9ca5a42f8aa7f47f16335e78d91a1b30419fd1b7b6967b37e248363397ec527b38d2f500b3546edda5d2bce1944379
-DIST gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.8.mod 95 BLAKE2B adb3684980f1d8e6c23444e91028f8db55f1bc496114eb3508dbecf9917dbc8a0a4bed7c0d761123335a75b9ffe727e180f2d6aa5f84312edb05a798185c8362 SHA512 916ff67ddb6c2ba39905db4277ce42596d9ca5a42f8aa7f47f16335e78d91a1b30419fd1b7b6967b37e248363397ec527b38d2f500b3546edda5d2bce1944379
-DIST gopkg.in%2Fyaml.v2%2F@v%2Fv2.3.0.mod 95 BLAKE2B adb3684980f1d8e6c23444e91028f8db55f1bc496114eb3508dbecf9917dbc8a0a4bed7c0d761123335a75b9ffe727e180f2d6aa5f84312edb05a798185c8362 SHA512 916ff67ddb6c2ba39905db4277ce42596d9ca5a42f8aa7f47f16335e78d91a1b30419fd1b7b6967b37e248363397ec527b38d2f500b3546edda5d2bce1944379
-DIST gopkg.in%2Fyaml.v2%2F@v%2Fv2.3.0.zip 80765 BLAKE2B d6d8bfba5082aabb1a247add43b21ffa058b58fef60e8efbf973b724273cda2496ef0c9b226ad14bfea17f141f077d3bd98dfe3dbcf3c2938fd64570abd662b2 SHA512 2a89b2bce856cc11f3b71edec9e538048acf07f6aabbe27236b663b284c086c5862f086734e58727e9db8912a113fea51f72dad1a45a9e85860764f9c27b19d2
 DIST gopkg.in%2Fyaml.v3%2F@v%2Fv3.0.0-20200121175148-a6ecf24a6d71.mod 95 BLAKE2B fbb87f0644ec9da5d4386358d23cdb15b0d23e8212e712f16f338455a3a0ad19fbfd63e92c955c359237ddfa8bb76d6d08280eead24d321668431891eca1e8ab SHA512 307ca9123efc577ca04828996ee9d8edbb51794ccb4b8d9f169ba689e7276aa5f6ae106a04b22b7fab853ffacfebcbf74468b64eaefd57445864c1fbc77fad9d
 DIST gopkg.in%2Fyaml.v3%2F@v%2Fv3.0.0-20200313102051-9f266ea9e77c.mod 95 BLAKE2B fbb87f0644ec9da5d4386358d23cdb15b0d23e8212e712f16f338455a3a0ad19fbfd63e92c955c359237ddfa8bb76d6d08280eead24d321668431891eca1e8ab SHA512 307ca9123efc577ca04828996ee9d8edbb51794ccb4b8d9f169ba689e7276aa5f6ae106a04b22b7fab853ffacfebcbf74468b64eaefd57445864c1fbc77fad9d
-DIST gopkg.in%2Fyaml.v3%2F@v%2Fv3.0.0-20200615113413-eeeca48fe776.mod 95 BLAKE2B fbb87f0644ec9da5d4386358d23cdb15b0d23e8212e712f16f338455a3a0ad19fbfd63e92c955c359237ddfa8bb76d6d08280eead24d321668431891eca1e8ab SHA512 307ca9123efc577ca04828996ee9d8edbb51794ccb4b8d9f169ba689e7276aa5f6ae106a04b22b7fab853ffacfebcbf74468b64eaefd57445864c1fbc77fad9d
-DIST gopkg.in%2Fyaml.v3%2F@v%2Fv3.0.0-20200615113413-eeeca48fe776.zip 103453 BLAKE2B 493d6289e171d84dded89f11aa89da42aefb6510e1b0a5a2e3a9223b31a6291af42c65b720246e9d632fed7e8a2868a2cd2e4f3e3f4acee99cff535aca0b6899 SHA512 7870ff82dad193b5087a735324705dc4ae3e29e96eff29ecd5b5e7ec38369aebc87151bb806dbd11b023dada74ff0c9fb4b7f0ed36d8f893f1c715909cb2b994
 DIST gopkg.in%2Fyaml.v3%2F@v%2Fv3.0.0-20210107192922-496545a6307b.mod 95 BLAKE2B fbb87f0644ec9da5d4386358d23cdb15b0d23e8212e712f16f338455a3a0ad19fbfd63e92c955c359237ddfa8bb76d6d08280eead24d321668431891eca1e8ab SHA512 307ca9123efc577ca04828996ee9d8edbb51794ccb4b8d9f169ba689e7276aa5f6ae106a04b22b7fab853ffacfebcbf74468b64eaefd57445864c1fbc77fad9d
 DIST gopkg.in%2Fyaml.v3%2F@v%2Fv3.0.0-20210107192922-496545a6307b.zip 105245 BLAKE2B f0bcfd9d097905364d9c2b032b92a8aad64b63e0942eb864759b156eb97ac58769fbc035acf4ba57bd55db1b6596499ddc6d36e6d2e5cc584c2a465256ca3a73 SHA512 f9c0400f1f5590d7185ae3fdac7adf1787a5f5198e52ebd02841b7df5113c5e34de6a66fa01b2f5735be4b21190dffb46e9d8b084ad5c00ebd99599a39ff73db
 DIST gotest.tools%2F@v%2Fv2.2.0+incompatible.mod 20 BLAKE2B 25d11078b1caa5a705f3ae32f28d155683dfe0109d96531b1fc20e632acdc2f8429395975e6509f5dc78bc042b5e70e90fa2daa9790c39eb3422cbc189fb21af SHA512 5a73bc54777766425ba833348d2986408baedcaff86acf1648384bbcb31e302b0b0de38e1a92d53083551e35c62f375262497c0d5a37c9fb39824ae68fe8113e
@@ -596,6 +493,6 @@ DIST rsc.io%2Fqr%2F@v%2Fv0.2.0.mod 17 BLAKE2B c37ef4c1d8928ffad995abcb6f2ac59d2a
 DIST rsc.io%2Fqr%2F@v%2Fv0.2.0.zip 23674 BLAKE2B 86c738bd62b56b84e8029cb3a963f882a8a735dba19566bacf07dae0a146d0a66917153999995c3f0a9fb9698d874f25c6207b8a90d8e12e82cfecbef343a9bd SHA512 169f87e5c57dbcc4d1a289481faca3c3889f0fe019f797374b86e001a3f2893db3e8180be2651c7cb541d30822fe357c7401d75f15303ee8f549227c9b3ec485
 DIST rsc.io%2Fquote%2Fv3%2F@v%2Fv3.1.0.mod 55 BLAKE2B f1f0ba35f0ffd200ed37c06b2025c1fd436e3fd857bd525b9295c0cbcade7e1f037e3f566124a7ef428384d50525426f0d40468c967e39bac6057174710e2566 SHA512 e6357ddd7d09692c60e59e6cb80469ade8284052cdd3ea520ec4dbcb42c1cabe045c599e43cce94bec022bd82e87a554ecac42f8c917cf2ff44daff9c1a147d5
 DIST rsc.io%2Fsampler%2F@v%2Fv1.3.0.mod 88 BLAKE2B c2ac3c9619e396db470c9951dfc11cdacccd56ae09b3b353015ee7e5fbb023df288dbf48d81b44c309241d1ea89a2e0ee42ee1d17e536fcfa531aaee0e651ab7 SHA512 2137507eb25fbae419605e0cd6bca4cfa584110eebc276cd759a4dcb6f97e52928e5b2d9b276e76bcabcec3bbfc2c42f97fa29f54695d27fb00f9423e1638863
-EBUILD gopass-1.11.0.ebuild 11354 BLAKE2B a00b9b89ae18bdd0bf459f2c76098e020e574b75cf1af450bfceca27a3b87c1f37d870a821ac2c41d4106b7fa74f254595b0057e2a5a00004736ccffd4e8b0de SHA512 e0901f82001fa86ebc168df2442e2810cf772a14737d7e15f8636d2b0a8a990ca1f4472f619cd46c227c5c681ec28ea236ae27a5a9f8f0a33557f8cdc947765d
-EBUILD gopass-1.12.6.ebuild 27433 BLAKE2B 8acc943a8b08164e17b17a1107a775159625e900d9764f7dd673f7919ddb3c50e2d3487f8e62c059a065154b9d488c410485e7b406f2d3bfbc149c4226fb309f SHA512 c77cbd2827940dadd20d2bd9fca1aa9ed770076df14c3e41fdd80c45cbb2d83feb89b0810a9b229d2d10cf112d3235ef08c4db37818f1ceb4723c4e53c442620
+EBUILD gopass-1.12.6.ebuild 27465 BLAKE2B 6a397f371df40e7fc9062d8bd89912e9ae52e17a662c73624387dae3ab2392c5794e12adb83ccbdea1f562d50ce59e4040d19756f4c1e7bcdc194c5fd332b403 SHA512 611f2bcd3980eea98f7b3ffcb4c95e9354ff7d1da93825781edf7d4c9a31fc3e191ac94c201b2f7dfd000029ecfbb499f44930931c969a7b45d7762080710b96
+EBUILD gopass-1.12.7.ebuild 27638 BLAKE2B 9e8130fee09e21772be3984286f54413e3a03237a6b8cb4879dcf9a3522ed04a0ce0aaca41e6f1585351d638ee9357b0b5c1ebd93b995f67c0b455b99eeb15e2 SHA512 c2d567a0777062189358af4b37ea551c22c1e9ce21c8c4f2388f7d98d36c8bdd993869f755efcd46aafb94a2bffe1feb89e03ed44018054abd9c74e3150ce6a6
 MISC metadata.xml 327 BLAKE2B 79a9ad163a64e1c3023126971905aa819d01990fb031642f03ed1aa42d35986c83896a437055eceed0f4b0dbf458d62bcf33719982f0ec8596a1b81e02bec703 SHA512 7b0759b8822ccd5b1edb8080779ddd215b4e54f35af831498627ab0960d0d435729becf4f217e082ac34be71c71688c426c93b6d10ff993aa0fa8f8566de671f
diff --git a/app-admin/gopass/gopass-1.11.0.ebuild b/app-admin/gopass/gopass-1.11.0.ebuild
deleted file mode 100644
index c4ce36f69c11..000000000000
--- a/app-admin/gopass/gopass-1.11.0.ebuild
+++ /dev/null
@@ -1,242 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit go-module
-
-EGO_SUM=(
-	"filippo.io/age v1.0.0-beta4"
-	"filippo.io/age v1.0.0-beta4/go.mod"
-	"github.com/BurntSushi/toml v0.3.1"
-	"github.com/BurntSushi/toml v0.3.1/go.mod"
-	"github.com/atotto/clipboard v0.1.2"
-	"github.com/atotto/clipboard v0.1.2/go.mod"
-	"github.com/blang/semver v0.0.0-20190414182527-1a9109f8c4a1"
-	"github.com/blang/semver v0.0.0-20190414182527-1a9109f8c4a1/go.mod"
-	"github.com/caspr-io/yamlpath v0.0.0-20200722075116-502e8d113a9b"
-	"github.com/caspr-io/yamlpath v0.0.0-20200722075116-502e8d113a9b/go.mod"
-	"github.com/cenkalti/backoff v2.2.1+incompatible"
-	"github.com/cenkalti/backoff v2.2.1+incompatible/go.mod"
-	"github.com/cheggaaa/pb v1.0.29/go.mod"
-	"github.com/chzyer/logex v1.1.10"
-	"github.com/chzyer/logex v1.1.10/go.mod"
-	"github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e"
-	"github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e/go.mod"
-	"github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1"
-	"github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1/go.mod"
-	"github.com/cpuguy83/go-md2man/v2 v2.0.0-20190314233015-f79a8a8ca69d"
-	"github.com/cpuguy83/go-md2man/v2 v2.0.0-20190314233015-f79a8a8ca69d/go.mod"
-	"github.com/cpuguy83/go-md2man/v2 v2.0.0"
-	"github.com/cpuguy83/go-md2man/v2 v2.0.0/go.mod"
-	"github.com/creack/pty v1.1.9/go.mod"
-	"github.com/davecgh/go-spew v1.1.0/go.mod"
-	"github.com/davecgh/go-spew v1.1.1"
-	"github.com/davecgh/go-spew v1.1.1/go.mod"
-	"github.com/dominikschulz/github-releases v0.0.3"
-	"github.com/dominikschulz/github-releases v0.0.3/go.mod"
-	"github.com/dustin/go-humanize v1.0.0/go.mod"
-	"github.com/fatih/color v1.9.0"
-	"github.com/fatih/color v1.9.0/go.mod"
-	"github.com/godbus/dbus v0.0.0-20190623212516-8a1682060722"
-	"github.com/godbus/dbus v0.0.0-20190623212516-8a1682060722/go.mod"
-	"github.com/gokyle/twofactor v1.0.1"
-	"github.com/gokyle/twofactor v1.0.1/go.mod"
-	"github.com/google/go-cmp v0.3.0"
-	"github.com/google/go-cmp v0.3.0/go.mod"
-	"github.com/google/go-cmp v0.5.2"
-	"github.com/google/go-cmp v0.5.2/go.mod"
-	"github.com/google/go-github v17.0.0+incompatible"
-	"github.com/google/go-github v17.0.0+incompatible/go.mod"
-	"github.com/google/go-querystring v1.0.0"
-	"github.com/google/go-querystring v1.0.0/go.mod"
-	"github.com/google/gofuzz v1.0.0/go.mod"
-	"github.com/google/uuid v1.1.1"
-	"github.com/google/uuid v1.1.1/go.mod"
-	"github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1"
-	"github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1/go.mod"
-	"github.com/hashicorp/errwrap v1.0.0"
-	"github.com/hashicorp/errwrap v1.0.0/go.mod"
-	"github.com/hashicorp/go-multierror v1.1.0"
-	"github.com/hashicorp/go-multierror v1.1.0/go.mod"
-	"github.com/hashicorp/golang-lru v0.5.4"
-	"github.com/hashicorp/golang-lru v0.5.4/go.mod"
-	"github.com/jsimonetti/pwscheme v0.0.0-20160922125227-76804708ecad"
-	"github.com/jsimonetti/pwscheme v0.0.0-20160922125227-76804708ecad/go.mod"
-	"github.com/json-iterator/go v1.1.10"
-	"github.com/json-iterator/go v1.1.10/go.mod"
-	"github.com/jtolds/gls v4.20.0+incompatible"
-	"github.com/jtolds/gls v4.20.0+incompatible/go.mod"
-	"github.com/kballard/go-shellquote v0.0.0-20180428030007-95032a82bc51"
-	"github.com/kballard/go-shellquote v0.0.0-20180428030007-95032a82bc51/go.mod"
-	"github.com/klauspost/cpuid v1.2.3"
-	"github.com/klauspost/cpuid v1.2.3/go.mod"
-	"github.com/klauspost/cpuid v1.3.1"
-	"github.com/klauspost/cpuid v1.3.1/go.mod"
-	"github.com/kr/pretty v0.1.0/go.mod"
-	"github.com/kr/pty v1.1.1/go.mod"
-	"github.com/kr/text v0.1.0"
-	"github.com/kr/text v0.1.0/go.mod"
-	"github.com/kr/text v0.2.0"
-	"github.com/kr/text v0.2.0/go.mod"
-	"github.com/martinhoefling/goxkcdpwgen v0.0.0-20190331205820-7dc3d102eca3"
-	"github.com/martinhoefling/goxkcdpwgen v0.0.0-20190331205820-7dc3d102eca3/go.mod"
-	"github.com/mattn/go-colorable v0.1.4"
-	"github.com/mattn/go-colorable v0.1.4/go.mod"
-	"github.com/mattn/go-colorable v0.1.7"
-	"github.com/mattn/go-colorable v0.1.7/go.mod"
-	"github.com/mattn/go-isatty v0.0.8"
-	"github.com/mattn/go-isatty v0.0.8/go.mod"
-	"github.com/mattn/go-isatty v0.0.11"
-	"github.com/mattn/go-isatty v0.0.11/go.mod"
-	"github.com/mattn/go-isatty v0.0.12"
-	"github.com/mattn/go-isatty v0.0.12/go.mod"
-	"github.com/mattn/go-runewidth v0.0.4/go.mod"
-	"github.com/minio/md5-simd v1.1.0"
-	"github.com/minio/md5-simd v1.1.0/go.mod"
-	"github.com/minio/minio-go/v7 v7.0.7"
-	"github.com/minio/minio-go/v7 v7.0.7/go.mod"
-	"github.com/minio/sha256-simd v0.1.1"
-	"github.com/minio/sha256-simd v0.1.1/go.mod"
-	"github.com/minio/sio v0.2.1/go.mod"
-	"github.com/mitchellh/go-homedir v1.1.0"
-	"github.com/mitchellh/go-homedir v1.1.0/go.mod"
-	"github.com/mitchellh/go-ps v1.0.0"
-	"github.com/mitchellh/go-ps v1.0.0/go.mod"
-	"github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421"
-	"github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod"
-	"github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd"
-	"github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod"
-	"github.com/modern-go/reflect2 v0.0.0-20180701023420-4b7aa43c6742"
-	"github.com/modern-go/reflect2 v0.0.0-20180701023420-4b7aa43c6742/go.mod"
-	"github.com/modern-go/reflect2 v1.0.1"
-	"github.com/modern-go/reflect2 v1.0.1/go.mod"
-	"github.com/muesli/crunchy v0.4.0"
-	"github.com/muesli/crunchy v0.4.0/go.mod"
-	"github.com/nbutton23/zxcvbn-go v0.0.0-20180912185939-ae427f1e4c1d"
-	"github.com/nbutton23/zxcvbn-go v0.0.0-20180912185939-ae427f1e4c1d/go.mod"
-	"github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e"
-	"github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e/go.mod"
-	"github.com/pkg/errors v0.8.1/go.mod"
-	"github.com/pkg/errors v0.9.1"
-	"github.com/pkg/errors v0.9.1/go.mod"
-	"github.com/pmezard/go-difflib v1.0.0"
-	"github.com/pmezard/go-difflib v1.0.0/go.mod"
-	"github.com/rs/xid v1.2.1"
-	"github.com/rs/xid v1.2.1/go.mod"
-	"github.com/russross/blackfriday/v2 v2.0.1"
-	"github.com/russross/blackfriday/v2 v2.0.1/go.mod"
-	"github.com/schollz/closestmatch v0.0.0-20190308193919-1fbe626be92e"
-	"github.com/schollz/closestmatch v0.0.0-20190308193919-1fbe626be92e/go.mod"
-	"github.com/sergi/go-diff v1.1.0"
-	"github.com/sergi/go-diff v1.1.0/go.mod"
-	"github.com/shurcooL/sanitized_anchor_name v1.0.0"
-	"github.com/shurcooL/sanitized_anchor_name v1.0.0/go.mod"
-	"github.com/sirupsen/logrus v1.7.0/go.mod"
-	"github.com/skip2/go-qrcode v0.0.0-20200617195104-da1b6568686e"
-	"github.com/skip2/go-qrcode v0.0.0-20200617195104-da1b6568686e/go.mod"
-	"github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d"
-	"github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d/go.mod"
-	"github.com/smartystreets/assertions v1.0.0"
-	"github.com/smartystreets/assertions v1.0.0/go.mod"
-	"github.com/smartystreets/goconvey v0.0.0-20190330032615-68dc04aab96a"
-	"github.com/smartystreets/goconvey v0.0.0-20190330032615-68dc04aab96a/go.mod"
-	"github.com/smartystreets/goconvey v1.6.4"
-	"github.com/smartystreets/goconvey v1.6.4/go.mod"
-	"github.com/spf13/pflag v1.0.3/go.mod"
-	"github.com/stretchr/objx v0.1.0/go.mod"
-	"github.com/stretchr/testify v1.2.2/go.mod"
-	"github.com/stretchr/testify v1.3.0/go.mod"
-	"github.com/stretchr/testify v1.4.0/go.mod"
-	"github.com/stretchr/testify v1.6.1"
-	"github.com/stretchr/testify v1.6.1/go.mod"
-	"github.com/urfave/cli/v2 v2.2.0"
-	"github.com/urfave/cli/v2 v2.2.0/go.mod"
-	"github.com/xrash/smetrics v0.0.0-20170218160415-a3153f7040e9"
-	"github.com/xrash/smetrics v0.0.0-20170218160415-a3153f7040e9/go.mod"
-	"github.com/xrash/smetrics v0.0.0-20200730060457-89a2a8a1fb0b"
-	"github.com/xrash/smetrics v0.0.0-20200730060457-89a2a8a1fb0b/go.mod"
-	"golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod"
-	"golang.org/x/crypto v0.0.0-20190513172903-22d7a77e9e5f/go.mod"
-	"golang.org/x/crypto v0.0.0-20200323165209-0ec3e9974c59/go.mod"
-	"golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod"
-	"golang.org/x/crypto v0.0.0-20200709230013-948cd5f35899/go.mod"
-	"golang.org/x/crypto v0.0.0-20200930160638-afb6bcd081ae"
-	"golang.org/x/crypto v0.0.0-20200930160638-afb6bcd081ae/go.mod"
-	"golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod"
-	"golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod"
-	"golang.org/x/net v0.0.0-20200707034311-ab3426394381/go.mod"
-	"golang.org/x/net v0.0.0-20201021035429-f5854403a974"
-	"golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod"
-	"golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod"
-	"golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod"
-	"golang.org/x/sys v0.0.0-20190222072716-a9d3bda3a223/go.mod"
-	"golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod"
-	"golang.org/x/sys v0.0.0-20191026070338-33540a1f6037/go.mod"
-	"golang.org/x/sys v0.0.0-20200116001909-b77594299b42/go.mod"
-	"golang.org/x/sys v0.0.0-20200223170610-d5e6a3e2c0ae/go.mod"
-	"golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd/go.mod"
-	"golang.org/x/sys v0.0.0-20200625212154-ddb9806d33ae/go.mod"
-	"golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f"
-	"golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod"
-	"golang.org/x/sys v0.0.0-20201024232916-9f70ab9862d5"
-	"golang.org/x/sys v0.0.0-20201024232916-9f70ab9862d5/go.mod"
-	"golang.org/x/text v0.3.0"
-	"golang.org/x/text v0.3.0/go.mod"
-	"golang.org/x/text v0.3.3"
-	"golang.org/x/text v0.3.3/go.mod"
-	"golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod"
-	"golang.org/x/tools v0.0.0-20190328211700-ab21143f2384/go.mod"
-	"golang.org/x/tools v0.0.0-20190624222133-a101b041ded4"
-	"golang.org/x/tools v0.0.0-20190624222133-a101b041ded4/go.mod"
-	"golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543"
-	"golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod"
-	"golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1"
-	"golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod"
-	"gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod"
-	"gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod"
-	"gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod"
-	"gopkg.in/check.v1 v1.0.0-20200227125254-8fa46927fb4f"
-	"gopkg.in/check.v1 v1.0.0-20200227125254-8fa46927fb4f/go.mod"
-	"gopkg.in/ini.v1 v1.57.0/go.mod"
-	"gopkg.in/ini.v1 v1.60.1"
-	"gopkg.in/ini.v1 v1.60.1/go.mod"
-	"gopkg.in/yaml.v2 v2.2.2"
-	"gopkg.in/yaml.v2 v2.2.2/go.mod"
-	"gopkg.in/yaml.v2 v2.2.4/go.mod"
-	"gopkg.in/yaml.v2 v2.2.8/go.mod"
-	"gopkg.in/yaml.v2 v2.3.0"
-	"gopkg.in/yaml.v2 v2.3.0/go.mod"
-	"gopkg.in/yaml.v3 v3.0.0-20200121175148-a6ecf24a6d71/go.mod"
-	"gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod"
-	"gopkg.in/yaml.v3 v3.0.0-20200615113413-eeeca48fe776"
-	"gopkg.in/yaml.v3 v3.0.0-20200615113413-eeeca48fe776/go.mod"
-	"gotest.tools v2.2.0+incompatible"
-	"gotest.tools v2.2.0+incompatible/go.mod"
-	"gotest.tools/v3 v3.0.2"
-	"gotest.tools/v3 v3.0.2/go.mod"
-	"rsc.io/qr v0.2.0"
-	"rsc.io/qr v0.2.0/go.mod"
-)
-
-go-module_set_globals
-
-DESCRIPTION="a simple but powerful password manager for the terminal"
-HOMEPAGE="https://www.gopass.pw/"
-SRC_URI="https://github.com/gopasspw/gopass/archive/v${PV}.tar.gz -> ${P}.tar.gz
-	${EGO_SUM_SRC_URI}"
-
-LICENSE="MIT Apache-2.0 BSD MPL-2.0 BSD-2"
-SLOT="0"
-KEYWORDS="amd64 ~ppc64 x86"
-
-DEPEND=">=dev-lang/go-1.11"
-RDEPEND="
-	dev-vcs/git
-	>=app-crypt/gnupg-2
-"
-
-src_install() {
-	emake install DESTDIR="${ED}/usr"
-	einstalldocs
-}
diff --git a/app-admin/gopass/gopass-1.12.6.ebuild b/app-admin/gopass/gopass-1.12.6.ebuild
index 22a9f6c7727d..86e936ebd30e 100644
--- a/app-admin/gopass/gopass-1.12.6.ebuild
+++ b/app-admin/gopass/gopass-1.12.6.ebuild
@@ -500,10 +500,12 @@ go-module_set_globals
 
 LICENSE="MIT Apache-2.0 BSD MPL-2.0 BSD-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~ppc64 ~x86"
 
 RESTRICT="strip test"
 
+QA_PRESTRIPPED="usr/bin/gopass"
+
 DEPEND=">=dev-lang/go-1.16"
 RDEPEND="
 	dev-vcs/git
diff --git a/app-admin/gopass/gopass-1.12.7.ebuild b/app-admin/gopass/gopass-1.12.7.ebuild
new file mode 100644
index 000000000000..d79c2a1ec545
--- /dev/null
+++ b/app-admin/gopass/gopass-1.12.7.ebuild
@@ -0,0 +1,529 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit go-module optfeature
+
+EGO_SUM=(
+	"cloud.google.com/go v0.26.0/go.mod"
+	"cloud.google.com/go v0.34.0/go.mod"
+	"cloud.google.com/go v0.38.0/go.mod"
+	"cloud.google.com/go v0.44.1/go.mod"
+	"cloud.google.com/go v0.44.2/go.mod"
+	"cloud.google.com/go v0.45.1/go.mod"
+	"cloud.google.com/go v0.46.3/go.mod"
+	"cloud.google.com/go v0.50.0/go.mod"
+	"cloud.google.com/go v0.52.0/go.mod"
+	"cloud.google.com/go v0.53.0/go.mod"
+	"cloud.google.com/go v0.54.0/go.mod"
+	"cloud.google.com/go v0.56.0/go.mod"
+	"cloud.google.com/go v0.57.0/go.mod"
+	"cloud.google.com/go v0.62.0/go.mod"
+	"cloud.google.com/go v0.65.0/go.mod"
+	"cloud.google.com/go/bigquery v1.0.1/go.mod"
+	"cloud.google.com/go/bigquery v1.3.0/go.mod"
+	"cloud.google.com/go/bigquery v1.4.0/go.mod"
+	"cloud.google.com/go/bigquery v1.5.0/go.mod"
+	"cloud.google.com/go/bigquery v1.7.0/go.mod"
+	"cloud.google.com/go/bigquery v1.8.0/go.mod"
+	"cloud.google.com/go/datastore v1.0.0/go.mod"
+	"cloud.google.com/go/datastore v1.1.0/go.mod"
+	"cloud.google.com/go/pubsub v1.0.1/go.mod"
+	"cloud.google.com/go/pubsub v1.1.0/go.mod"
+	"cloud.google.com/go/pubsub v1.2.0/go.mod"
+	"cloud.google.com/go/pubsub v1.3.1/go.mod"
+	"cloud.google.com/go/storage v1.0.0/go.mod"
+	"cloud.google.com/go/storage v1.5.0/go.mod"
+	"cloud.google.com/go/storage v1.6.0/go.mod"
+	"cloud.google.com/go/storage v1.8.0/go.mod"
+	"cloud.google.com/go/storage v1.10.0/go.mod"
+	"dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod"
+	"filippo.io/age v1.0.0-rc.3"
+	"filippo.io/age v1.0.0-rc.3/go.mod"
+	"filippo.io/edwards25519 v1.0.0-beta.3"
+	"filippo.io/edwards25519 v1.0.0-beta.3/go.mod"
+	"github.com/BurntSushi/toml v0.3.1/go.mod"
+	"github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod"
+	"github.com/atotto/clipboard v0.1.4"
+	"github.com/atotto/clipboard v0.1.4/go.mod"
+	"github.com/blang/semver/v4 v4.0.0"
+	"github.com/blang/semver/v4 v4.0.0/go.mod"
+	"github.com/caspr-io/yamlpath v0.0.0-20200722075116-502e8d113a9b"
+	"github.com/caspr-io/yamlpath v0.0.0-20200722075116-502e8d113a9b/go.mod"
+	"github.com/cenkalti/backoff v2.2.1+incompatible"
+	"github.com/cenkalti/backoff v2.2.1+incompatible/go.mod"
+	"github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod"
+	"github.com/chzyer/logex v1.1.10"
+	"github.com/chzyer/logex v1.1.10/go.mod"
+	"github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e"
+	"github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e/go.mod"
+	"github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1"
+	"github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1/go.mod"
+	"github.com/client9/misspell v0.3.4/go.mod"
+	"github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod"
+	"github.com/cpuguy83/go-md2man/v2 v2.0.0-20190314233015-f79a8a8ca69d/go.mod"
+	"github.com/cpuguy83/go-md2man/v2 v2.0.0"
+	"github.com/cpuguy83/go-md2man/v2 v2.0.0/go.mod"
+	"github.com/creack/pty v1.1.9/go.mod"
+	"github.com/davecgh/go-spew v1.1.0/go.mod"
+	"github.com/davecgh/go-spew v1.1.1"
+	"github.com/davecgh/go-spew v1.1.1/go.mod"
+	"github.com/envoyproxy/go-control-plane v0.9.0/go.mod"
+	"github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.mod"
+	"github.com/envoyproxy/go-control-plane v0.9.4/go.mod"
+	"github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod"
+	"github.com/fatih/color v1.12.0"
+	"github.com/fatih/color v1.12.0/go.mod"
+	"github.com/go-gl/glfw v0.0.0-20190409004039-e6da0acd62b1/go.mod"
+	"github.com/go-gl/glfw/v3.3/glfw v0.0.0-20191125211704-12ad95a8df72/go.mod"
+	"github.com/go-gl/glfw/v3.3/glfw v0.0.0-20200222043503-6f7a984d4dc4/go.mod"
+	"github.com/godbus/dbus v0.0.0-20190623212516-8a1682060722"
+	"github.com/godbus/dbus v0.0.0-20190623212516-8a1682060722/go.mod"
+	"github.com/gokyle/twofactor v1.0.1"
+	"github.com/gokyle/twofactor v1.0.1/go.mod"
+	"github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod"
+	"github.com/golang/groupcache v0.0.0-20190702054246-869f871628b6/go.mod"
+	"github.com/golang/groupcache v0.0.0-20191227052852-215e87163ea7/go.mod"
+	"github.com/golang/groupcache v0.0.0-20200121045136-8c9f03a8e57e/go.mod"
+	"github.com/golang/mock v1.1.1/go.mod"
+	"github.com/golang/mock v1.2.0/go.mod"
+	"github.com/golang/mock v1.3.1/go.mod"
+	"github.com/golang/mock v1.4.0/go.mod"
+	"github.com/golang/mock v1.4.1/go.mod"
+	"github.com/golang/mock v1.4.3/go.mod"
+	"github.com/golang/mock v1.4.4/go.mod"
+	"github.com/golang/protobuf v1.2.0/go.mod"
+	"github.com/golang/protobuf v1.3.1/go.mod"
+	"github.com/golang/protobuf v1.3.2/go.mod"
+	"github.com/golang/protobuf v1.3.3/go.mod"
+	"github.com/golang/protobuf v1.3.4/go.mod"
+	"github.com/golang/protobuf v1.3.5/go.mod"
+	"github.com/golang/protobuf v1.4.0-rc.1/go.mod"
+	"github.com/golang/protobuf v1.4.0-rc.1.0.20200221234624-67d41d38c208/go.mod"
+	"github.com/golang/protobuf v1.4.0-rc.2/go.mod"
+	"github.com/golang/protobuf v1.4.0-rc.4.0.20200313231945-b860323f09d0/go.mod"
+	"github.com/golang/protobuf v1.4.0/go.mod"
+	"github.com/golang/protobuf v1.4.1/go.mod"
+	"github.com/golang/protobuf v1.4.2/go.mod"
+	"github.com/golang/protobuf v1.5.0/go.mod"
+	"github.com/golang/protobuf v1.5.2"
+	"github.com/golang/protobuf v1.5.2/go.mod"
+	"github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c/go.mod"
+	"github.com/google/btree v1.0.0/go.mod"
+	"github.com/google/go-cmp v0.2.0/go.mod"
+	"github.com/google/go-cmp v0.3.0/go.mod"
+	"github.com/google/go-cmp v0.3.1/go.mod"
+	"github.com/google/go-cmp v0.4.0/go.mod"
+	"github.com/google/go-cmp v0.4.1/go.mod"
+	"github.com/google/go-cmp v0.5.0/go.mod"
+	"github.com/google/go-cmp v0.5.1/go.mod"
+	"github.com/google/go-cmp v0.5.2/go.mod"
+	"github.com/google/go-cmp v0.5.5/go.mod"
+	"github.com/google/go-cmp v0.5.6"
+	"github.com/google/go-cmp v0.5.6/go.mod"
+	"github.com/google/go-github v17.0.0+incompatible"
+	"github.com/google/go-github v17.0.0+incompatible/go.mod"
+	"github.com/google/go-github/v33 v33.0.0"
+	"github.com/google/go-github/v33 v33.0.0/go.mod"
+	"github.com/google/go-querystring v1.0.0/go.mod"
+	"github.com/google/go-querystring v1.1.0"
+	"github.com/google/go-querystring v1.1.0/go.mod"
+	"github.com/google/martian v2.1.0+incompatible/go.mod"
+	"github.com/google/martian/v3 v3.0.0/go.mod"
+	"github.com/google/pprof v0.0.0-20181206194817-3ea8567a2e57/go.mod"
+	"github.com/google/pprof v0.0.0-20190515194954-54271f7e092f/go.mod"
+	"github.com/google/pprof v0.0.0-20191218002539-d4f498aebedc/go.mod"
+	"github.com/google/pprof v0.0.0-20200212024743-f11f1df84d12/go.mod"
+	"github.com/google/pprof v0.0.0-20200229191704-1ebb73c60ed3/go.mod"
+	"github.com/google/pprof v0.0.0-20200430221834-fc25d7d30c6d/go.mod"
+	"github.com/google/pprof v0.0.0-20200708004538-1a94d8640e99/go.mod"
+	"github.com/google/renameio v0.1.0/go.mod"
+	"github.com/googleapis/gax-go/v2 v2.0.4/go.mod"
+	"github.com/googleapis/gax-go/v2 v2.0.5/go.mod"
+	"github.com/gopasspw/pinentry v0.0.2"
+	"github.com/gopasspw/pinentry v0.0.2/go.mod"
+	"github.com/hashicorp/errwrap v1.0.0/go.mod"
+	"github.com/hashicorp/errwrap v1.1.0"
+	"github.com/hashicorp/errwrap v1.1.0/go.mod"
+	"github.com/hashicorp/go-multierror v1.1.1"
+	"github.com/hashicorp/go-multierror v1.1.1/go.mod"
+	"github.com/hashicorp/golang-lru v0.5.0/go.mod"
+	"github.com/hashicorp/golang-lru v0.5.1/go.mod"
+	"github.com/hashicorp/golang-lru v0.5.4"
+	"github.com/hashicorp/golang-lru v0.5.4/go.mod"
+	"github.com/ianlancetaylor/demangle v0.0.0-20181102032728-5e5cf60278f6/go.mod"
+	"github.com/jsimonetti/pwscheme v0.0.0-20160922125227-76804708ecad"
+	"github.com/jsimonetti/pwscheme v0.0.0-20160922125227-76804708ecad/go.mod"
+	"github.com/jstemmer/go-junit-report v0.0.0-20190106144839-af01ea7f8024/go.mod"
+	"github.com/jstemmer/go-junit-report v0.9.1/go.mod"
+	"github.com/kballard/go-shellquote v0.0.0-20180428030007-95032a82bc51"
+	"github.com/kballard/go-shellquote v0.0.0-20180428030007-95032a82bc51/go.mod"
+	"github.com/kisielk/gotool v1.0.0/go.mod"
+	"github.com/kr/pretty v0.1.0/go.mod"
+	"github.com/kr/pty v1.1.1/go.mod"
+	"github.com/kr/text v0.1.0/go.mod"
+	"github.com/kr/text v0.2.0"
+	"github.com/kr/text v0.2.0/go.mod"
+	"github.com/martinhoefling/goxkcdpwgen v0.0.0-20190331205820-7dc3d102eca3"
+	"github.com/martinhoefling/goxkcdpwgen v0.0.0-20190331205820-7dc3d102eca3/go.mod"
+	"github.com/mattn/go-colorable v0.1.8"
+	"github.com/mattn/go-colorable v0.1.8/go.mod"
+	"github.com/mattn/go-isatty v0.0.12/go.mod"
+	"github.com/mattn/go-isatty v0.0.13"
+	"github.com/mattn/go-isatty v0.0.13/go.mod"
+	"github.com/mitchellh/go-homedir v1.1.0"
+	"github.com/mitchellh/go-homedir v1.1.0/go.mod"
+	"github.com/mitchellh/go-ps v1.0.0"
+	"github.com/mitchellh/go-ps v1.0.0/go.mod"
+	"github.com/muesli/crunchy v0.4.0"
+	"github.com/muesli/crunchy v0.4.0/go.mod"
+	"github.com/nbutton23/zxcvbn-go v0.0.0-20210217022336-fa2cb2858354"
+	"github.com/nbutton23/zxcvbn-go v0.0.0-20210217022336-fa2cb2858354/go.mod"
+	"github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e"
+	"github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e/go.mod"
+	"github.com/pkg/errors v0.8.1/go.mod"
+	"github.com/pkg/errors v0.9.1"
+	"github.com/pkg/errors v0.9.1/go.mod"
+	"github.com/pmezard/go-difflib v1.0.0"
+	"github.com/pmezard/go-difflib v1.0.0/go.mod"
+	"github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod"
+	"github.com/rogpeppe/go-internal v1.3.0/go.mod"
+	"github.com/russross/blackfriday/v2 v2.0.1/go.mod"
+	"github.com/russross/blackfriday/v2 v2.1.0"
+	"github.com/russross/blackfriday/v2 v2.1.0/go.mod"
+	"github.com/schollz/closestmatch v0.0.0-20190308193919-1fbe626be92e"
+	"github.com/schollz/closestmatch v0.0.0-20190308193919-1fbe626be92e/go.mod"
+	"github.com/shurcooL/sanitized_anchor_name v1.0.0/go.mod"
+	"github.com/skip2/go-qrcode v0.0.0-20200617195104-da1b6568686e"
+	"github.com/skip2/go-qrcode v0.0.0-20200617195104-da1b6568686e/go.mod"
+	"github.com/spf13/pflag v1.0.3/go.mod"
+	"github.com/stretchr/objx v0.1.0/go.mod"
+	"github.com/stretchr/testify v1.1.4/go.mod"
+	"github.com/stretchr/testify v1.4.0/go.mod"
+	"github.com/stretchr/testify v1.7.0"
+	"github.com/stretchr/testify v1.7.0/go.mod"
+	"github.com/urfave/cli/v2 v2.3.0"
+	"github.com/urfave/cli/v2 v2.3.0/go.mod"
+	"github.com/xrash/smetrics v0.0.0-20170218160415-a3153f7040e9/go.mod"
+	"github.com/xrash/smetrics v0.0.0-20201216005158-039620a65673"
+	"github.com/xrash/smetrics v0.0.0-20201216005158-039620a65673/go.mod"
+	"github.com/yuin/goldmark v1.1.25/go.mod"
+	"github.com/yuin/goldmark v1.1.27/go.mod"
+	"github.com/yuin/goldmark v1.1.32/go.mod"
+	"go.opencensus.io v0.21.0/go.mod"
+	"go.opencensus.io v0.22.0/go.mod"
+	"go.opencensus.io v0.22.2/go.mod"
+	"go.opencensus.io v0.22.3/go.mod"
+	"go.opencensus.io v0.22.4/go.mod"
+	"golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod"
+	"golang.org/x/crypto v0.0.0-20190510104115-cbcb75029529/go.mod"
+	"golang.org/x/crypto v0.0.0-20190605123033-f99c8df09eb5/go.mod"
+	"golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod"
+	"golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod"
+	"golang.org/x/crypto v0.0.0-20201221181555-eec23a3978ad/go.mod"
+	"golang.org/x/crypto v0.0.0-20210415154028-4f45737414dc"
+	"golang.org/x/crypto v0.0.0-20210415154028-4f45737414dc/go.mod"
+	"golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod"
+	"golang.org/x/exp v0.0.0-20190306152737-a1d7652674e8/go.mod"
+	"golang.org/x/exp v0.0.0-20190510132918-efd6b22b2522/go.mod"
+	"golang.org/x/exp v0.0.0-20190829153037-c13cbed26979/go.mod"
+	"golang.org/x/exp v0.0.0-20191030013958-a1ab85dbe136/go.mod"
+	"golang.org/x/exp v0.0.0-20191129062945-2f5052295587/go.mod"
+	"golang.org/x/exp v0.0.0-20191227195350-da58074b4299/go.mod"
+	"golang.org/x/exp v0.0.0-20200119233911-0405dc783f0a/go.mod"
+	"golang.org/x/exp v0.0.0-20200207192155-f17229e696bd/go.mod"
+	"golang.org/x/exp v0.0.0-20200224162631-6cc2880d07d6/go.mod"
+	"golang.org/x/image v0.0.0-20190227222117-0694c2d4d067/go.mod"
+	"golang.org/x/image v0.0.0-20190802002840-cff245a6509b/go.mod"
+	"golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod"
+	"golang.org/x/lint v0.0.0-20190227174305-5b3e6a55c961/go.mod"
+	"golang.org/x/lint v0.0.0-20190301231843-5614ed5bae6f/go.mod"
+	"golang.org/x/lint v0.0.0-20190313153728-d0100b6bd8b3/go.mod"
+	"golang.org/x/lint v0.0.0-20190409202823-959b441ac422/go.mod"
+	"golang.org/x/lint v0.0.0-20190909230951-414d861bb4ac/go.mod"
+	"golang.org/x/lint v0.0.0-20190930215403-16217165b5de/go.mod"
+	"golang.org/x/lint v0.0.0-20191125180803-fdd1cda4f05f/go.mod"
+	"golang.org/x/lint v0.0.0-20200130185559-910be7a94367/go.mod"
+	"golang.org/x/lint v0.0.0-20200302205851-738671d3881b/go.mod"
+	"golang.org/x/mobile v0.0.0-20190312151609-d3739f865fa6/go.mod"
+	"golang.org/x/mobile v0.0.0-20190719004257-d2bd2a29d028/go.mod"
+	"golang.org/x/mod v0.0.0-20190513183733-4bf6d317e70e/go.mod"
+	"golang.org/x/mod v0.1.0/go.mod"
+	"golang.org/x/mod v0.1.1-0.20191105210325-c90efee705ee/go.mod"
+	"golang.org/x/mod v0.1.1-0.20191107180719-034126e5016b/go.mod"
+	"golang.org/x/mod v0.2.0/go.mod"
+	"golang.org/x/mod v0.3.0/go.mod"
+	"golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod"
+	"golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod"
+	"golang.org/x/net v0.0.0-20190108225652-1e06a53dbb7e/go.mod"
+	"golang.org/x/net v0.0.0-20190213061140-3a22650c66bd/go.mod"
+	"golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod"
+	"golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod"
+	"golang.org/x/net v0.0.0-20190501004415-9ce7a6920f09/go.mod"
+	"golang.org/x/net v0.0.0-20190503192946-f4e77d36d62c/go.mod"
+	"golang.org/x/net v0.0.0-20190603091049-60506f45cf65/go.mod"
+	"golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod"
+	"golang.org/x/net v0.0.0-20190628185345-da137c7871d7/go.mod"
+	"golang.org/x/net v0.0.0-20190724013045-ca1201d0de80/go.mod"
+	"golang.org/x/net v0.0.0-20191209160850-c0dbc17a3553/go.mod"
+	"golang.org/x/net v0.0.0-20200114155413-6afb5195e5aa/go.mod"
+	"golang.org/x/net v0.0.0-20200202094626-16171245cfb2/go.mod"
+	"golang.org/x/net v0.0.0-20200222125558-5a598a2470a0/go.mod"
+	"golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod"
+	"golang.org/x/net v0.0.0-20200301022130-244492dfa37a/go.mod"
+	"golang.org/x/net v0.0.0-20200324143707-d3edc9973b7e/go.mod"
+	"golang.org/x/net v0.0.0-20200501053045-e0ff5e5a1de5/go.mod"
+	"golang.org/x/net v0.0.0-20200506145744-7e3656a0809f/go.mod"
+	"golang.org/x/net v0.0.0-20200513185701-a91f0712d120/go.mod"
+	"golang.org/x/net v0.0.0-20200520182314-0ba52f642ac2/go.mod"
+	"golang.org/x/net v0.0.0-20200625001655-4c5254603344/go.mod"
+	"golang.org/x/net v0.0.0-20200707034311-ab3426394381/go.mod"
+	"golang.org/x/net v0.0.0-20200822124328-c89045814202/go.mod"
+	"golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod"
+	"golang.org/x/net v0.0.0-20210415231046-e915ea6b2b7d"
+	"golang.org/x/net v0.0.0-20210415231046-e915ea6b2b7d/go.mod"
+	"golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod"
+	"golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod"
+	"golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod"
+	"golang.org/x/oauth2 v0.0.0-20191202225959-858c2ad4c8b6/go.mod"
+	"golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d/go.mod"
+	"golang.org/x/oauth2 v0.0.0-20210413134643-5e61552d6c78"
+	"golang.org/x/oauth2 v0.0.0-20210413134643-5e61552d6c78/go.mod"
+	"golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod"
+	"golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod"
+	"golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod"
+	"golang.org/x/sync v0.0.0-20190227155943-e225da77a7e6/go.mod"
+	"golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod"
+	"golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod"
+	"golang.org/x/sync v0.0.0-20200317015054-43a5402ce75a/go.mod"
+	"golang.org/x/sync v0.0.0-20200625203802-6e8e738ad208/go.mod"
+	"golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod"
+	"golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod"
+	"golang.org/x/sys v0.0.0-20190312061237-fead79001313/go.mod"
+	"golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod"
+	"golang.org/x/sys v0.0.0-20190502145724-3ef323f4f1fd/go.mod"
+	"golang.org/x/sys v0.0.0-20190507160741-ecd444e8653b/go.mod"
+	"golang.org/x/sys v0.0.0-20190606165138-5da285871e9c/go.mod"
+	"golang.org/x/sys v0.0.0-20190624142023-c5567b49c5d0/go.mod"
+	"golang.org/x/sys v0.0.0-20190726091711-fc99dfbffb4e/go.mod"
+	"golang.org/x/sys v0.0.0-20191001151750-bb3f8db39f24/go.mod"
+	"golang.org/x/sys v0.0.0-20191026070338-33540a1f6037/go.mod"
+	"golang.org/x/sys v0.0.0-20191204072324-ce4227a45e2e/go.mod"
+	"golang.org/x/sys v0.0.0-20191228213918-04cbcbbfeed8/go.mod"
+	"golang.org/x/sys v0.0.0-20200113162924-86b910548bc1/go.mod"
+	"golang.org/x/sys v0.0.0-20200116001909-b77594299b42/go.mod"
+	"golang.org/x/sys v0.0.0-20200122134326-e047566fdf82/go.mod"
+	"golang.org/x/sys v0.0.0-20200202164722-d101bd2416d5/go.mod"
+	"golang.org/x/sys v0.0.0-20200212091648-12a6c2dcc1e4/go.mod"
+	"golang.org/x/sys v0.0.0-20200223170610-d5e6a3e2c0ae/go.mod"
+	"golang.org/x/sys v0.0.0-20200302150141-5c8b2ff67527/go.mod"
+	"golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd/go.mod"
+	"golang.org/x/sys v0.0.0-20200331124033-c3d80250170d/go.mod"
+	"golang.org/x/sys v0.0.0-20200501052902-10377860bb8e/go.mod"
+	"golang.org/x/sys v0.0.0-20200511232937-7e40ca221e25/go.mod"
+	"golang.org/x/sys v0.0.0-20200515095857-1151b9dac4a9/go.mod"
+	"golang.org/x/sys v0.0.0-20200523222454-059865788121/go.mod"
+	"golang.org/x/sys v0.0.0-20200803210538-64077c9b5642/go.mod"
+	"golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod"
+	"golang.org/x/sys v0.0.0-20210330210617-4fbd30eecc44/go.mod"
+	"golang.org/x/sys v0.0.0-20210419170143-37df388d1f33"
+	"golang.org/x/sys v0.0.0-20210419170143-37df388d1f33/go.mod"
+	"golang.org/x/term v0.0.0-20201117132131-f5c789dd3221/go.mod"
+	"golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod"
+	"golang.org/x/term v0.0.0-20210406210042-72f3dc4e9b72"
+	"golang.org/x/term v0.0.0-20210406210042-72f3dc4e9b72/go.mod"
+	"golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod"
+	"golang.org/x/text v0.3.0/go.mod"
+	"golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod"
+	"golang.org/x/text v0.3.2/go.mod"
+	"golang.org/x/text v0.3.3/go.mod"
+	"golang.org/x/text v0.3.6/go.mod"
+	"golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod"
+	"golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod"
+	"golang.org/x/time v0.0.0-20191024005414-555d28b269f0/go.mod"
+	"golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod"
+	"golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod"
+	"golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod"
+	"golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod"
+	"golang.org/x/tools v0.0.0-20190312151545-0bb0c0a6e846/go.mod"
+	"golang.org/x/tools v0.0.0-20190312170243-e65039ee4138/go.mod"
+	"golang.org/x/tools v0.0.0-20190425150028-36563e24a262/go.mod"
+	"golang.org/x/tools v0.0.0-20190506145303-2d16b83fe98c/go.mod"
+	"golang.org/x/tools v0.0.0-20190524140312-2c0ae7006135/go.mod"
+	"golang.org/x/tools v0.0.0-20190606124116-d0a3d012864b/go.mod"
+	"golang.org/x/tools v0.0.0-20190621195816-6e04913cbbac/go.mod"
+	"golang.org/x/tools v0.0.0-20190624222133-a101b041ded4/go.mod"
+	"golang.org/x/tools v0.0.0-20190628153133-6cdbf07be9d0/go.mod"
+	"golang.org/x/tools v0.0.0-20190816200558-6889da9d5479/go.mod"
+	"golang.org/x/tools v0.0.0-20190911174233-4f2ddba30aff/go.mod"
+	"golang.org/x/tools v0.0.0-20191012152004-8de300cfc20a/go.mod"
+	"golang.org/x/tools v0.0.0-20191113191852-77e3bb0ad9e7/go.mod"
+	"golang.org/x/tools v0.0.0-20191115202509-3a792d9c32b2/go.mod"
+	"golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod"
+	"golang.org/x/tools v0.0.0-20191125144606-a911d9008d1f/go.mod"
+	"golang.org/x/tools v0.0.0-20191130070609-6e064ea0cf2d/go.mod"
+	"golang.org/x/tools v0.0.0-20191216173652-a0e659d51361/go.mod"
+	"golang.org/x/tools v0.0.0-20191227053925-7b8e75db28f4/go.mod"
+	"golang.org/x/tools v0.0.0-20200117161641-43d50277825c/go.mod"
+	"golang.org/x/tools v0.0.0-20200122220014-bf1340f18c4a/go.mod"
+	"golang.org/x/tools v0.0.0-20200130002326-2f3ba24bd6e7/go.mod"
+	"golang.org/x/tools v0.0.0-20200204074204-1cc6d1ef6c74/go.mod"
+	"golang.org/x/tools v0.0.0-20200207183749-b753a1ba74fa/go.mod"
+	"golang.org/x/tools v0.0.0-20200212150539-ea181f53ac56/go.mod"
+	"golang.org/x/tools v0.0.0-20200224181240-023911ca70b2/go.mod"
+	"golang.org/x/tools v0.0.0-20200227222343-706bc42d1f0d/go.mod"
+	"golang.org/x/tools v0.0.0-20200304193943-95d2e580d8eb/go.mod"
+	"golang.org/x/tools v0.0.0-20200312045724-11d5b4c81c7d/go.mod"
+	"golang.org/x/tools v0.0.0-20200331025713-a30bf2db82d4/go.mod"
+	"golang.org/x/tools v0.0.0-20200501065659-ab2804fb9c9d/go.mod"
+	"golang.org/x/tools v0.0.0-20200512131952-2bc93b1c0c88/go.mod"
+	"golang.org/x/tools v0.0.0-20200515010526-7d3b6ebf133d/go.mod"
+	"golang.org/x/tools v0.0.0-20200618134242-20370b0cb4b2/go.mod"
+	"golang.org/x/tools v0.0.0-20200729194436-6467de6f59a7/go.mod"
+	"golang.org/x/tools v0.0.0-20200804011535-6c149bb5ef0d/go.mod"
+	"golang.org/x/tools v0.0.0-20200825202427-b303f430e36d/go.mod"
+	"golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod"
+	"golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod"
+	"golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod"
+	"golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1"
+	"golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod"
+	"google.golang.org/api v0.4.0/go.mod"
+	"google.golang.org/api v0.7.0/go.mod"
+	"google.golang.org/api v0.8.0/go.mod"
+	"google.golang.org/api v0.9.0/go.mod"
+	"google.golang.org/api v0.13.0/go.mod"
+	"google.golang.org/api v0.14.0/go.mod"
+	"google.golang.org/api v0.15.0/go.mod"
+	"google.golang.org/api v0.17.0/go.mod"
+	"google.golang.org/api v0.18.0/go.mod"
+	"google.golang.org/api v0.19.0/go.mod"
+	"google.golang.org/api v0.20.0/go.mod"
+	"google.golang.org/api v0.22.0/go.mod"
+	"google.golang.org/api v0.24.0/go.mod"
+	"google.golang.org/api v0.28.0/go.mod"
+	"google.golang.org/api v0.29.0/go.mod"
+	"google.golang.org/api v0.30.0/go.mod"
+	"google.golang.org/appengine v1.1.0/go.mod"
+	"google.golang.org/appengine v1.4.0/go.mod"
+	"google.golang.org/appengine v1.5.0/go.mod"
+	"google.golang.org/appengine v1.6.1/go.mod"
+	"google.golang.org/appengine v1.6.5/go.mod"
+	"google.golang.org/appengine v1.6.6/go.mod"
+	"google.golang.org/appengine v1.6.7"
+	"google.golang.org/appengine v1.6.7/go.mod"
+	"google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod"
+	"google.golang.org/genproto v0.0.0-20190307195333-5fe7a883aa19/go.mod"
+	"google.golang.org/genproto v0.0.0-20190418145605-e7d98fc518a7/go.mod"
+	"google.golang.org/genproto v0.0.0-20190425155659-357c62f0e4bb/go.mod"
+	"google.golang.org/genproto v0.0.0-20190502173448-54afdca5d873/go.mod"
+	"google.golang.org/genproto v0.0.0-20190801165951-fa694d86fc64/go.mod"
+	"google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55/go.mod"
+	"google.golang.org/genproto v0.0.0-20190911173649-1774047e7e51/go.mod"
+	"google.golang.org/genproto v0.0.0-20191108220845-16a3f7862a1a/go.mod"
+	"google.golang.org/genproto v0.0.0-20191115194625-c23dd37a84c9/go.mod"
+	"google.golang.org/genproto v0.0.0-20191216164720-4f79533eabd1/go.mod"
+	"google.golang.org/genproto v0.0.0-20191230161307-f3c370f40bfb/go.mod"
+	"google.golang.org/genproto v0.0.0-20200115191322-ca5a22157cba/go.mod"
+	"google.golang.org/genproto v0.0.0-20200122232147-0452cf42e150/go.mod"
+	"google.golang.org/genproto v0.0.0-20200204135345-fa8e72b47b90/go.mod"
+	"google.golang.org/genproto v0.0.0-20200212174721-66ed5ce911ce/go.mod"
+	"google.golang.org/genproto v0.0.0-20200224152610-e50cd9704f63/go.mod"
+	"google.golang.org/genproto v0.0.0-20200228133532-8c2c7df3a383/go.mod"
+	"google.golang.org/genproto v0.0.0-20200305110556-506484158171/go.mod"
+	"google.golang.org/genproto v0.0.0-20200312145019-da6875a35672/go.mod"
+	"google.golang.org/genproto v0.0.0-20200331122359-1ee6d9798940/go.mod"
+	"google.golang.org/genproto v0.0.0-20200430143042-b979b6f78d84/go.mod"
+	"google.golang.org/genproto v0.0.0-20200511104702-f5ebc3bea380/go.mod"
+	"google.golang.org/genproto v0.0.0-20200515170657-fc4c6c6a6587/go.mod"
+	"google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013/go.mod"
+	"google.golang.org/genproto v0.0.0-20200618031413-b414f8b61790/go.mod"
+	"google.golang.org/genproto v0.0.0-20200729003335-053ba62fc06f/go.mod"
+	"google.golang.org/genproto v0.0.0-20200804131852-c06518451d9c/go.mod"
+	"google.golang.org/genproto v0.0.0-20200825200019-8632dd797987/go.mod"
+	"google.golang.org/grpc v1.19.0/go.mod"
+	"google.golang.org/grpc v1.20.1/go.mod"
+	"google.golang.org/grpc v1.21.1/go.mod"
+	"google.golang.org/grpc v1.23.0/go.mod"
+	"google.golang.org/grpc v1.25.1/go.mod"
+	"google.golang.org/grpc v1.26.0/go.mod"
+	"google.golang.org/grpc v1.27.0/go.mod"
+	"google.golang.org/grpc v1.27.1/go.mod"
+	"google.golang.org/grpc v1.28.0/go.mod"
+	"google.golang.org/grpc v1.29.1/go.mod"
+	"google.golang.org/grpc v1.30.0/go.mod"
+	"google.golang.org/grpc v1.31.0/go.mod"
+	"google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod"
+	"google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod"
+	"google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60/go.mod"
+	"google.golang.org/protobuf v1.20.1-0.20200309200217-e05f789c0967/go.mod"
+	"google.golang.org/protobuf v1.21.0/go.mod"
+	"google.golang.org/protobuf v1.22.0/go.mod"
+	"google.golang.org/protobuf v1.23.0/go.mod"
+	"google.golang.org/protobuf v1.23.1-0.20200526195155-81db48ad09cc/go.mod"
+	"google.golang.org/protobuf v1.24.0/go.mod"
+	"google.golang.org/protobuf v1.25.0/go.mod"
+	"google.golang.org/protobuf v1.26.0-rc.1/go.mod"
+	"google.golang.org/protobuf v1.26.0"
+	"google.golang.org/protobuf v1.26.0/go.mod"
+	"gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod"
+	"gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod"
+	"gopkg.in/check.v1 v1.0.0-20200227125254-8fa46927fb4f"
+	"gopkg.in/check.v1 v1.0.0-20200227125254-8fa46927fb4f/go.mod"
+	"gopkg.in/errgo.v2 v2.1.0/go.mod"
+	"gopkg.in/yaml.v2 v2.2.2/go.mod"
+	"gopkg.in/yaml.v2 v2.2.3/go.mod"
+	"gopkg.in/yaml.v3 v3.0.0-20200121175148-a6ecf24a6d71/go.mod"
+	"gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod"
+	"gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b"
+	"gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b/go.mod"
+	"gotest.tools v2.2.0+incompatible"
+	"gotest.tools v2.2.0+incompatible/go.mod"
+	"gotest.tools/v3 v3.0.2"
+	"gotest.tools/v3 v3.0.2/go.mod"
+	"honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod"
+	"honnef.co/go/tools v0.0.0-20190106161140-3f1c8253044a/go.mod"
+	"honnef.co/go/tools v0.0.0-20190418001031-e561f6794a2a/go.mod"
+	"honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod"
+	"honnef.co/go/tools v0.0.1-2019.2.3/go.mod"
+	"honnef.co/go/tools v0.0.1-2020.1.3/go.mod"
+	"honnef.co/go/tools v0.0.1-2020.1.4/go.mod"
+	"rsc.io/binaryregexp v0.2.0/go.mod"
+	"rsc.io/qr v0.2.0"
+	"rsc.io/qr v0.2.0/go.mod"
+	"rsc.io/quote/v3 v3.1.0/go.mod"
+	"rsc.io/sampler v1.3.0/go.mod"
+)
+
+go-module_set_globals
+
+DESCRIPTION="a simple but powerful password manager for the terminal"
+HOMEPAGE="https://www.gopass.pw/"
+SRC_URI="https://github.com/gopasspw/gopass/archive/v${PV}.tar.gz -> ${P}.tar.gz
+	${EGO_SUM_SRC_URI}"
+
+LICENSE="MIT Apache-2.0 BSD MPL-2.0 BSD-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc64 ~x86"
+
+RESTRICT="strip test"
+
+QA_PRESTRIPPED="usr/bin/gopass"
+
+DEPEND=">=dev-lang/go-1.16"
+RDEPEND="
+	dev-vcs/git
+	>=app-crypt/gnupg-2
+"
+
+src_install() {
+	emake install DESTDIR="${ED}/usr"
+	einstalldocs
+}
+
+pkg_postinst() {
+	optfeature "browser integration" app-admin/gopass-jsonapi
+	optfeature "git credentials helper" app-admin/git-credential-gopass
+	optfeature "haveibeenpwnd.com integration" app-admin/gopass-hibp
+	optfeature "summon secrets helper" app-admin/gopass-summon-provider
+}
diff --git a/app-admin/hcloud/Manifest b/app-admin/hcloud/Manifest
index b48866f6038c..a845e807153a 100644
--- a/app-admin/hcloud/Manifest
+++ b/app-admin/hcloud/Manifest
@@ -1,5 +1,5 @@
 DIST hcloud-1.22.1.tar.xz 910672 BLAKE2B 51e18c530964677bd0cef8232c68031f3186b83fe0da91e8c6572b95130df32e5b00de6e734fb6cce56a51b6fca6136bb306d33ad4a6c728aac3d0afe634c738 SHA512 365823e779f526ae9cbbb50ecaed557c5a838b6614208e4d03e7eadb9569a2e2156e05e019aea2623a811defda707b8822d0eb09a4bfd7006262bd6a19e09aae
-DIST hcloud-1.24.0.tar.xz 1153220 BLAKE2B 0fefb2059a8ffe35a66a16386cc64bbe51941a312ab15f3971e02e47e547587a1dd63f0472a32da9cd874056a1d395a89bfd5c98d3bee70d936c0476c9c3a563 SHA512 192418d51558e7da47ff7f875c3f1ec4adf1449a75f2156c673a8a1308e891a94da3aadf57d8c35bbf7ee933b0e334fdf30ae044d1fbc0672e682d3840496c91
+DIST hcloud-1.25.1.tar.xz 1164932 BLAKE2B 21d3a0def3684a25c0cb629320f5617c93090d33cc95e66c42355c01afaf3189f8da858028220350bc1f1f53992b289ea75b56196d94ae41323602c4e8fee1a8 SHA512 aba79869553b19f6a117dc4d9f31935582e9ad89d12d9fd8f70087064383b76324483c78890ddb5965f98f2ca783ca46a17dee97b21716a1ff916647c1267a67
 EBUILD hcloud-1.22.1.ebuild 712 BLAKE2B 720832d21c95224d42bc4511184428280c532f7edd91acfa6ead5b71fe0f3d0243285bf07b196b8cf86d1cbd9e5bbcc3d5bae99d71fa3ac739d5306584ae61b1 SHA512 879162a964a3bf1b13a74a5ef4e916153aed3ef7096d481e2c2428e27b812f6f1c4e181fa42c591140949a57b538150dedfac3e9452676c9446114c2cb861a27
-EBUILD hcloud-1.24.0.ebuild 713 BLAKE2B 1d3c6e47bac7202f60f52182a6e0c1c9fbdf29599dad88592fbf7e4786a2972fab2013e7283d3c3583dd4c7dc08f1dad45c8b1fac525c433107aab3685a40a09 SHA512 a02fc4c5453e1f4786eb226ed2811c7c5de4393dc0f9f8cb5807caa3be9a86cd45de92fc5ec7638c6b5a6536c8ec02822fec782b75912defdd21e8111a8cdd24
+EBUILD hcloud-1.25.1.ebuild 713 BLAKE2B 1d3c6e47bac7202f60f52182a6e0c1c9fbdf29599dad88592fbf7e4786a2972fab2013e7283d3c3583dd4c7dc08f1dad45c8b1fac525c433107aab3685a40a09 SHA512 a02fc4c5453e1f4786eb226ed2811c7c5de4393dc0f9f8cb5807caa3be9a86cd45de92fc5ec7638c6b5a6536c8ec02822fec782b75912defdd21e8111a8cdd24
 MISC metadata.xml 337 BLAKE2B b05bca1fb33b8d8d66798d3fa410b5a00bd63fc245d29c76d812415dcfd38d6e86187c5ea74500debdac3715b559289881b4bcb5cdb1dc4d1ffcde409d666b6b SHA512 e3b82ce2611ece38238d64baa5424f680c406cfa491037024af80dbb3b2e9e6737ab5756d732852b6749a132aee61701116515fd3fb52c597ceea255534c7f2a
diff --git a/app-admin/hcloud/hcloud-1.24.0.ebuild b/app-admin/hcloud/hcloud-1.25.1.ebuild
index 77d54006fe99..77d54006fe99 100644
--- a/app-admin/hcloud/hcloud-1.24.0.ebuild
+++ b/app-admin/hcloud/hcloud-1.25.1.ebuild
diff --git a/app-admin/monit/Manifest b/app-admin/monit/Manifest
index 174dee7a32a6..3273d2a90678 100644
--- a/app-admin/monit/Manifest
+++ b/app-admin/monit/Manifest
@@ -4,7 +4,7 @@ AUX monit.service 226 BLAKE2B 3b3041900987acd5bb6faa770c6631f6554b2e436052025236
 DIST monit-5.27.1.tar.gz 1459360 BLAKE2B ef8030112c401ab08653692c702f2ec6d34c11605c2f6fbb5310f8e08d7fb238cf1b2d0271358b7160e05ad8dae3931d458329c422ae826681c11fe46fac01b4 SHA512 1e71a529a920a37576242a99fe8067d9b88f64136b111c152527aca4aa5d3cac3c32c1f58a793a56361b8e286f025bfb1f063f4c38d25ebafc7927fbf9170673
 DIST monit-5.27.2.tar.gz 1463790 BLAKE2B f00733261fd941f47ec04e63ed9e3617991cd8a069a14e59941e85d3a342537892019864d4716f821428adb57979aa270fcba9d57f573d49e897dfcd77cc133a SHA512 a45cbbf0905b165767e21d66103b460ea48948824d043881aba3de752e34a67bfb3b97f75153e3672d87a34a702d66ceee28160110654aa52fb82c668aa135b9
 DIST monit-5.28.0.tar.gz 1480041 BLAKE2B 3ac9930efc89de8b4f65dd197c4f4289b3410afac38950c83b459436720d2c786e89d8bad22e4a7688af9c6111021500b9f3c6f0a8e8cee3a6b0e2f5058ec148 SHA512 3805a8cd5ad2ef9c94832a7fe3a09cf508eb857c92cda129d914db8656613e26eac5fefdaa4530b3403b4f6eb0c4cccdc620c12461dbebcda738ba9535ffa885
-EBUILD monit-5.27.1.ebuild 1127 BLAKE2B e6170df230081dc9171697d0f280aafc8ded9b1061790616ad21f78579ee6fdfebd704b089dccf42d85ac7e15bddb476831f65230d66e335c35968adcf1ce650 SHA512 75cc834126cb0ab37ffac91fce47133c9fda9030a0534f093fb72f9930ec0f8eec8f7b25ce46d8678fc84a1dec43440be6c5fdab51dd8b95e01dfe537c1a89a7
-EBUILD monit-5.27.2.ebuild 1125 BLAKE2B bae8affa1da5da4a386b108dba8d03150fb2d5a1e99bfeabc0f40179bf4bdcf02961d746cb9c917edd29adb35253b9fbc863efdb9e7ba369e034311d86eb099f SHA512 02b13e7fd7972123b9e76847aff6d5e7a6337b7ca4d3f82b40fdb102c1dc029cfe026d0dd9ada1450133a1593115b26069004ba30f1be2752e6d72603a9db9f4
-EBUILD monit-5.28.0.ebuild 1130 BLAKE2B 5df362f709e56b313206c490cec0cc07a1a0b1f6c7281167d0ff2e646cc783864659ea65aae0222db2b1ff3376a1775907ddd3a85f6686a4e2743295c87a5775 SHA512 ffdddfca4405c281400252c2bdbf7b1da825e54d77c5f7d64e06e074753b568537c18718478f9f495a72a6c4ea4bcd3a6d840b11a86578723a64a9b6571fdd53
+EBUILD monit-5.27.1-r1.ebuild 1162 BLAKE2B 71b1d1a5e10520af69bebfcab81f17c7a72e43753d7fe1f0c421c4d2e738d20248638f6860baa9bcddff82294d0855cb004d974430dcff6a5de6cf2d6546f753 SHA512 70657c77855021896681345dc5fc4d654d356e559bd83f7ac92561e5e154aa5ec12234699a7e85551e92cf19a6eff54bba956a41f0180f5af909c1515b0465a7
+EBUILD monit-5.27.2-r1.ebuild 1162 BLAKE2B 71b1d1a5e10520af69bebfcab81f17c7a72e43753d7fe1f0c421c4d2e738d20248638f6860baa9bcddff82294d0855cb004d974430dcff6a5de6cf2d6546f753 SHA512 70657c77855021896681345dc5fc4d654d356e559bd83f7ac92561e5e154aa5ec12234699a7e85551e92cf19a6eff54bba956a41f0180f5af909c1515b0465a7
+EBUILD monit-5.28.0-r1.ebuild 1165 BLAKE2B c6ef0342430b3db2a28b3a6fba3e839f62669bf96d364905c8e7dd1b992bfbf13a26c2d74d16a9a6377c4700c995dcfef8b8ce9c32e1ece39a3ad4b8cacaa133 SHA512 b9ddf767729170ba218fe35bc3dc49efdf3218d5cb19b4312d2f6e8d1fe65c1c5a88a6b61c1bce766c5b5a4079f62f3add5bcce325659b6a228d3bea4530b79c
 MISC metadata.xml 247 BLAKE2B 5a20af3c9732ef7dba68131a08988652f5c93a6d186a82c4deb1bb9c06dc3ae73152a0d241cc346637f7b11caf4676da43301ba596c67b66669535e71db0b03e SHA512 29cf52c16b0cce69899d9c2da8acd9144b7d760442aa323b854dceadb42459e009545193b1df7911ac2241b59f4819b4a6bb1d206d6f57953f770031433bb6b7
diff --git a/app-admin/monit/monit-5.27.1.ebuild b/app-admin/monit/monit-5.27.1-r1.ebuild
index 4db356a484eb..7ed9b024d941 100644
--- a/app-admin/monit/monit-5.27.1.ebuild
+++ b/app-admin/monit/monit-5.27.1-r1.ebuild
@@ -2,6 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
+
 inherit bash-completion-r1 pam systemd
 
 DESCRIPTION="Monitoring and managing daemons or similar programs running on a Unix system"
@@ -13,14 +14,15 @@ SLOT="0"
 KEYWORDS="amd64 ppc ~ppc64 x86 ~amd64-linux"
 IUSE="ipv6 pam ssl"
 
-RDEPEND="
+RDEPEND="sys-libs/zlib:=
+	virtual/libcrypt:=
+	pam? ( sys-libs/pam )
 	ssl? ( dev-libs/openssl:0= )
-	"
-DEPEND="${RDEPEND}
-	pam? ( sys-libs/pam )"
+"
+DEPEND="${RDEPEND}"
 BDEPEND="
-	sys-devel/flex
 	sys-devel/bison
+	sys-devel/flex
 "
 
 src_prepare() {
diff --git a/app-admin/monit/monit-5.27.2.ebuild b/app-admin/monit/monit-5.27.2-r1.ebuild
index b5d12c9c390c..7ed9b024d941 100644
--- a/app-admin/monit/monit-5.27.2.ebuild
+++ b/app-admin/monit/monit-5.27.2-r1.ebuild
@@ -2,6 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
+
 inherit bash-completion-r1 pam systemd
 
 DESCRIPTION="Monitoring and managing daemons or similar programs running on a Unix system"
@@ -13,13 +14,15 @@ SLOT="0"
 KEYWORDS="amd64 ppc ~ppc64 x86 ~amd64-linux"
 IUSE="ipv6 pam ssl"
 
-RDEPEND="
-	ssl? ( dev-libs/openssl:0= )"
-DEPEND="${RDEPEND}
-	pam? ( sys-libs/pam )"
+RDEPEND="sys-libs/zlib:=
+	virtual/libcrypt:=
+	pam? ( sys-libs/pam )
+	ssl? ( dev-libs/openssl:0= )
+"
+DEPEND="${RDEPEND}"
 BDEPEND="
-	sys-devel/flex
 	sys-devel/bison
+	sys-devel/flex
 "
 
 src_prepare() {
diff --git a/app-admin/monit/monit-5.28.0.ebuild b/app-admin/monit/monit-5.28.0-r1.ebuild
index da54d075b60d..ceaf6baf0908 100644
--- a/app-admin/monit/monit-5.28.0.ebuild
+++ b/app-admin/monit/monit-5.28.0-r1.ebuild
@@ -2,6 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
+
 inherit bash-completion-r1 pam systemd
 
 DESCRIPTION="Monitoring and managing daemons or similar programs running on a Unix system"
@@ -13,14 +14,15 @@ SLOT="0"
 KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux"
 IUSE="ipv6 pam ssl"
 
-RDEPEND="
+RDEPEND="sys-libs/zlib:=
+	virtual/libcrypt:=
+	pam? ( sys-libs/pam )
 	ssl? ( dev-libs/openssl:0= )
-	"
-DEPEND="${RDEPEND}
-	pam? ( sys-libs/pam )"
+"
+DEPEND="${RDEPEND}"
 BDEPEND="
-	sys-devel/flex
 	sys-devel/bison
+	sys-devel/flex
 "
 
 src_prepare() {
diff --git a/app-admin/puppet-agent/Manifest b/app-admin/puppet-agent/Manifest
index 2e6ae4902586..07eaa015bd03 100644
--- a/app-admin/puppet-agent/Manifest
+++ b/app-admin/puppet-agent/Manifest
@@ -1,8 +1,6 @@
 AUX puppet.initd2 758 BLAKE2B caf8c2e3563f24d9d313e790498dc362fcd14467ca2b6329cf454a5163bae5cfa2b7af1a212b2e5bfcb4693c7291d5306e47e574d3c937aaedd02625dc954a9e SHA512 df93f7dbcf61eee9f42f4a0c2fa0e2dfc806ac737ba98329cee158e04150c9bf346abd9364b2a6824df4bb862e676be7b2c23f5947ef5aa589df745ac5c5cd03
 DIST puppet-agent_6.19.1-1focal_amd64.deb 22221600 BLAKE2B 22b03ef1f86b34955e8bad7c63a2022d2832dadd554316baf75419d6543e8a569902fb92a81a3dcc817401f06aa7dd47143a6cbd383f0e531c465cd3203dc4ed SHA512 4819a3509066516b0be76bc0f2afe94611405f7ac52fe50890d57c86a8a9c6c70787d46cb4b77085666f3e74bcb83a11acf1fef5d1e6ed3151ea06cbb8df3170
-DIST puppet-agent_7.6.1-1focal_amd64.deb 20894772 BLAKE2B 235f62750c1e7a42b8b4fa013b969926c4c168fd6a6d9cfc8f243ef5571360593572faad57326019c09cd1d1e67fcc985d699acbd07c3279ac350712828eb26f SHA512 36b9f69cbef0b51a80375231472e4bab195a08b14bb860419d2ad01f13d90cba377d796b3253643f77ff415f43d2f9598dc18c37d76d844a3ea98299e5d43e65
 DIST puppet-agent_7.8.0-1focal_amd64.deb 20931500 BLAKE2B 3c521631fb96440e51ad82c3665f07a5ee9cba1d978fccbe9388684ad0c211138f022017ff49b92818cfc8f50ebed0a996c9321918413e4a1c7ca0f5a2f68f8a SHA512 f0cd9951b54bc9aacce987ea10e9257db9432620f50657ca220ea8b7b4aad1c5ddebd6f5e89c5bdee837b0f928bbebe375afdb72652eb33ee22e3778498aafa1
 EBUILD puppet-agent-6.19.1-r1.ebuild 2056 BLAKE2B fe832ee23a2cb2b94bdcc943524144dfb9f64c3442c874722a67f43b8edfa16b63bc74ef3fdf96844abd68a709b34dcb13d04deec3bb896bf22daa5475a4016a SHA512 e7f35d13d653e4a2f3d6890434ddd9b409809fbe36232b2a309089757909547497b401c33369a229d75dab6e55a0068afc41f079966bedbb9f5d3a242caeebed
-EBUILD puppet-agent-7.6.1.ebuild 1909 BLAKE2B 433ad14094e7f585ed7c427740189d35314bb28aee0a282f26f7d26bdb661e0197b4925b254730f60213bb5f989638181074df5dbb4b7dd285b53aae1e99b90e SHA512 6059d73491ded91c2caada66e5722206170994caa7f025f60ddd32900dc837ace0b2257786f4224b83b5b3db3b5f1d5244bd0495bb77c80b240800c99fd89cb2
-EBUILD puppet-agent-7.8.0.ebuild 1910 BLAKE2B 22b2c613a3b7fec6f110241cd1a928094ad7ff4858c81b7b2282d81046ad60cd90baa1c7d2fdb3f78656889b84227834babd9c99ba065f1b1a980829c5c3abd1 SHA512 4d0c9acb5973d191f78a2e93903b6286dbf95a688cdc264c777f2133d4e8156d9e3da04562037cc0af85ac4b082f16bcd840e9ecf1318a191a020f46a1c2830b
+EBUILD puppet-agent-7.8.0.ebuild 1909 BLAKE2B 433ad14094e7f585ed7c427740189d35314bb28aee0a282f26f7d26bdb661e0197b4925b254730f60213bb5f989638181074df5dbb4b7dd285b53aae1e99b90e SHA512 6059d73491ded91c2caada66e5722206170994caa7f025f60ddd32900dc837ace0b2257786f4224b83b5b3db3b5f1d5244bd0495bb77c80b240800c99fd89cb2
 MISC metadata.xml 1031 BLAKE2B 87fd22edd4da3d7b50a8dc12fd136fa3205aef046491b33b9fff0466ffa1824a6a37cda506435a23d14efe5b247d99f4d7b5922cb9fbf13e52cdf54c24031633 SHA512 b180e0fcb10ade14fd10f7cabc3b6eb26ce0c4bd8983bde07aa89c663252e19d249cd7cf7cbfe46426826bd2e88c333060888adbe7e9ac63a05432ff848e2fc7
diff --git a/app-admin/puppet-agent/puppet-agent-7.6.1.ebuild b/app-admin/puppet-agent/puppet-agent-7.6.1.ebuild
deleted file mode 100644
index b9cc527c3117..000000000000
--- a/app-admin/puppet-agent/puppet-agent-7.6.1.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit systemd unpacker tmpfiles
-
-DESCRIPTION="general puppet client utils along with hiera and facter"
-HOMEPAGE="https://puppetlabs.com/"
-SRC_URI="http://apt.puppetlabs.com/pool/focal/puppet/${PN:0:1}/${PN}/${PN}_${PV}-1focal_amd64.deb"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64"
-IUSE="puppetdb selinux"
-RESTRICT="strip"
-
-CDEPEND="!app-admin/puppet
-	!dev-ruby/hiera
-	!dev-ruby/facter
-	app-emulation/virt-what
-	acct-user/puppet
-	acct-group/puppet"
-
-DEPEND="
-	${CDEPEND}
-	app-admin/augeas"
-RDEPEND="${CDEPEND}
-	app-portage/eix
-	sys-apps/dmidecode
-	sys-libs/libselinux
-	sys-libs/glibc
-	sys-libs/readline:0/8
-	sys-libs/libxcrypt
-	sys-libs/ncurses:0[tinfo]
-	selinux? (
-		sys-libs/libselinux[ruby]
-		sec-policy/selinux-puppet
-	)
-	puppetdb? ( >=dev-ruby/puppetdb-termini-5.0.1 )"
-
-S=${WORKDIR}
-
-QA_PREBUILT="*"
-
-src_install() {
-	# conf.d
-	doconfd etc/default/puppet
-	doconfd etc/default/pxp-agent
-	# logrotate.d
-	insinto /etc/logrotate.d
-	doins etc/logrotate.d/pxp-agent
-	# puppet itself
-	insinto /etc/puppetlabs
-	doins -r etc/puppetlabs/*
-	# logdir for systemd
-	keepdir var/log/puppetlabs/puppet/
-	chmod 0750 var/log/puppetlabs/puppet/
-	# the rest
-	insinto /opt
-	dodir opt/puppetlabs/puppet/cache
-	doins -r opt/*
-	fperms 0750 /opt/puppetlabs/puppet/cache
-	# init
-	newinitd "${FILESDIR}/puppet.initd2" puppet
-	systemd_dounit lib/systemd/system/puppet.service
-	systemd_dounit lib/systemd/system/pxp-agent.service
-	newtmpfiles usr/lib/tmpfiles.d/puppet-agent.conf puppet-agent.conf
-	# symlinks
-	chmod 0755 -R "${D}/opt/puppetlabs/puppet/bin/"
-	dosym ../../opt/puppetlabs/bin/facter /usr/bin/facter
-	dosym ../../opt/puppetlabs/bin/hiera /usr/bin/hiera
-	dosym ../../opt/puppetlabs/bin/puppet /usr/bin/puppet
-	dosym ../../../../usr/lib64/xcrypt/libcrypt.so.1 /opt/puppetlabs/puppet/lib/libcrypt.so.1
-}
diff --git a/app-admin/puppet-agent/puppet-agent-7.8.0.ebuild b/app-admin/puppet-agent/puppet-agent-7.8.0.ebuild
index 4a86bc593571..b9cc527c3117 100644
--- a/app-admin/puppet-agent/puppet-agent-7.8.0.ebuild
+++ b/app-admin/puppet-agent/puppet-agent-7.8.0.ebuild
@@ -10,7 +10,7 @@ SRC_URI="http://apt.puppetlabs.com/pool/focal/puppet/${PN:0:1}/${PN}/${PN}_${PV}
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 IUSE="puppetdb selinux"
 RESTRICT="strip"
 
diff --git a/app-admin/puppet/Manifest b/app-admin/puppet/Manifest
index 6057341e6672..6622b07f75af 100644
--- a/app-admin/puppet/Manifest
+++ b/app-admin/puppet/Manifest
@@ -5,11 +5,7 @@ AUX puppetmaster.confd 640 BLAKE2B 78d85ee9b2c413c59eadef3498a8a2e2ee6c6d029bf76
 AUX puppetmaster.init-4.x 1108 BLAKE2B 1793d3d881de2c1808159f940bf1e758c2e7fad8fc8eca3c0199828b2c0119547cd744c49f79334de1bc0a7227c0791a5b3645eedb51d3fa8be5822487354b1a SHA512 e177109d90f5954e7cd1968db1d0e0d0e2c6e98bc4d53d0ae0a816d181e304e1b7555f65d8807b98df9f0f8cf7ebafc9d8cca9c32574fb7127c4b480d23b5cc6
 AUX tmpfiles.d 39 BLAKE2B 2c9a992bf709a384ae02395299ddeb2febf3cd83b924acd97d0ca7fbc17dac273cb27c926790708c0d929f62282dec0477f167ed2e5fc1418a9ff5d130f246f1 SHA512 2dfec45e6f762ce0431d55b1a826e707e970defacbe050df838b66b347e7423eac78a35248c74908e7b52fa84cde5129ce3f562f64dac357f0368a3bc0b719a1
 DIST puppet-5.5.22.tar.gz 2998132 BLAKE2B 8662c89190d0904fe44ffeca1cf9a9ddca40d57ba6fb2d1e644ca353ceb55b1ca3a91416f1eef2975233c9c4498784e7d7280c111ea0cc070870cadc69341d99 SHA512 5332b084a63bdf244672cc4751022c84a1cc50d3f394a13bdcbccf7fcf4ebea67953e88957f23046608bf25e9182548449be824c18289cb2bf1e3ed29b40dc58
-DIST puppet-6.19.1.tar.gz 2917976 BLAKE2B 06019b465699494c3c5045d8d3f617046583f8bb5ebff4e72991bcf5f1ca76b4e00f56af79bbcd7ab849439fc5e627840ef08b92f586441c0cb0bb3d51805f7f SHA512 4e8a3c8d46b6aa67c31da4b510dfc32a187937af213efb9f2f0b6625b29995cdfa8cbca384ad857c19e47ae4878127564756a809c2afdff4883038249395ff01
-DIST puppet-7.6.1.tar.gz 2861371 BLAKE2B acc117a03906d710329dcd4bc3881bc9792640b4685ffb771e67e819cf21705b1635178ec527b6548245b8312c3625622827fa744227d79a81af9bae194938a9 SHA512 f7b7265f5ffca4e342e0f687cf4fbf7704c6518025d178925ae04b8902a2df2ceaa76179ecd5a1c1eb3456e29c049f701e8b45c8da7dc3b0a8948ef85ee3268a
 DIST puppet-7.8.0.tar.gz 2893281 BLAKE2B cef1d56048a72ffa18c9fe2917e4f616dd4d778eddc91c88becf06a418471af1e2cf1688aa05ad3e71f24d5bb1923eaf35b8a1419ed05a72b299af970d1427e6 SHA512 189fabe199afefc77951ee3f2bf20c749f6efe290cc3a76f5ba58892c80cc76082b1ce77c23bca87f57f62816410bc5536e4206806fe31517915c72046ace08d
 EBUILD puppet-5.5.22.ebuild 3751 BLAKE2B bde3bbacdd70435fe0e804133106ebc887f72da5742c871bfdaed08a084866f178b68433453d392f7e98f8f5a2297ee10e7b6e035392fecd22a84780a2b431b2 SHA512 5bc024d0696e51de520ca6ba162cf312ddc9cca04ba5ee18f849ca48547f31e4a493664ffd0100022ef4fb69ad1c24b1efccf7a25d85652281da71c446b87f26
-EBUILD puppet-6.19.1.ebuild 3624 BLAKE2B 217b10d57607d4f310b49826b77e58056f7ee16349d519515eda03cef8bf0dc543a75399b4e4bf78ebb7413c69a037cb887bfe4eb22615e51039362f45a88062 SHA512 ba4dd1fbc1498522ea69965d4027976fb9f5c43ceca1fd2fa8c859087c9a4f737692a36fc6491e1fe3757583499670823ba6b2a7fad49e2dc9764cd07be27714
-EBUILD puppet-7.6.1.ebuild 3541 BLAKE2B 13d27c6f791613cb01d099c49071b66975141e7981d09f4bab43fba022aab33511ce458edf3ab8e89d13ce2516c83fe691f06f152ddbf8d1560548dbdb54159d SHA512 6cf163d9932c148a87b82b8afe77d9cf1d931b93f2945917dc98530b6197ea05bdc0b39315ec9d75e39d42b35708148f152c2db34716eb22ea063440cc89fa8d
-EBUILD puppet-7.8.0.ebuild 3540 BLAKE2B 1239d0f1d9a6cdb8dab7965c51c8c7879e20cf2089dd67a1c8903bf8da1aa03c53af3485f82621f1656ef71866c7df92777b66447858319e79c865174c42c458 SHA512 f13b7f037fa7b5f25d37752a6c5f4cdebec9e1ca4f272a1ab4023d3cf79f47c98c4b5df49e996565205e8e9e80296ecbebf5b9ca4ae98b1371b657662ed179da
+EBUILD puppet-7.8.0.ebuild 3538 BLAKE2B a5419de57c88bcab6796a2df14afca910f1b466a0ca20fc40b3b937053059d126a4ef845ca9ad2903f2c4afe6b86f19fbfd61779e54a0e3b2a51622ac9dfe07b SHA512 70be4cbede4a005ab5d01daf6ad49e3349c818c56abbe62d9021ec748b8d1b431821baed282c813d53b488d803ef715253300a12bd0cc79216c927d2bb4ba7b8
 MISC metadata.xml 1569 BLAKE2B 689531701af0604e7a10f59f2eb721c133796a6c7a87d6a9bffef26ed71d7135b9498450274f4875feb5c45ad7b1aa8458be9a71145f1c0f089b9db687be3cba SHA512 a5672e5d6191264e037e60dd3d2d2d545719fe0edc5db1372b6f1c83a05ebf8b4c5b171b5a80f5ec55a531cec3e37d8b9207adcbf38925efe193eecd80999198
diff --git a/app-admin/puppet/puppet-6.19.1.ebuild b/app-admin/puppet/puppet-6.19.1.ebuild
deleted file mode 100644
index bf3ca9d2e34f..000000000000
--- a/app-admin/puppet/puppet-6.19.1.ebuild
+++ /dev/null
@@ -1,133 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-USE_RUBY="ruby24 ruby25 ruby26 ruby27"
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-RUBY_FAKEGEM_TASK_DOC="doc:all"
-RUBY_FAKEGEM_EXTRAINSTALL="locales"
-
-inherit epatch ruby-fakegem
-
-DESCRIPTION="A system automation and configuration management software."
-HOMEPAGE="https://puppet.com/"
-SRC_URI="http://downloads.puppetlabs.com/puppet/${P}.tar.gz"
-
-LICENSE="Apache-2.0 GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~hppa ~ppc ~ppc64 x86"
-IUSE="augeas diff doc emacs ldap rrdtool selinux shadow sqlite vim-syntax"
-RESTRICT="test"
-
-ruby_add_rdepend "
-	dev-ruby/hiera
-	dev-ruby/json:=
-	dev-ruby/semantic_puppet
-	>=dev-ruby/facter-3.0.0
-	dev-ruby/concurrent-ruby
-	augeas? ( dev-ruby/ruby-augeas )
-	diff? ( dev-ruby/diff-lcs )
-	doc? ( dev-ruby/rdoc )
-	ldap? ( dev-ruby/ruby-ldap )
-	shadow? ( dev-ruby/ruby-shadow )
-	sqlite? ( dev-ruby/sqlite3 )
-	virtual/ruby-ssl
-	dev-ruby/hocon"
-
-ruby_add_bdepend "
-	doc? ( dev-ruby/yard )
-	test? (
-		dev-ruby/mocha
-		dev-ruby/rack
-		dev-ruby/rspec-its
-	)"
-# this should go in the above lists, but isn't because of test deps not being keyworded
-#   dev-ruby/rspec-collection_matchers
-
-RDEPEND+=" ${RDEPEND}
-	rrdtool? ( >=net-analyzer/rrdtool-1.2.23[ruby] )
-	selinux? (
-		sys-libs/libselinux[ruby]
-		sec-policy/selinux-puppet
-	)
-	vim-syntax? ( >=app-vim/puppet-syntax-3.0.1 )
-	>=app-portage/eix-0.18.0
-	acct-user/puppet
-	acct-group/puppet"
-PDEPEND="emacs? ( >=app-emacs/puppet-mode-0.3-r1 )"
-
-all_ruby_prepare() {
-	# Avoid spec that require unpackaged json-schema.
-	rm spec/lib/matchers/json.rb $( grep -Rl matchers/json spec) || die
-
-	# can't be run within portage.
-	epatch "${FILESDIR}/puppet-fix-tests-6.10.1.patch"
-
-	# fix systemd path
-	epatch "${FILESDIR}/puppet-systemd.patch"
-
-	# Avoid specs that can only run in the puppet.git repository. This
-	# should be narrowed down to the specific specs.
-	rm spec/integration/parser/compiler_spec.rb || die
-
-	# Avoid failing spec that need further investigation.
-	rm spec/unit/module_tool/metadata_spec.rb || die
-}
-
-each_ruby_install() {
-	each_fakegem_install
-#	dosym "/usr/$(get_libdir)/ruby/gems/$(ruby_get_version)/gems/${P}" "/usr/$(get_libdir)/ruby/gems/$(ruby_get_version)/gems/${PN}"
-}
-
-all_ruby_install() {
-	all_fakegem_install
-
-	# systemd stuffs
-	insinto /usr/lib/systemd/system
-	doins "${WORKDIR}/all/${P}/ext/systemd/puppet.service"
-
-	# tmpfiles stuff
-	insinto /usr/lib/tmpfiles.d
-	newins "${FILESDIR}/tmpfiles.d" "puppet.conf"
-
-	# openrc init stuff
-	newinitd "${FILESDIR}"/puppet.init-4.x puppet
-
-	keepdir /etc/puppetlabs/puppet/ssl
-
-	keepdir /var/lib/puppet/facts
-	keepdir /var/lib/puppet/files
-	fowners -R puppet:puppet /var/lib/puppet
-
-	fperms 0750 /var/lib/puppet
-
-	fperms 0750 /etc/puppetlabs
-	fperms 0750 /etc/puppetlabs/puppet
-	fperms 0750 /etc/puppetlabs/puppet/ssl
-	fowners -R :puppet /etc/puppetlabs
-	fowners -R :puppet /var/lib/puppet
-
-	if use ldap ; then
-		insinto /etc/openldap/schema; doins ext/ldap/puppet.schema
-	fi
-
-	# ext and examples files
-	for f in $(find ext examples -type f) ; do
-		docinto "$(dirname ${f})"; dodoc "${f}"
-	done
-}
-
-pkg_postinst() {
-	elog
-	elog "Please, *don't* include the --ask option in EMERGE_EXTRA_OPTS as this could"
-	elog "cause puppet to hang while installing packages."
-	elog
-	elog "Portage Puppet module with Gentoo-specific resources:"
-	elog "http://forge.puppetlabs.com/gentoo/portage"
-	elog
-	elog "If updating from puppet 5 to 6, keep in mind that webrick (server/master)"
-	elog "suppert was removed for >=6.x, please migrate to puppetserver if you have"
-	elog "not already done so."
-	elog
-}
diff --git a/app-admin/puppet/puppet-7.6.1.ebuild b/app-admin/puppet/puppet-7.6.1.ebuild
deleted file mode 100644
index 65ed31b7def3..000000000000
--- a/app-admin/puppet/puppet-7.6.1.ebuild
+++ /dev/null
@@ -1,132 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-USE_RUBY="ruby24 ruby25 ruby26 ruby27"
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-RUBY_FAKEGEM_TASK_DOC="doc:all"
-RUBY_FAKEGEM_EXTRAINSTALL="locales"
-
-inherit epatch ruby-fakegem
-
-DESCRIPTION="A system automation and configuration management software."
-HOMEPAGE="https://puppet.com/"
-SRC_URI="http://downloads.puppetlabs.com/puppet/${P}.tar.gz"
-
-LICENSE="Apache-2.0 GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~hppa ~ppc ~ppc64 x86"
-IUSE="augeas diff doc emacs ldap rrdtool selinux shadow sqlite vim-syntax"
-RESTRICT="test"
-
-ruby_add_rdepend "
-	dev-ruby/hiera
-	dev-ruby/json:=
-	dev-ruby/semantic_puppet
-	>=dev-ruby/facter-3.0.0
-	dev-ruby/concurrent-ruby
-	augeas? ( dev-ruby/ruby-augeas )
-	diff? ( dev-ruby/diff-lcs )
-	doc? ( dev-ruby/rdoc )
-	ldap? ( dev-ruby/ruby-ldap )
-	shadow? ( dev-ruby/ruby-shadow )
-	sqlite? ( dev-ruby/sqlite3 )
-	virtual/ruby-ssl
-	dev-ruby/hocon"
-
-ruby_add_bdepend "
-	doc? ( dev-ruby/yard )
-	test? (
-		dev-ruby/mocha
-		dev-ruby/rack
-		dev-ruby/rspec-its
-	)"
-# this should go in the above lists, but isn't because of test deps not being keyworded
-#   dev-ruby/rspec-collection_matchers
-
-RDEPEND+=" ${RDEPEND}
-	rrdtool? ( >=net-analyzer/rrdtool-1.2.23[ruby] )
-	selinux? (
-		sys-libs/libselinux[ruby]
-		sec-policy/selinux-puppet
-	)
-	vim-syntax? ( >=app-vim/puppet-syntax-3.0.1 )
-	>=app-portage/eix-0.18.0
-	acct-user/puppet
-	acct-group/puppet"
-PDEPEND="emacs? ( >=app-emacs/puppet-mode-0.3-r1 )"
-
-all_ruby_prepare() {
-	# Avoid spec that require unpackaged json-schema.
-	rm spec/lib/matchers/json.rb $( grep -Rl matchers/json spec) || die
-
-	# fix systemd path
-	epatch "${FILESDIR}/puppet-systemd.patch"
-
-	# Avoid specs that can only run in the puppet.git repository. This
-	# should be narrowed down to the specific specs.
-	rm spec/integration/parser/compiler_spec.rb || die
-
-	# Avoid failing spec that need further investigation.
-	rm spec/unit/module_tool/metadata_spec.rb || die
-}
-
-each_ruby_install() {
-	each_fakegem_install
-#	dosym "/usr/$(get_libdir)/ruby/gems/$(ruby_get_version)/gems/${P}" "/usr/$(get_libdir)/ruby/gems/$(ruby_get_version)/gems/${PN}"
-}
-
-all_ruby_install() {
-	all_fakegem_install
-
-	# systemd stuffs
-	insinto /usr/lib/systemd/system
-	doins "${WORKDIR}/all/${P}/ext/systemd/puppet.service"
-
-	# tmpfiles stuff
-	insinto /usr/lib/tmpfiles.d
-	newins "${FILESDIR}/tmpfiles.d" "puppet.conf"
-
-	# openrc init stuff
-	newinitd "${FILESDIR}"/puppet.init-4.x puppet
-
-	keepdir /etc/puppetlabs/puppet/ssl
-
-	keepdir /var/lib/puppet/facts
-	keepdir /var/lib/puppet/files
-	fowners -R puppet:puppet /var/lib/puppet
-
-	fperms 0750 /var/lib/puppet
-
-	fperms 0750 /etc/puppetlabs
-	fperms 0750 /etc/puppetlabs/puppet
-	fperms 0750 /etc/puppetlabs/puppet/ssl
-	fowners -R :puppet /etc/puppetlabs
-	fowners -R :puppet /var/lib/puppet
-
-	if use ldap ; then
-		insinto /etc/openldap/schema
-		doins ext/ldap/puppet.schema
-	fi
-
-	# ext and examples files
-	for f in $(find ext examples -type f) ; do
-		docinto "$(dirname ${f})"
-		dodoc "${f}"
-	done
-}
-
-pkg_postinst() {
-	elog
-	elog "Please, *don't* include the --ask option in EMERGE_EXTRA_OPTS as this could"
-	elog "cause puppet to hang while installing packages."
-	elog
-	elog "Portage Puppet module with Gentoo-specific resources:"
-	elog "http://forge.puppetlabs.com/gentoo/portage"
-	elog
-	elog "If updating from puppet 5 to 6, keep in mind that webrick (server/master)"
-	elog "suppert was removed for >=6.x, please migrate to puppetserver if you have"
-	elog "not already done so."
-	elog
-}
diff --git a/app-admin/puppet/puppet-7.8.0.ebuild b/app-admin/puppet/puppet-7.8.0.ebuild
index 125aa53e82ce..d3f1ad182f3d 100644
--- a/app-admin/puppet/puppet-7.8.0.ebuild
+++ b/app-admin/puppet/puppet-7.8.0.ebuild
@@ -16,7 +16,7 @@ SRC_URI="http://downloads.puppetlabs.com/puppet/${P}.tar.gz"
 
 LICENSE="Apache-2.0 GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~hppa ~ppc ~ppc64 x86"
 IUSE="augeas diff doc emacs ldap rrdtool selinux shadow sqlite vim-syntax"
 RESTRICT="test"
 
diff --git a/app-admin/puppetdb/Manifest b/app-admin/puppetdb/Manifest
index 8848e95c3009..6e892f98a103 100644
--- a/app-admin/puppetdb/Manifest
+++ b/app-admin/puppetdb/Manifest
@@ -1,7 +1,5 @@
 AUX puppetdb.initd 1824 BLAKE2B 76d8252b2fee61270f440734d91735fa002df1583126de60befd3cc756cc0f5368ce49461cee85ffca4c6893b1e1859bff9af86e75d73171d15ae344a9fb4149 SHA512 0d0f67b7eaf7d10474e73eb77174a51e0f891bf664706e11c7a5ef1f918d7967c67251bab797e1d117b0f2b08f4b634ad06a81f6022ef04e6394c15e36a73961
 AUX puppetdb.initd-r2 1896 BLAKE2B 04f47dd0406c1f67d4f72a911b0db8b482e37673ec9a0d14d73fb868aaae97f756e03fa39c2c7a9d69a217b5924dafa23c6f3e276a0626f06bf5c143b588a2c8 SHA512 58c248710c6eb39ec13e6f55a8bca686386e79eb048c4927925a2e2e75bce742d6a5e84001c231ea2b74fd4eed0ead81b9a4fc5672fdfbbd59f90677e4490675
-DIST puppetdb-7.3.1.tar.gz 47173502 BLAKE2B e9f57300585cb556f75975c4a20c35c0789816a9f141a3979348200e28e24352870109fc3597a44d075b490b9da2308e963a24e64e37552f7124205beb87aae8 SHA512 aa15aebec2f7a24a2da125078017baabe054d741ee651b91219074a274400ae54862c38d3e253e904fe26165f4fc34fb3eb021937aa9ee4304b7e83bc3f5d0dc
 DIST puppetdb-7.4.1.tar.gz 47409868 BLAKE2B 0ac4234547b27e9ad12c9c008d76be8fff7f724d93acc2ca26700d18ac2e30bf9689c46550a8976b90e662d7af97994d7e299b94e2d68e5b5f7d1166a54d4ff8 SHA512 64c42477554039991b35dfd2d29f4fa507226cc3256b07ff3524cd287c1dbf09bdf60116dd12288d1340ca74ced2872ac886f4eadde8bd83965976579e99738d
-EBUILD puppetdb-7.3.1.ebuild 2647 BLAKE2B 210c1c51e34c16766e8f1cca2c94c7e5d6a0e60415cc0fa1691f1b85dd7d088bd540cc24e7318ccc224763c5920d4823b760d5c4cbd78df2c050612b6fd923ea SHA512 3e773a22cfc7fb7b8bf0b038a9641077af5d819ce654bae935d0a7b67840f39c2e703477d91d4f09091337f2bcab41679a6aaa75f76458897e99b94856c611b1
-EBUILD puppetdb-7.4.1.ebuild 2649 BLAKE2B 93e811d338631f32fce739bbc2692bfb5b6b9aa93c6fa4705faeca5921d682612c813559a2549c3e78efb37a80b83e390ba27b809c86e82c2b80f160bab4cec3 SHA512 9f82fdfe9efa7320db27fe81b1212e7ee960506e9da28ca9b2e65089d214b7c7e1ab1127cc7fc1d9671e2296792f6cc24a81b22659eae0b140cc020cfb04267b
+EBUILD puppetdb-7.4.1.ebuild 2647 BLAKE2B 210c1c51e34c16766e8f1cca2c94c7e5d6a0e60415cc0fa1691f1b85dd7d088bd540cc24e7318ccc224763c5920d4823b760d5c4cbd78df2c050612b6fd923ea SHA512 3e773a22cfc7fb7b8bf0b038a9641077af5d819ce654bae935d0a7b67840f39c2e703477d91d4f09091337f2bcab41679a6aaa75f76458897e99b94856c611b1
 MISC metadata.xml 485 BLAKE2B 5f2ffba1725ce7168c4bacbef8170b7ca626d4e639cc2c32e0063e076fc951681c9a7154d08036e935617bd5cf67a5640acec9ae3964829da9bc3a7cdf412222 SHA512 b9461d712e74a7ff469a554a21c1e4e67954395eaae8de9a8669f7e816e2291120be14e8c659f34b41f65962027cfa73030ef2678003b52a1a56b35de0f9b2b2
diff --git a/app-admin/puppetdb/puppetdb-7.3.1.ebuild b/app-admin/puppetdb/puppetdb-7.3.1.ebuild
deleted file mode 100644
index 06b2986213b8..000000000000
--- a/app-admin/puppetdb/puppetdb-7.3.1.ebuild
+++ /dev/null
@@ -1,87 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit multilib systemd tmpfiles
-
-DESCRIPTION="PuppetDB collects data generated by Puppet."
-HOMEPAGE="http://docs.puppetlabs.com/puppetdb/"
-SRC_URI="https://downloads.puppetlabs.com/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE=""
-KEYWORDS="amd64 x86"
-
-RDEPEND+=">=virtual/jdk-1.8.0"
-DEPEND+="acct-user/puppetdb
-	acct-group/puppetdb"
-
-src_prepare() {
-	sed -i 's/sysconfig/conf\.d/g' ext/redhat/puppetdb.service || die
-	sed -i 's/sysconfig/conf\.d/g' ext/bin/puppetdb || die
-	sed -i 's/sysconfig/conf\.d/g' install.sh || die
-	sed -i 's/var\/run/run/g' ext/puppetdb.tmpfiles.conf || die
-	sed -i 's/var\/run/run/g' install.sh || die
-	default
-}
-
-src_compile() {
-		einfo "not compiling"
-}
-
-src_install() {
-	dodir /opt/puppetlabs/server/data/puppetdb
-	insinto /opt/puppetlabs/server/apps/puppetdb
-	insopts -m0744
-	doins ext/ezbake-functions.sh
-	insopts -m0644
-	doins ext/ezbake.manifest
-	doins puppetdb.jar
-	insinto /etc/puppetlabs/puppetdb
-	doins ext/config/logback.xml
-	doins ext/config/bootstrap.cfg
-	doins ext/config/request-logging.xml
-	insinto /etc/puppetlabs/puppetdb/conf.d
-	doins ext/config/conf.d/jetty.ini
-	doins ext/config/conf.d/repl.ini
-	doins ext/config/conf.d/database.ini
-	doins ext/config/conf.d/config.ini
-	insopts -m0755
-	insinto /opt/puppetlabs/server/apps/puppetdb/scripts
-	doins install.sh
-	insinto /opt/puppetlabs/server/apps/puppetdb/cli/apps
-	doins ext/cli/foreground
-	doins ext/cli/ssl-setup
-	doins ext/cli/config-migration
-	doins ext/cli/foreground
-	doins ext/cli/anonymize
-	doins ext/cli/reload
-	doins ext/cli/start
-	doins ext/cli/stop
-	insinto /opt/puppetlabs/server/apps/puppetdb/bin
-	doins ext/bin/puppetdb
-	insopts -m0644
-	dodir /opt/puppetlabs/server/bin
-	dosym ../apps/puppetdb/bin/puppetdb /opt/puppetlabs/server/bin/puppetdb
-	dodir /opt/puppetlabs/bin
-	dosym ../server/apps/puppetdb/bin/puppetdb /opt/puppetlabs/bin/puppetdb
-	dosym ../../opt/puppetlabs/server/apps/puppetdb/bin/puppetdb /usr/bin/puppetdb
-	# init type tasks
-	newconfd ext/default puppetdb
-	systemd_dounit ext/redhat/puppetdb.service
-	newtmpfiles ext/puppetdb.tmpfiles.conf puppetdb.conf
-	newinitd "${FILESDIR}/puppetdb.initd-r2" puppetdb
-	# misc
-	insinto /etc/logrotate.d
-	newins ext/puppetdb.logrotate.conf puppetdb
-	fowners -R puppetdb:puppetdb /opt/puppetlabs/server/data/puppetdb
-	fperms -R 770 /opt/puppetlabs/server/data/puppetdb
-}
-
-pkg_postinst() {
-	elog "to install please run '/opt/puppetlabs/server/bin/puppetdb ssl-setup'"
-	elog
-	elog "to upgrade please run '/opt/puppetlabs/server/bin/puppetdb config-migration'"
-}
diff --git a/app-admin/puppetdb/puppetdb-7.4.1.ebuild b/app-admin/puppetdb/puppetdb-7.4.1.ebuild
index 78bd75a0264e..06b2986213b8 100644
--- a/app-admin/puppetdb/puppetdb-7.4.1.ebuild
+++ b/app-admin/puppetdb/puppetdb-7.4.1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://downloads.puppetlabs.com/${PN}/${P}.tar.gz"
 LICENSE="Apache-2.0"
 SLOT="0"
 IUSE=""
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 RDEPEND+=">=virtual/jdk-1.8.0"
 DEPEND+="acct-user/puppetdb
diff --git a/app-admin/puppetserver/Manifest b/app-admin/puppetserver/Manifest
index 1c253a883844..178f0ccc7cdc 100644
--- a/app-admin/puppetserver/Manifest
+++ b/app-admin/puppetserver/Manifest
@@ -1,7 +1,5 @@
 AUX puppetserver.init 2138 BLAKE2B 6c157cb6bbe9e085ae67920abadf99ff97798115f784a60e2be4fa565f5b897f60d8abea21af273b1951477a1662c778081ee9a31063780c179097e764b0845b SHA512 50e78feda08e06a16290f90b7d593653c7fe2e98efdfc8cc7cc4a85a5be528e8bc585b934330f3a87b6f038311942fd8bc6d73f0538069d7b132dd3a64e23f11
 AUX puppetserver.init-r1 2190 BLAKE2B 6e4b547af51989d678a52e0fb41e8b27a669d96aaa445998b532524651f2bf2349a26f8eb77ead92a9e0f613a5269fe464045937f318947c8c2878b93dad0d4f SHA512 de159346c4b1b5705d53337994cf77f4b70edd20d60f0e1338589be4ee67c4a1bddca5cfdf9a4e744ff9360676f86391a6675b137c3bef050d71f2964b885b58
-DIST puppetserver-7.1.2.tar.gz 62628297 BLAKE2B a109f6c9581f6d22d882dbef55b52cae31b6350e07918a6642bd1130f06b6d4649b8268f4b82a700937c518254f936dd0711e0c6c8f716a8cfd4e5bed717c459 SHA512 e5243f1159707c8b2e864450cddf57e9401bdfe209c449ce962684c4dfe0df2ea8a57756b9ca19d96b3f210d18b00f44460ceec85132af1b3048d8e919357c37
 DIST puppetserver-7.2.0.tar.gz 62897576 BLAKE2B 63a8a7ea001757e15224ec819d9a23e23d3e568832421009118c1c4c3880564f614afcfa593e7c0c580cd2890ab653f5692cfc7fb23992ca7674cd5a56fa3f50 SHA512 ec90220abf4901ad98e1e07f65cdc25f09b62fda22f915260519d6fc599d36ea3a5ec2bfd5787cc9459d3c25753ff5eded2c09a67a614da1d6dda0881262b3b9
-EBUILD puppetserver-7.1.2.ebuild 5325 BLAKE2B 63fbd9c252c64476df2b8592c34ccd2e67bcd39b41686ddf29f49cf860ccedbc3193b8e9adb95edb8cd3cd75da448e0dd9f202da5bbf0cb9bd1bbbe61f996a29 SHA512 191d5c6fa5dd735838814de6b7c62bf44c143c64d470aaef171f27eafa6e1576643b2614620cf7f07919a16388fbb58ad9b89124ada6bcbe287b4cd88d374bf9
-EBUILD puppetserver-7.2.0.ebuild 5326 BLAKE2B 1ac5bd0287581c9bdaf1de5cf664224f33041661f1c60f78cb62a16a3dc90861c6618b0b77bab7a8c62a29bd3f70ae8b33cba2a93aad586a24dd4926264aae63 SHA512 ac7582cb40523158a82ed01e696cdb34ffd86b34a846afe6424419541bf87d520d094279300c6ec681f637f7096069a13565aa43d0beb448547343ac7b3984db
+EBUILD puppetserver-7.2.0.ebuild 5325 BLAKE2B 63fbd9c252c64476df2b8592c34ccd2e67bcd39b41686ddf29f49cf860ccedbc3193b8e9adb95edb8cd3cd75da448e0dd9f202da5bbf0cb9bd1bbbe61f996a29 SHA512 191d5c6fa5dd735838814de6b7c62bf44c143c64d470aaef171f27eafa6e1576643b2614620cf7f07919a16388fbb58ad9b89124ada6bcbe287b4cd88d374bf9
 MISC metadata.xml 340 BLAKE2B 91985e6677e8a9d4428356eb316146949d82a250f0a0995308733c4348cfeebabe01990a0cde9e580bc61c8b5c7df44ba92b347d90b9eb9c1f6f9fc38efa899f SHA512 9bc170ecf1a1b3810b0f9a5838ad5eb994169d7b50f5d0c0cfba279649ed7665f8d8a627a463dd35029610c554f8b0e5d76b759218802e3b0b9fa09c45c4ee5b
diff --git a/app-admin/puppetserver/puppetserver-7.1.2.ebuild b/app-admin/puppetserver/puppetserver-7.1.2.ebuild
deleted file mode 100644
index 4d5a6144923f..000000000000
--- a/app-admin/puppetserver/puppetserver-7.1.2.ebuild
+++ /dev/null
@@ -1,131 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit multilib systemd
-
-DESCRIPTION="Puppet Server is the next-generation application for managing Puppet agents."
-HOMEPAGE="http://docs.puppetlabs.com/puppetserver/"
-SRC_URI="https://downloads.puppetlabs.com/puppet/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="puppetdb"
-# will need the same keywords as puppet
-KEYWORDS="amd64"
-
-RDEPEND+="
-		>=virtual/jdk-1.8.0
-		app-admin/puppet-agent[puppetdb?]"
-DEPEND+="acct-user/puppet
-	acct-group/puppet"
-
-src_prepare() {
-	sed -i 's/sysconfig\/puppetserver/default\/puppetserver/g' ext/redhat/puppetserver.service || die
-	sed -i 's/sysconfig\/puppetserver/default\/puppetserver/g' ext/bin/puppetserver || die
-	sed -i 's/sysconfig\/puppetserver/default\/puppetserver/g' install.sh || die
-	sed -i 's/var\/run/run/g' ext/config/conf.d/puppetserver.conf || die
-	sed -i 's/var\/run/run/g' ext/redhat/puppetserver.service || die
-	sed -i 's/var\/run/run/g' install.sh || die
-	default
-}
-
-src_compile() {
-		einfo "not compiling"
-}
-
-src_install() {
-	insinto /opt/puppetlabs/server/apps/puppetserver
-	insopts -m0774
-	doins ext/ezbake-functions.sh
-	insopts -m0644
-	doins ext/ezbake.manifest
-	doins puppet-server-release.jar
-	insinto /etc/puppetlabs/puppetserver
-	doins ext/config/logback.xml
-	doins ext/config/request-logging.xml
-	insinto /etc/puppetlabs/puppetserver/services.d
-	doins ext/system-config/services.d/bootstrap.cfg
-	doins ext/config/services.d/ca.cfg
-	insinto /etc/puppetlabs/puppetserver/conf.d
-	doins ext/config/conf.d/puppetserver.conf
-	doins ext/config/conf.d/auth.conf
-	doins ext/config/conf.d/global.conf
-	doins ext/config/conf.d/web-routes.conf
-	doins ext/config/conf.d/metrics.conf
-	doins ext/config/conf.d/webserver.conf
-	insopts -m0755
-	insinto /opt/puppetlabs/server/apps/puppetserver/scripts
-	doins install.sh
-	insinto /opt/puppetlabs/server/apps/puppetserver/cli/apps
-	doins ext/cli/ca
-	doins ext/cli/irb
-	doins ext/cli/foreground
-	doins ext/cli/gem
-	doins ext/cli/ruby
-	doins ext/cli/reload
-	doins ext/cli/start
-	doins ext/cli/stop
-	insinto /opt/puppetlabs/server/apps/puppetserver/cli
-	doins ext/cli_defaults/cli-defaults.sh
-	insinto /opt/puppetlabs/server/apps/puppetserver/bin
-	doins ext/bin/puppetserver
-	insopts -m0644
-	dodir /opt/puppetlabs/server/bin
-	dosym ../apps/puppetserver/bin/puppetserver /opt/puppetlabs/server/bin/puppetserver
-	dodir /opt/puppetlabs/bin
-	dosym ../server/apps/puppetserver/bin/puppetserver /opt/puppetlabs/bin/puppetserver
-	dosym ../../opt/puppetlabs/server/apps/puppetserver/bin/puppetserver /usr/bin/puppetserver
-	dodir /opt/puppetlabs/server/apps/puppetserver/config/services.d
-	# other sys stuff
-	dodir /etc/puppetlabs/code
-	# needed for systemd
-	keepdir /var/log/puppetlabs/puppetserver
-	dodir /etc/puppetlabs/puppet/ssl
-	fowners -R puppet:puppet /etc/puppetlabs/puppet/ssl
-	fperms -R 771 /etc/puppetlabs/puppet/ssl
-	# systemd type things
-	insinto /etc/systemd/system/puppetserver.service.d/
-	systemd_dounit ext/redhat/puppetserver.service
-	insinto /etc/default
-	newins ext/default puppetserver
-	# normal init type tasks
-	dosym ../default/puppetserver /etc/conf.d/puppetserver
-	newinitd "${FILESDIR}/puppetserver.init-r1" puppetserver
-	# misc
-	insinto /etc/logrotate.d
-	newins ext/puppetserver.logrotate.conf puppetserver
-	# cleanup
-	dodir /opt/puppetlabs/server/data/puppetserver/jruby-gems
-	fowners -R puppet:puppet /opt/puppetlabs/server/data
-	fperms -R 775 /opt/puppetlabs/server/data/puppetserver
-	fperms -R 700 /var/log/puppetlabs/puppetserver
-	insinto /opt/puppetlabs/server/data
-	doins ext/build-scripts/jruby-gem-list.txt
-	doins ext/build-scripts/mri-gem-list-no-dependencies.txt
-	insopts -m 0644
-	insinto /usr/lib/tmpfiles.d
-	newins ext/puppetserver.tmpfiles.conf puppetserver.conf
-}
-
-pkg_postinst() {
-	elog "to install you may want to run the following:"
-	elog
-	elog "puppet config set --section master vardir  /opt/puppetlabs/server/data/puppetserver"
-	elog "puppet config set --section master logdir  /var/log/puppetlabs/puppetserver"
-	elog "puppet config set --section master rundir  /run/puppetlabs/puppetserver"
-	elog "puppet config set --section master pidfile /run/puppetlabs/puppetserver/puppetserver.pid"
-	elog "puppet config set --section master codedir /etc/puppetlabs/code"
-	elog
-	elog "# install puppetserver gems"
-	elog "cd /opt/puppetlabs/server/apps/puppetserver"
-	elog "echo \"jruby-puppet: { gem-home: ${DESTDIR}/opt/puppetlabs/server/data/puppetserver/vendored-jruby-gems }\" > jruby.conf"
-	elog "while read LINE; do"
-	elog "  java -cp puppet-server-release.jar:jruby-9k.jar clojure.main -m puppetlabs.puppetserver.cli.gem --config jruby.conf -- install --no-document \$(echo \$LINE |awk '{print \$1}') --version \$(echo \$LINE |awk '{print \$2}')"
-	elog "done < /opt/puppetlabs/server/data/jruby-gem-list.txt"
-	elog "echo \"jruby-puppet: { gem-home: ${DESTDIR}/opt/puppetlabs/puppet/lib/ruby/vendor_gems }\" > jruby.conf"
-	elog "while read LINE; do"
-	elog "  java -cp puppet-server-release.jar:jruby-9k.jar clojure.main -m puppetlabs.puppetserver.cli.gem --config jruby.conf -- install --no-document --ignore-dependencies \$(echo \$LINE |awk '{print \$1}') --version \$(echo \$LINE |awk '{print \$2}')"
-	elog "done < /opt/puppetlabs/server/data/mri-gem-list-no-dependencies.txt"
-}
diff --git a/app-admin/puppetserver/puppetserver-7.2.0.ebuild b/app-admin/puppetserver/puppetserver-7.2.0.ebuild
index 0cf80aca0efb..4d5a6144923f 100644
--- a/app-admin/puppetserver/puppetserver-7.2.0.ebuild
+++ b/app-admin/puppetserver/puppetserver-7.2.0.ebuild
@@ -13,7 +13,7 @@ LICENSE="Apache-2.0"
 SLOT="0"
 IUSE="puppetdb"
 # will need the same keywords as puppet
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 
 RDEPEND+="
 		>=virtual/jdk-1.8.0
diff --git a/app-admin/pwcrypt/Manifest b/app-admin/pwcrypt/Manifest
index e4f869b3de07..c5fc001b4acf 100644
--- a/app-admin/pwcrypt/Manifest
+++ b/app-admin/pwcrypt/Manifest
@@ -1,4 +1,4 @@
 AUX pwcrypt-gcc-10.patch 2031 BLAKE2B 58df1816fd176cd486c46a96a56ad7c814b47d214a71292967fa02a30e5d8ced81d8483ce830993979f0f74ef747017d590955d67252e385a7a7b173a1a4300a SHA512 a0560fdd2f4ad82d3f63dbcba148255e8f451944961bb12e69f9dbe2566f02f3b1d853d2fe69a76c1fa94d0218ec9bc7c0bbafef1528a42f67f36bc3ee6d33be
 DIST pwcrypt-1.2.2.tar.gz 36902 BLAKE2B 3cb63bf2a907f4394a7bb5317c7c0bf9ac493de41a54f7107c01a46dea41d32c8e24631f5197e3c62c62d6d44d959f505874e0a3d6ab7c0fc04863165b37ec56 SHA512 41644e82f8306003e9346900d7a961e87a5b8103ebc411cf09b5e0e40d8253b4c38a83db57c60f09d2dd2663ecc2e2edc10ea2b6d095c102ee10ae251b471ddf
-EBUILD pwcrypt-1.2.2-r2.ebuild 650 BLAKE2B cab7322ac9222927ff28a6f74c4b2a39db4116ab0e535b6aa105395e82e0142d0d3da7554fff06eb9fbde5d1a52e2965420aac7d07813164679d3df299b0ff07 SHA512 5fda491d896d9562e110f67c861546314b5b48582c70fa6f8d88672928329149becdb109fda87cd5cefcf340d5cc6bef5a1fbd8f9ee1d41f7beb76ca6bf27d8f
+EBUILD pwcrypt-1.2.2-r3.ebuild 692 BLAKE2B 16b69f9af2536c8b726cf01082ee86d0184a3e49505d9b67d2f6a6e273b4d0c0cdeab85fc1bcc9cbf327adce06a5fd0e94c5f6a5f1a916884aa266086d36bae1 SHA512 82d1418325ff55abb2acd0ffd969310579b8675bb947ea566b47a665adc3308fa60b79b236aa51112f02a00d53af11eb7d1a2f8b137e1467bef60a0671a9b95d
 MISC metadata.xml 248 BLAKE2B e581d975884f924f92f81a803547379276565617c24d86f893c0186a4793c1167a36cbd8083261a10ce99839b9e5b5dd29f237bebb644eaef29ced562c9c6310 SHA512 62ab121be05f0603fe52b26ac612943b049bc527ff73401e6ed427622fcfd7f07cf3fabae90ac9e30297692ec4188b1a8bdc1f9104e30d6ed4032a96ffd77cf2
diff --git a/app-admin/pwcrypt/pwcrypt-1.2.2-r2.ebuild b/app-admin/pwcrypt/pwcrypt-1.2.2-r3.ebuild
index 250ada02cb4d..c6beda5d878c 100644
--- a/app-admin/pwcrypt/pwcrypt-1.2.2-r2.ebuild
+++ b/app-admin/pwcrypt/pwcrypt-1.2.2-r3.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,9 @@ SRC_URI="http://xjack.org/${PN}/downloads/${P}.tar.gz"
 LICENSE="GPL-2+"
 SLOT="0"
 KEYWORDS="amd64 ppc x86"
-IUSE=""
+
+RDEPEND="virtual/libcrypt:="
+DEPEND="${RDEPEND}"
 
 PATCHES=( "${FILESDIR}"/${PN}-gcc-10.patch )
 DOCS=( CREDITS README )
diff --git a/app-admin/spectre-meltdown-checker/Manifest b/app-admin/spectre-meltdown-checker/Manifest
index 5236e892c1e2..7b6a7ef532b9 100644
--- a/app-admin/spectre-meltdown-checker/Manifest
+++ b/app-admin/spectre-meltdown-checker/Manifest
@@ -9,6 +9,6 @@ EBUILD spectre-meltdown-checker-0.40.ebuild 611 BLAKE2B be71069f07922e8bfe1ee462
 EBUILD spectre-meltdown-checker-0.41.ebuild 611 BLAKE2B 205796938c2b38c3dd99c7799cbf564be38be6ed377250e4f3e72da525ae80ce1966f53d6e4ea283496854923be899e9b01376f7ea952b6ec498b9f52ecec2cc SHA512 8f9b0362c498942079455927ac26dbefcdec549f216e1c250e0fd9531ff81ba1274f9142eb325bb0e0d3a5b6b8b006ced06714b9a0724f8be3904c137226fba7
 EBUILD spectre-meltdown-checker-0.42.ebuild 613 BLAKE2B 845c9882ebe3ea93f8658fe713845e4cab942fdd59a7d1888e4cc6a424defcaf4eee2a347169dce54b7ecd0f485c8310ddd6aa5b9ac260de3f213d9fb7347294 SHA512 af555d0e399c9cc9e100cb06e91821e74779286460262f87cf5bd0cd5832562fa6cad0a2f8bf80e01cfddd59a0722a4b2c5e3ed55d6bcc4207deb26e1e1577f2
 EBUILD spectre-meltdown-checker-0.43.ebuild 609 BLAKE2B 39958953adb67698958b6ad7334ff6e37576594e59f64d41ef287966d038015c5d4e7a2ff10be4d62babf968529492c09c214d1e848c43eaf83082d43c246194 SHA512 1dd5edea334b02a82be54de5ba33f24cf3634729dacc43044c8a69f61a72621b838a86a5e70a8dc552ea8e12b24bda12d14cc037353d19bbcd1c08e99402f791
-EBUILD spectre-meltdown-checker-0.44.ebuild 613 BLAKE2B 65a891d05a92303b23fa28da7d21ab0abd266bb71c13122d691d44449ad3202c9ff2f902300af83944da71dabe9db38e95f9809a72fb10ca341e71f6efc4deac SHA512 3cc924bd61d455ddede052b8ec88ca0709d342447259089e8f97f0de297f826db124a22a7efc2bbc9450f89e6e82b15dc5d340c4eac06f8f249240f7e1532946
+EBUILD spectre-meltdown-checker-0.44.ebuild 611 BLAKE2B 2816692ebd0c0c55b304aea8522227ef125a3b3086a1a2aed8ffe3318ae7b61b9195e6e19c57c94892263cf15354cfe294f535c82094ed00013d9492c9813f5e SHA512 134f48740571ed9a539413f64a2549263fdcc21382436cc5c4d6bfb2fe9957a8b20d34c271d1734756a3d6e68c812630d927df8ef3485fffc92dfd8430aeb6cd
 EBUILD spectre-meltdown-checker-9999.ebuild 616 BLAKE2B 1a0cd1b4cf550568a77bb037cd600cd9a54f4ff0eccd267a98b6849c1bfbee97ba967c78f6566a1b6349d50d4936b243714cec8b2e2d87509d3da9dee1048f18 SHA512 2c09e4d7b49095e2e1bd2a19fb26745898409295338167f5e8a77164b207984234b18c08916add448b7f31e6a2ae789ebc9bf955cf623e4678038d58fcaf572f
 MISC metadata.xml 345 BLAKE2B 07f3a6efa5ff3dd3f5dad5ae3b4dffa1286648795a31075bf64ad2bdf25e8b712d6aef5de0aa48a31cc059d528fe4b8165b71725e6e3b6a40e5b2aae9242f5d2 SHA512 7229e00a28686eb602be0a9d0bfa4124acd1dfa73edb5e7975d5ead0bfa5e7d64888a0eb6e1c3c3828f48d2081d29b7bacb48375d75ebb780f2e94915f858661
diff --git a/app-admin/spectre-meltdown-checker/spectre-meltdown-checker-0.44.ebuild b/app-admin/spectre-meltdown-checker/spectre-meltdown-checker-0.44.ebuild
index 470cde322653..7a9da7d72d9c 100644
--- a/app-admin/spectre-meltdown-checker/spectre-meltdown-checker-0.44.ebuild
+++ b/app-admin/spectre-meltdown-checker/spectre-meltdown-checker-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
@@ -8,7 +8,7 @@ if [[ ${PV} == *9999 ]]; then
 	EGIT_REPO_URI="https://github.com/speed47/spectre-meltdown-checker.git"
 else
 	SRC_URI="https://github.com/speed47/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 x86"
 fi
 
 DESCRIPTION="Spectre & Meltdown vulnerability/mitigation checker for Linux"
diff --git a/app-admin/sudo/Manifest b/app-admin/sudo/Manifest
index f82e920e3aa3..c4cc6ec048be 100644
--- a/app-admin/sudo/Manifest
+++ b/app-admin/sudo/Manifest
@@ -1,6 +1,6 @@
 DIST sudo-1.9.6p1.tar.gz 4119888 BLAKE2B 02bdb551c46cff11ac56e64937c64e6a29ccd8e0af34ea2f6b33c223bee8f7ad958d0fc3d7ef8ef12bf5bc82565769b923ff112a3f3d6bf6999fa4f6ea55e38e SHA512 632dfe72f04ce9a7a5a7236fcd5c09ce4535e695ced49d24dd848e3a7b1bea7380df44188b9e475af4271069539b5a5816948a98fbb0649ebebaba8b4c4b7745
 DIST sudo-1.9.7p1.tar.gz 4197591 BLAKE2B fff3eab8b4de6276135229c5fe12e7eced98af988b7686600e6a63b8615f6357ab2c5f95ef6f1872534476c4398a28c4f468ffc316e0cff7d4b32e6068aa97d4 SHA512 bc85d9de1566de24883375edd1c4cd24b1f24437bb16d181bfa3c9c94cead220c69ad00d6727560ca195765ced970e95d69b9ce01dbea448de39afac9a902fb4
-EBUILD sudo-1.9.6_p1-r1.ebuild 6705 BLAKE2B 9092aba09021464c58f7bdfc8565b9206a348c716bebeb51f074fdc979bd17d724d576cd5a46ad0800e8371d9841be6dfc40bcbd1a7945802839da418eb31501 SHA512 8f6ead478ea174163731da20b779b2677c37e8f10a373cafcba397e3c5e364af92b191d85360b03373ee3fb9cb4d540375f19194a75db0b704747f79b576d477
-EBUILD sudo-1.9.7_p1.ebuild 6659 BLAKE2B 85c293bc01a785f063bd70fb42dded28d0cc07eac8c83f9d3a37e3291de0cc997f9d67a64bb43777e579431fbe17c3626bdd4a7fcad85e94062d2162543488d3 SHA512 9d2b56674ab5ef1d6735c7b12e83a18591661dfeef455d844a61abd2730b5713ff95956e24994bffcb2a5de5e9dc724b9072a3559c9bbab2b5c03800340118ff
-EBUILD sudo-9999.ebuild 6713 BLAKE2B 00d76cb0d10ba205c2f71c50872e3a888a15bbb749db0f099fd865c94f004dff3bfe3900bbed625db307917cda05480a79e4d4b898aa136e6495a51da0fb66bc SHA512 dfe8ab766cecd966c1304088ac7b1e4b465dfe84ac686da4d8716f8678bd6b6697cd585dd7f975a78b6183cb1066c72b2dd0c8d8b50ef3715b28b65dcb488d46
+EBUILD sudo-1.9.6_p1-r2.ebuild 6725 BLAKE2B 620c20c144bb7fd723e3e46022dd3e6152084978091e2e3af0a95a961dc027defeb5d20dcee4b0e36959e04124586a2c53d65c8137af9d1f52a6044392c08aea SHA512 fc61898d795187d7ab0876001c725bdb2c5f0c98ab38adc8427f69abc1da8b33be6ef8ebe1353ead193f10f48ed042fe12a13f90c181bc3a0d3cceed352bc262
+EBUILD sudo-1.9.7_p1-r1.ebuild 6679 BLAKE2B 7f549173042dedae316d4b9d0fc76dbb14d659c8633188abc4a0c40d5a8e0a9035184267ba8b3e964729a5e40673b8c7633f97adf5eeab5f9507438fa59c9a57 SHA512 9f92a6dbe26990ecb27c55539d09d875b87373139aa20fe2c39795addacdb852c959416ede36734ca4ce3b0e353558fb6ddeb69840a2c6783e3e339a7c0a448f
+EBUILD sudo-9999.ebuild 6733 BLAKE2B 46f131886f02d8f028f1ef3fb9e832bd1f070dec0796fbd34f21813fe0b0e9b653b3f5e6af50d5fc1d10ca4cd8b638e0408c2a4a796ebf68d9abe8363db041d3 SHA512 6b1db30bc2b57ba72f68c2785de5dc856d5062aa90034b27b3ca3a9b40215e9493ebe46830b796b76968cdeeae774e7fd50dd2997a1ee5dd9274787fe93fb344
 MISC metadata.xml 1049 BLAKE2B 7b4bbe6469dc6e683d73b81d055ca3b7b3ae610e2889edcde54b735cafa91d1a186268d70c96f5e90a4fcf90f4750ecee9eb4823fcbde5b47dfb9ebf27845b2e SHA512 7a9a9c9e0f457ba15355d5f14dbe0fd187485df6f9fad0c32a4e39850947e4bf1329370a52e4eb7396e0ee55c81fc31ea8569895e0d4608983b4b703d0dcc761
diff --git a/app-admin/sudo/sudo-1.9.6_p1-r1.ebuild b/app-admin/sudo/sudo-1.9.6_p1-r2.ebuild
index 90a302b16b67..508aab94648c 100644
--- a/app-admin/sudo/sudo-1.9.6_p1-r1.ebuild
+++ b/app-admin/sudo/sudo-1.9.6_p1-r2.ebuild
@@ -34,6 +34,7 @@ IUSE="gcrypt ldap nls offensive pam sasl +secure-path selinux +sendmail skey ssl
 
 DEPEND="
 	sys-libs/zlib:=
+	virtual/libcrypt:=
 	gcrypt? ( dev-libs/libgcrypt:= )
 	ldap? (
 		>=net-nds/openldap-2.1.30-r1
diff --git a/app-admin/sudo/sudo-1.9.7_p1.ebuild b/app-admin/sudo/sudo-1.9.7_p1-r1.ebuild
index 4d5f317bd544..7f613e4fb615 100644
--- a/app-admin/sudo/sudo-1.9.7_p1.ebuild
+++ b/app-admin/sudo/sudo-1.9.7_p1-r1.ebuild
@@ -34,6 +34,7 @@ IUSE="gcrypt ldap nls offensive pam sasl +secure-path selinux +sendmail skey ssl
 
 DEPEND="
 	sys-libs/zlib:=
+	virtual/libcrypt:=
 	gcrypt? ( dev-libs/libgcrypt:= )
 	ldap? (
 		>=net-nds/openldap-2.1.30-r1
diff --git a/app-admin/sudo/sudo-9999.ebuild b/app-admin/sudo/sudo-9999.ebuild
index 8bcbb9d736d4..3351bd020d3a 100644
--- a/app-admin/sudo/sudo-9999.ebuild
+++ b/app-admin/sudo/sudo-9999.ebuild
@@ -34,6 +34,7 @@ IUSE="gcrypt ldap nls offensive pam sasl +secure-path selinux +sendmail skey ssl
 
 DEPEND="
 	sys-libs/zlib:=
+	virtual/libcrypt:=
 	gcrypt? ( dev-libs/libgcrypt:= )
 	ldap? (
 		>=net-nds/openldap-2.1.30-r1
diff --git a/app-admin/syslog-ng/Manifest b/app-admin/syslog-ng/Manifest
index 5422f9128ff2..1cb60aceb7e7 100644
--- a/app-admin/syslog-ng/Manifest
+++ b/app-admin/syslog-ng/Manifest
@@ -10,8 +10,8 @@ AUX syslog-ng.rc 1891 BLAKE2B ff17e5b3a999813e869d3142ae6800b80a1569e7344f8b65a0
 DIST syslog-ng-3.30.1.tar.gz 5707042 BLAKE2B 3e6ee58b3732ae4863de43c7d22799a74074e94dbbf735368c09c11382b641a5554a4a25ad836b4ac25c8a4f64781dbfb1d9ddd6961ba3aa70c4213cfec81bfd SHA512 ac7ed4978c6db9464add30aa7aeb71a646f841593b02884c8d4ad34c0508c8d3243bcbe6ee98e81c04698895305334eadd9e624ba71e510c14d79155723efb52
 DIST syslog-ng-3.31.2.tar.gz 5727835 BLAKE2B a71190fe1580702a4d904c8a4d31a123d2aa0d01bb5a6e21f32f8502ec99f6109b45537c1a5022b0baeae89456b4b919bb8c88077d00aa9724398b7588254d89 SHA512 22a647c37f87fb1a45c8c69c2b0a022d1886cde5b0d585c3384b606d967c3f320a18e34810655174e82c797c0dc23c481732ecefd5be16da8fba4983b2ed0385
 DIST syslog-ng-3.32.1.tar.gz 5782744 BLAKE2B 43600ac7bf3bcd090353aa5a3d3b3c7701b8794328a111a0ef306dffbf5462880ef3e86f4f8b63580402848b7a4e333112ae1c5514c5e8d41103db4a0d4de159 SHA512 c5a72e4815c2791cb609cbb93993cbb2c52f3ac869e062984b6a359f11232f523c5db3555857f0fef0071764a677f1efdb2aa1f24b4abe7cea13590973d09280
-EBUILD syslog-ng-3.30.1-r1.ebuild 4910 BLAKE2B 3a745d7c4b815da818cbd50635cab0170aa3891b7ca44b5e58ea1b022c2811dee86cacc991071d53090818db6b0a84a06f931d2b9f723e094e7369ad1b4b5b20 SHA512 b9da09ba79a4e1216865d9c2971b4e98ee13650398d0fa5cb0b587648951fc15dddf3a0675c30b88fd724cf6bb1e3464a6410d0ec3a460a3d062689578f359f8
+EBUILD syslog-ng-3.30.1-r1.ebuild 4909 BLAKE2B a8a51f5bc87ffe70bac0734aae92de435b8425121b0a4b34e9279303748372975b79d4d783662b11d2914220f6d69cf5165646b4d37df3448c853f21788ef8af SHA512 68c595a2ec8206a2637302be9b0a171fcfd1fdff327b8f813ac9cb7cb7ef614540a010d42ff13afb74591643b3eadc30dc31a97b129edf455b40f5a0a94a31c2
 EBUILD syslog-ng-3.30.1.ebuild 4837 BLAKE2B d58b8f79ac4f99867cc6b1bd4774a95f4dc1c9d91c68b87bec0719dc55d9741e2475f7deca471f908627c5bc914ad30c006c31d3e8ff87ecaf43bd1a66ce536a SHA512 eff8014d2f648e799ee0b090cd24d82ad610b022d1eb023de5d4f19b0f8138ee7b2993a2d067486ab7a532fed474288da1c413562ced38c32f3981886813cad2
-EBUILD syslog-ng-3.31.2.ebuild 4933 BLAKE2B d1493e6465cf83b3f08da8b57e8c8622d31ea7f56f550e789f9575287654e511a80a37e7f19bacedbfcea3b1b271ccff5c974c4e16d09323254b26ffa398b05e SHA512 5bb0cf89069dc0da0772cc0545dcf5eb4a8cca650e0b1e762f1199ef0cdcdac43680eda2e37f0d9c47faa7c8b0aa813d149df40840ee3aa5a63aa1fd7a21e8ee
-EBUILD syslog-ng-3.32.1.ebuild 4934 BLAKE2B 91e7b7124580298ef3247316ca1c8b665e4260baac5deb277b9da67463ceac5df19de83275c0d46ef4474ea4d63d728e6d23efe4d1ba013937b0cd0999ce4fa8 SHA512 bbb1be3acb51d64acd12246e8f16a7d38f42c42feb13d770bed6e1e01dfdf87f406fdf35a2a09e9d767629ae3b7a85b60c980abb3a19a1676e85631b510e28a2
+EBUILD syslog-ng-3.31.2.ebuild 4958 BLAKE2B d27b330f6d6fac38cf868ac312e3d4892dc1b68570f376199aab7fa5ac37c0ffb41844b68b3be5874b53b7eeafefdd1f56b9bca7b2b6faac518efea9a90f7d81 SHA512 8ae3a11527b321968f320081eb8dcd73ae0d84af5d69ec1b0643eec9fa765b7595899c5f82c936b97adfb129e66d02f505b1bbbaf4a686e20685118fa17620cb
+EBUILD syslog-ng-3.32.1.ebuild 4959 BLAKE2B 902ef123297547f66e5709ea8a50df5cfecb9e42427bd924e02ad142a8df897039b1d1b24ee24f68638ff62c87f07ccac33241a842592bf3aeb063ce2b9131d3 SHA512 7e9c087709692f4d71a211707681ba2119fe0d943fb1ac08d79340486f071a8e2b5f9dc535d98ef3199c0d05bfa58b3eaf88f8d335edf2d97acf8431e043ad8c
 MISC metadata.xml 1282 BLAKE2B ddf01d9efaf2b8ad6aacbbb5a27299f14a5bd2656139960b61fb8855286c23a1a736ad4d543d16bfe50d277d20cce51249f572d3bbb428060a07c23ab78d90fd SHA512 7eeeb124214ae491905e42d726d2d167168425a66eb59802c9bb364f3a14337d0732afbb6cde7254a49e259573ca6eb5ced4dd737718d6a0bab450f7f3498964
diff --git a/app-admin/syslog-ng/syslog-ng-3.30.1-r1.ebuild b/app-admin/syslog-ng/syslog-ng-3.30.1-r1.ebuild
index efaf5d70e266..cd6baea156db 100644
--- a/app-admin/syslog-ng/syslog-ng-3.30.1-r1.ebuild
+++ b/app-admin/syslog-ng/syslog-ng-3.30.1-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/balabit/syslog-ng/releases/download/${P}/${P}.tar.gz
 
 LICENSE="GPL-2+ LGPL-2.1+"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 IUSE="amqp caps dbi geoip2 http ipv6 json kafka mongodb pacct python redis smtp snmp test spoof-source systemd tcpd"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 RESTRICT="!test? ( test )"
diff --git a/app-admin/syslog-ng/syslog-ng-3.31.2.ebuild b/app-admin/syslog-ng/syslog-ng-3.31.2.ebuild
index 54e1d5e80da4..3083efc98107 100644
--- a/app-admin/syslog-ng/syslog-ng-3.31.2.ebuild
+++ b/app-admin/syslog-ng/syslog-ng-3.31.2.ebuild
@@ -41,6 +41,7 @@ RDEPEND="
 	tcpd? ( >=sys-apps/tcp-wrappers-7.6 )
 	dev-libs/openssl:0="
 DEPEND="${RDEPEND}
+	>=sys-devel/bison-3.7.6
 	test? ( dev-libs/criterion )"
 BDEPEND="
 	sys-devel/flex
diff --git a/app-admin/syslog-ng/syslog-ng-3.32.1.ebuild b/app-admin/syslog-ng/syslog-ng-3.32.1.ebuild
index c99ac514b585..a9238b77f778 100644
--- a/app-admin/syslog-ng/syslog-ng-3.32.1.ebuild
+++ b/app-admin/syslog-ng/syslog-ng-3.32.1.ebuild
@@ -41,6 +41,7 @@ RDEPEND="
 	tcpd? ( >=sys-apps/tcp-wrappers-7.6 )
 	dev-libs/openssl:0="
 DEPEND="${RDEPEND}
+	>=sys-devel/bison-3.7.6
 	test? ( dev-libs/criterion )"
 BDEPEND="
 	sys-devel/flex
diff --git a/app-admin/sysrqd/Manifest b/app-admin/sysrqd/Manifest
index d6102f549e95..612ab4ec8c3f 100644
--- a/app-admin/sysrqd/Manifest
+++ b/app-admin/sysrqd/Manifest
@@ -3,5 +3,5 @@ AUX sysrqd-config.patch 421 BLAKE2B 9cc04c7c31c39f1015b95aaf5c695a2221b65d2c4715
 AUX sysrqd.init 700 BLAKE2B 2570aeb1b01d098bd8330a9e78c85708013d3ee09318f84a1e5f088ffc2a32077cf6e18bc3413106724d7fe024bea9720f6f20c5a28a5fb5a775a219ed7c95e4 SHA512 9845a09cfa20ee9cd09e61e142cf53aaf482909ce3ec1401743864823a7bd45ced812fb235eef2adb914c3c624e227fa5936b73e1b83d8a3888fb25498980918
 AUX sysrqd.service 166 BLAKE2B f6963ca6f1fac672aa400c40b899e56f436e674bcc88bccae63f2f529624fedfd193137da157b0088f8c9c14eb22d9ccc261b5f131451b0269e5742b7238c6ce SHA512 fbac57e9367872cd7289edb24d1fce259fb1b39c3ad5484c259cb7bcc56db84fb21019fb6402759025329db26360f427fc9235f743a49fe2198e44ac8443a69c
 DIST sysrqd-17.tar.gz 5232 BLAKE2B 4fd3baf7bce45b43577db7cd4a383161a8d69bd88e041afe20c33d3812235829729c57b748321195c2bccea819827655080199c0167bafad7252ca29b2a3a27c SHA512 fd0e42d2edd5e8548510aa823b2fef6339b2dc1dde1fe387585b9f2611e7d944fa6d73447e3f58a0aa00d45a88459c6e9cbb619428282abf367f62a8270e5d54
-EBUILD sysrqd-17-r1.ebuild 1350 BLAKE2B 41d94d29437692c868d8e8734c60317940130bfbd149597985ec170bb981eae63afc2a5d427f8dda93fd6035dea12235680814fe82611e2c2e06dce79c8a6230 SHA512 1ae634662ea246aa4d22b72f3897915de163eac159b4c9d05cebb6456b98a3daf890fc9fe0cf4e6908578833d9b3000bbfb34f978f4c72954ce85ea7f05503b2
+EBUILD sysrqd-17-r2.ebuild 1400 BLAKE2B fdcbfa815d54139e9edbae3d8f2cb7d7c90ffdf71fe05a1250cd1821b4bb4a6b319df8304f9a7ac9d6e059df1f39b854b52cd2dba04c3996e5bec0650ab3d88f SHA512 a367cc13126b57673c55402210558a9a371d2c3993f2c0094dc06ab686041a6edb9b70d15546eac74cc32ff65aef158bec2f0aa6c54513c799563d21e4a766fd
 MISC metadata.xml 487 BLAKE2B d55392a182dbb4c56643dd7eb11ceeafbcdebcc627a65794d6602575a4f2a4d4d3c33037281f43693e1b523d8189c36f0af7f6e91166eb64d6863e80aa6533bc SHA512 e0401a8d41c20ee5e097efeed147bd3ffc2f61650d34f8e74508f58b7c07da29c1f9d12fc59ceea607a15dc8d4fce9cc6410226bff35e02fa09ab49ae2389e38
diff --git a/app-admin/sysrqd/sysrqd-17-r1.ebuild b/app-admin/sysrqd/sysrqd-17-r2.ebuild
index 337bac7f13dc..e9ef978e77af 100644
--- a/app-admin/sysrqd/sysrqd-17-r1.ebuild
+++ b/app-admin/sysrqd/sysrqd-17-r2.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
@@ -13,6 +13,9 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 
+RDEPEND="virtual/libcrypt:="
+DEPEND="${RDEPEND}"
+
 PATCHES=(
 	"${FILESDIR}"/${PN}-config.patch
 	"${FILESDIR}"/${P}-fix-build-system.patch
author	V3n3RiX <venerix@redcorelinux.org>	2021-07-03 22:39:47 +0100
committer	V3n3RiX <venerix@redcorelinux.org>	2021-07-03 22:39:47 +0100
commit	7f0ccc917c7abe6223784c703d86cd14755691fb (patch)
tree	8c6793f68896b341e22f33d7e6cef88e481f4a8b /app-admin
parent	9aa80713372911cec499b3adb2cd746790920916 (diff)