gentoo resync : 13.11.2021

8 files changed, 4 insertions, 997 deletions

diff --git a/net-p2p/Manifest.gz b/net-p2p/Manifest.gz
index 83bd64167705..ea00c414757c 100644
--- a/net-p2p/Manifest.gz
+++ b/net-p2p/Manifest.gz
diff --git a/net-p2p/ktorrent/Manifest b/net-p2p/ktorrent/Manifest
index 8878af45f400..cf5a66942c7a 100644
--- a/net-p2p/ktorrent/Manifest
+++ b/net-p2p/ktorrent/Manifest
@@ -1,6 +1,6 @@
 AUX ktorrent-21.04.3-fix-tests.patch 1093 BLAKE2B aabbbca3fcf6cdd8d8b9d5c49732351e6daf2da710b984a439a43fb26920ad250f0226a4aed0edb3940852034480fc0bb737bd3579d44924b1385aa8cec903bf SHA512 d65322f860482b0fe7983ebb1642df72bf358cea96816ecd9975126e8c63ac5b2dc3db9410ee17fd61e7085cf26e23b33f1e23d47d9cfd4363e264a6c26df4c2
 DIST ktorrent-21.04.3.tar.xz 2091116 BLAKE2B bd03c3730a5082c17c58d6453d035fa785b5ee6e0f253d5cd37adb5e43508315deedbdd423a2e453a116a8ab9dedfe78cef063fd11262579d910b1a0f5a36e05 SHA512 70e8baf2d04fe86be09fd4583ba20375ccbec67e5e8b7a8aac252bbe04469ccfb36c55fc5088497f8575f3bef59cff40f48f648d73071e06f676b45504aa935e
-DIST ktorrent-21.08.2.tar.xz 2090852 BLAKE2B a59073b873364af2b3237295ed0a4abebd21998704d7fc3118c603cc6ca181cc1db8cdc085062eadf3c2407337169d9a64a89617dfb9af19fc74263b14b7ef40 SHA512 a8121f20666192ca453468441e4f6d7e55b9e0a8b49adf61ed3b393156ef204da1ab87e08fba05c44504688b7773746530dcbb13ebed7e74fe95c1febdedb622
+DIST ktorrent-21.08.3.tar.xz 2091880 BLAKE2B aa0c28313d86fec1e472582dbf68023a71cee5c9fa301e243c3e4bc2e25987fcee28b34f21264b253eb1eaac955e4d2f994e5936f75bb6182fdb648617382ff0 SHA512 10ebe41f9ef85d1b6ad927e197193fff5d776947e4a8c4a5d3498d16304372b4ca8afd993a94d783934b89139a375ab86dc4893b1c7eaae2b4f70f02fc36ab5c
 EBUILD ktorrent-21.04.3.ebuild 3125 BLAKE2B 229f27055539af4f7d00649371ecc307763627714c760f2e55151b02fd40202d72a742528f6dc18e8c6c8538d92451da8732c7c952857831ba4028bbfc3f9cd7 SHA512 ccb2aa1b02d3277dcc8948418383b838cb2bd8b658474c9a02503967612773b6400b5a94d1a5af59de5aac113c90815196650bb57a22fe22391d5166da4b2149
-EBUILD ktorrent-21.08.2.ebuild 2941 BLAKE2B 47bff30f8a64f8da0d399a496734ddd745a26a58976c6d06b95174d551322df7e39e19a804d16a9945506b592920bfeff926f8a29a2960cfae5c0af8f1e5f42e SHA512 b9118f524e448c6cbe220fd758ec5a1e75c92f8c71f4de01c7f39bc5fd10dc0fac53360cc62db76931e85edb22ad5a66fa40652a6f94b63574c7396ed6c6153d
+EBUILD ktorrent-21.08.3.ebuild 2941 BLAKE2B 47bff30f8a64f8da0d399a496734ddd745a26a58976c6d06b95174d551322df7e39e19a804d16a9945506b592920bfeff926f8a29a2960cfae5c0af8f1e5f42e SHA512 b9118f524e448c6cbe220fd758ec5a1e75c92f8c71f4de01c7f39bc5fd10dc0fac53360cc62db76931e85edb22ad5a66fa40652a6f94b63574c7396ed6c6153d
 MISC metadata.xml 1458 BLAKE2B 6cb8c49612708be4a5937596081fa07e1cccc8cd5403a0d6db143b981b3a317b7f66fb4d35186a15b214e0a66efd2dd0ac82058cd1bf2198d398273d689755f5 SHA512 9e269df4fd401aada56e3cef3b93917ec04c3fed481be9de25f9f23a16804076ec7e2415f9571f359c3b4f4276ae6f852888a739cdc78d17846ef4c0e40f9362
diff --git a/net-p2p/ktorrent/ktorrent-21.08.2.ebuild b/net-p2p/ktorrent/ktorrent-21.08.3.ebuild
index dd5bcb4a1f50..dd5bcb4a1f50 100644
--- a/net-p2p/ktorrent/ktorrent-21.08.2.ebuild
+++ b/net-p2p/ktorrent/ktorrent-21.08.3.ebuild
diff --git a/net-p2p/syncthing/Manifest b/net-p2p/syncthing/Manifest
index de3b5a3296c1..76aa3cc03a44 100644
--- a/net-p2p/syncthing/Manifest
+++ b/net-p2p/syncthing/Manifest
@@ -360,7 +360,6 @@ DIST github.com%2Flightstep%2Flightstep-tracer-go%2F@v%2Fv0.18.1.mod 414 BLAKE2B
 DIST github.com%2Flucas-clemente%2Fquic-go%2F@v%2Fv0.19.3.mod 814 BLAKE2B 110bd6c2e87e936b8574c0bc0a765dd34cc747c238aa88f6e595cefeee516df985bba5a21fb9dc9d871e543b097f08f413134c16d22e18aaddf5427b88de1199 SHA512 3c8afad992ae7ddb5a98dc28d410465b8b46e660f69957fb8dfe3451ebace00bbd8fb7b9ec9998ce6129df3300b2eb8153edf26181641d44f9c9c063225b62f2
 DIST github.com%2Flucas-clemente%2Fquic-go%2F@v%2Fv0.19.3.zip 728621 BLAKE2B 74936af3fed3ccaf9ce932a8b75b5dca7c23fac9295dc69a133277da579ab9e5b6203e3dc0fbafaf8ee7fa84c514c2e347d8e527bdf466836b12d1392765b383 SHA512 791bb623c9decfb027bd450b7f789616d737ef7ddbe1b4a89b33e9167dce8b65be66820fb82171ffe30a8ace37c9ec14060cc936d33a2264f08d160aac33266d
 DIST github.com%2Flucas-clemente%2Fquic-go%2F@v%2Fv0.22.0.mod 697 BLAKE2B ca7272f288d2ddc7d207c4e07aabd3a7ee72ce709bfadba36543c268ff260e7b16c1e2df4eb280a042df02b8134596fbaaac8502924d56283c5be4ffc62d8bcd SHA512 f09e4799139ba0a0e635ba159b6381205d8b1ed98073dfb7a5760817a7a43ad330c79d485c8a0167ab900795feefb9c9450257221980bc54d81b44a3f8d958c5
-DIST github.com%2Flucas-clemente%2Fquic-go%2F@v%2Fv0.22.0.zip 745338 BLAKE2B 79b27461b0d00de7811757d5526d900e2e1269afd76e4f00b3f6441771bc67543d7c3cb5af675862f9469a177a4f121344e594d03897747a197495d0e2a087fe SHA512 e066efead5b2938bb8bf18fba314579c8d3cb477884a02902648effc1851a834f7ba79e2cd1a5e438a120876675d5785d74df65d2ca1e61eb27ea447874c169f
 DIST github.com%2Flucas-clemente%2Fquic-go%2F@v%2Fv0.23.0.mod 646 BLAKE2B de936cd0ba8f001e958cf99d355750f221ef2e0d09f191d0cb2523c22a5a475afc0e8b5e91302ec23faa1595e21094a74a7d09fa02504fdd34f7431c4fcaec56 SHA512 b95fdb9bf88b21d6b216c66d8091e0b967e6924d78fad7a586497723d17c2ab69e8318f55afff453b1c3e3c8baa077c013d3f53b3c1b9edbc0c986984a7a41c9
 DIST github.com%2Flucas-clemente%2Fquic-go%2F@v%2Fv0.23.0.zip 744542 BLAKE2B 92a778755817371999db9ff7a29ac83e530b42ba4bcc8554f7f099a69e1fc77c6b0cfd920480d0a4bf88afea602500f963eeab97f5b7c34c73065d5daf4e411c SHA512 6c89652f78922e4bf4813ce3ebcf14654a5229d3a893979352563a29e1c9bb6c49d4f157ee95b026358ea1ebdce331810bd712dd74241a8911f41fcd222f0f83
 DIST github.com%2Flunixbochs%2Fvtclean%2F@v%2Fv1.0.0.mod 37 BLAKE2B 0d60c4f85be76a6a73bd4b6403a73e12378ceaebf9dd48bba245ab0e14e846bc1fb480671f959ff56d52c5e2b41db8de0804d4258fb4cb58d6b0c618c1401104 SHA512 6a0913935e88940258478e250207882eb1df8727e18e66419ba5d4a06a0b2c8691642ed379d4b4ef16df715893b35e59d1e967d5276e6b0ea75b1f481e852a65
@@ -373,11 +372,9 @@ DIST github.com%2Fmarten-seemann%2Fqtls-go1-15%2F@v%2Fv0.1.1.mod 207 BLAKE2B 5b3
 DIST github.com%2Fmarten-seemann%2Fqtls-go1-15%2F@v%2Fv0.1.4.mod 207 BLAKE2B 5b3d5ad841a5d0141a734651988d7d4fe37edf8f0452606a9368db7ab760986d6910a62c1f9fe404c02eef38f24b01ecb89da7131b8dbf29f771032bf0b26306 SHA512 a1596052f6915fbb2d54b6d5ec302f4005630d26952d42dd645a9beb62dfe65a80715a0de4bd64b04712c40fa3d67bd6ce4abd0c98a07ec0cdf37281ffe91f9a
 DIST github.com%2Fmarten-seemann%2Fqtls-go1-15%2F@v%2Fv0.1.4.zip 590040 BLAKE2B df415074caba9999d8583ffe6a569171b9c45b2b84cc1a14333def1f5cce3e20f62ca3a721d9d20f59e56fc952f76f59a86bf78198291273dca34173eae56534 SHA512 734a561d804aed867b4ce6c919ca94365d388c4285d0077a48ed123e71c52b9eb68d3edf49eaf3873706595eb2c3782b1636b2c3c6fb051df188ed2345abdb5d
 DIST github.com%2Fmarten-seemann%2Fqtls-go1-15%2F@v%2Fv0.1.5.mod 207 BLAKE2B 5b3d5ad841a5d0141a734651988d7d4fe37edf8f0452606a9368db7ab760986d6910a62c1f9fe404c02eef38f24b01ecb89da7131b8dbf29f771032bf0b26306 SHA512 a1596052f6915fbb2d54b6d5ec302f4005630d26952d42dd645a9beb62dfe65a80715a0de4bd64b04712c40fa3d67bd6ce4abd0c98a07ec0cdf37281ffe91f9a
-DIST github.com%2Fmarten-seemann%2Fqtls-go1-15%2F@v%2Fv0.1.5.zip 589922 BLAKE2B c9c8041d110dcafe7df0fd532ec2435e3869ba48643eed17589fb48625981a61bb39699a88789f1526085a08372ce6d803bb5a2bb805952b0bf5ff430edde5a1 SHA512 dbdfd1395bc50605da2f7bea5c1aec1f09d0e6f097e1b2d986fab925e073e972eff5d90937c5c92f0347b97be55dece1314d6799c2142d491b85f67428d05105
 DIST github.com%2Fmarten-seemann%2Fqtls-go1-16%2F@v%2Fv0.1.4.mod 207 BLAKE2B 88686761625cc8faa400c84dcff15769a2dce8f2557ad34b2c3012f8f52d5f287ff8654bb0c6ddfb389afbfc8d473f5d3e707e10d281136ed20bcb7ddabc189a SHA512 cd2717403e092ca6f2083031ca3abd1d26c0b8b5c73250e6f9ecc4380ef61147a85eb98bc5d1e8879b2ff2850a3a7622c8a56b57c17b7c48cf60d4fc229258d9
 DIST github.com%2Fmarten-seemann%2Fqtls-go1-16%2F@v%2Fv0.1.4.zip 589598 BLAKE2B 1fe2f3ba3918c35d457b474c1c1df604446b1f138f6b1d489e65410e51b1759885520769e6368d4d8bd133953501782bbd862040b71dce9d73dbae1708171723 SHA512 bf432876f4e7a3d18d2e53f65eb79ee4e69771b77016246d7ad843d54b8ffc8ee50defc7257535763e81c8692c42e3ee2bf3314039a96f0a36757c60926614e1
 DIST github.com%2Fmarten-seemann%2Fqtls-go1-17%2F@v%2Fv0.1.0-rc.1.mod 265 BLAKE2B 49ca5d356079ead8dc4a49f38f4eaf1feb67bb0cfe083d0376f024b15c523f2ddcc970c6f526b883fd8815a78308a8ec2feebf90920bb33600ddec5cc062c04d SHA512 59e5b0998f94410a46225005f90d4f9099785ed09214c93b2436e854342a5565c454d5e499c52a55de7cef6832d8a6b541d7495f332cac0aaf45df5f17d753fd
-DIST github.com%2Fmarten-seemann%2Fqtls-go1-17%2F@v%2Fv0.1.0-rc.1.zip 598543 BLAKE2B 1359c71d62d5fa6b48e14d5bdd63475442b5cd35fee36d7634d2605f024bb7632583e571e7025fdc95d21dc26da6e690463317630b3c76b8f39ee7db7c3334fa SHA512 275e646081d13ef4fe9aabedad7b49947e72e41bb6578c6a4e1381fd385f2a2445c7f90bf0bfaf0f9b6bdb4ad5694bd7c1520644827a636694dad68ffc5c36e7
 DIST github.com%2Fmarten-seemann%2Fqtls-go1-17%2F@v%2Fv0.1.0.mod 265 BLAKE2B 49ca5d356079ead8dc4a49f38f4eaf1feb67bb0cfe083d0376f024b15c523f2ddcc970c6f526b883fd8815a78308a8ec2feebf90920bb33600ddec5cc062c04d SHA512 59e5b0998f94410a46225005f90d4f9099785ed09214c93b2436e854342a5565c454d5e499c52a55de7cef6832d8a6b541d7495f332cac0aaf45df5f17d753fd
 DIST github.com%2Fmarten-seemann%2Fqtls-go1-17%2F@v%2Fv0.1.0.zip 596960 BLAKE2B cae1cb1cbbc71f0d1e005020e7ea701c746ee3f41b71e41a264793b0d64c7d52c6b403c11835141bdcd9b4d5ff5261642ea0591697f709b8bb64424bf9c0dfc9 SHA512 777f2f8904c4afa94535532911ac0762e5b80330ab6d961b2a3bfe73ee711d52aab20dcd6e06344e8665229b84e05bf5a69736e52029abcaff791c974f6b4ef5
 DIST github.com%2Fmaruel%2Fpanicparse%2F@v%2Fv1.6.1.mod 316 BLAKE2B 6649d42b1fd54d3b7c612aa8ff0ce37121dddbf6593f61c7f143c139c657d8d00563aca015bc6c0d398d86cecd1de45dde9193eaaa75136d40a6add13b33d364 SHA512 e987c06c58ec8ff71d8def505eaab35f9a101dfc04be45030cd519f140a1b40b95bfcaacd112db2ff1c150c6916b3eed6ff8c5a0aa204bae123916bdef5e59ad
@@ -646,7 +643,6 @@ DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20200622213623-75b288015ac9.mod 155 B
 DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20210421170649-83a5a9bb288b.mod 209 BLAKE2B ae212ac1167b75a96c3b74f33594fa85e980530886edcf3bb58fb5e077793d24e69d1015e8581caafcc78b2d41cc75e4e17e82b2d3f76f10058ff5a715f00641 SHA512 c2a45c244884d6ccc5c4f73b6b3852d28c9ed1d3acd4805ff36292681e5011284af42ab75ebf6274cda4cc3bcd426496515db7eaca2a529500c0e896190f26a8
 DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20210421170649-83a5a9bb288b.zip 1865984 BLAKE2B abd0df884c2851ab704abeb85c69a2adbe22d06c157475c696fd051532f445e294d565c0660e57ead8321bb81fb8d7577f58bcf3bf733267161837d04e1d3aac SHA512 6ba80db2a779423dc5d67f5cb6a70f86149cbb8d710c5ba6bef7dd9cc13caee548f04adfd47b74433c640b1eb6ac0a8ea6f14d44c95e316f9484c63d738478d2
 DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20210711020723-a769d52b0f97.mod 247 BLAKE2B 20aabe045c2a6dd88b13c66106c962e31d3da87b33accf5085106d9e9c43fed4d5867909580ad37ea560d791e1a3243ddc2dff81ac6205f7fb949a46b0c3634d SHA512 32f94123c2845965432016800e6f051341f6d5d0af3678e367ac6c55022c68e86e929cc545a576d466f2533c235c29fb72542de75eae7419dfb5640cd80df3ef
-DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20210711020723-a769d52b0f97.zip 1874721 BLAKE2B f6374336811be4922eca9207154b37d67479968a570768a88d77c3fdaef70e4573e59ae3e2bc09e15262651e414eeb1d0c5a9c5faf558f013e355693cb1589c5 SHA512 dde077a273c3b6851385e64c5621a084287b92b62e2a96ef6586cc2fb7e8e84517a54ce1d6354a0b64d8d3df1de6c3081699730a30ca61dd0b082f0993725f86
 DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20210921155107-089bfa567519.mod 247 BLAKE2B 20aabe045c2a6dd88b13c66106c962e31d3da87b33accf5085106d9e9c43fed4d5867909580ad37ea560d791e1a3243ddc2dff81ac6205f7fb949a46b0c3634d SHA512 32f94123c2845965432016800e6f051341f6d5d0af3678e367ac6c55022c68e86e929cc545a576d466f2533c235c29fb72542de75eae7419dfb5640cd80df3ef
 DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20210921155107-089bfa567519.zip 1878482 BLAKE2B 0eef87d2e4c8998450fa976e54b3d00625faad61125a442e3c824763e803257061a05d9046e3c95659cb3a18f8c0f37bea529bcf53c79fc5f7034f1f6d9d1130 SHA512 c49fad474be5b84f99f2cf45970bf1bbdf02f4ed6c8c9d6aab8d672e49972059d4f6f0535bae7647b2d5c40c7a2168a20a0557e1cb29d30811b719f50aa6b226
 DIST golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20190121172915-509febef88a4.mod 24 BLAKE2B 9615629f1bf7d58419f5b73842e19f6be3a8c8cefb217364917f1aaf68aec00de41d96700378b048d6cc385e154ed6d3db59256b4a00e9165bac7951cd0bcbab SHA512 9131017b8ab0c2362b74e0c010daeb849689025aa31cb464dc379b0e34d0fcdb66749329b111041127997440bac052249dab522ab27239858405c056e3ac5dbf
@@ -682,7 +678,6 @@ DIST golang.org%2Fx%2Fmod%2F@v%2Fv0.2.0.mod 214 BLAKE2B 9a9c23e4a6fbf1e2168cc255
 DIST golang.org%2Fx%2Fmod%2F@v%2Fv0.3.0.mod 214 BLAKE2B 9a9c23e4a6fbf1e2168cc2559ab0eea14e2a1bbf32cab7eb95e276c3c1f2e06dadf6c58e39a4722211fb882e48f25a8de2969422590c62851292747f1da76b02 SHA512 16d72a943c436bf27c18ee65deb1e1a3b1283dcfcc76a49f01919df97f41ae6ef7c5fe7f95b5bb62cf6f6fee57eb9654ca27ec3bae448ebfe894f8d6d0101fa1
 DIST golang.org%2Fx%2Fmod%2F@v%2Fv0.3.0.zip 128895 BLAKE2B c2543ab5e3e1eacc16790bcae51ef70962f035b9b95de3797a1fa1142726ec00c66e4e79b717e363fbc5dae3e91b79f05826d623f9251c0648437efaf007d018 SHA512 06f329247189a6a61e54902e9adf7f309b71818150f2ee43ca7ead80b8f03070edb31c4646b7a379b31e1a8aa81e15fcdb2d0e92f9375fcb4d5a8e2194b954e9
 DIST golang.org%2Fx%2Fmod%2F@v%2Fv0.4.2.mod 214 BLAKE2B 9a9c23e4a6fbf1e2168cc2559ab0eea14e2a1bbf32cab7eb95e276c3c1f2e06dadf6c58e39a4722211fb882e48f25a8de2969422590c62851292747f1da76b02 SHA512 16d72a943c436bf27c18ee65deb1e1a3b1283dcfcc76a49f01919df97f41ae6ef7c5fe7f95b5bb62cf6f6fee57eb9654ca27ec3bae448ebfe894f8d6d0101fa1
-DIST golang.org%2Fx%2Fmod%2F@v%2Fv0.4.2.zip 141789 BLAKE2B dc517e61f7a9c895d827ff139a36b319c7dd335e85755dc394d01ceaf8b3ce07ef13201bf6d704c31895bf7d91c15acbc4ac75bc8cde065ab4f81839453e0c5c SHA512 6376ecdccd2eeaf828a2c1f560e116c003caf5e09fe68e94a37d193697c93b18bee14abbc06edca93ca57a924f9b270bbe1792df84a7bd66e3641ce6aecbc9b1
 DIST golang.org%2Fx%2Fmod%2F@v%2Fv0.5.1.mod 214 BLAKE2B 06631482606d93f3622eb79087adb11f0fedc16eeee47c327d9542003c05828faca6ec89fb5a7b6479dbbb951126f85d3b11afff772bdddba37db3d99c0174ec SHA512 8ad3d2d81f0192ba3215650546e1cc1eb2d58f2c9898929e565233388d95bb2d1a334d038e9807a44733fe6a218ac0b32de24d16fe9d208addcd67cdc2ae8f79
 DIST golang.org%2Fx%2Fmod%2F@v%2Fv0.5.1.zip 150900 BLAKE2B a376dc6f6413f699d69f6ee1c25f85e457fc602cc8cb23841aad223daac91598a98535ad9398bba2e8346c4450a5523129628546a6db69dbed84894c3bffdff2 SHA512 71dd98468c11a0b56877ec92ac220d0b34136e8c85075dc9aeb413cdab0fdb7937fa3000c370feff3e43b9466ee8541fc3aaadfa46d900616378b7fe7dc3fecf
 DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20180724234803-3673e40ba225.mod 24 BLAKE2B dad51d0aff48ef669f448f7b41bcdb153dbdc48863761ba1cac6aa3e3eaeec838e22733e6c61796b22bcc95d9e0a274085676bf191a8072717a398a067fe9e62 SHA512 d7446d3dd844b97512470f7ff05fce72d099f7800396e2738a54d41796f0f76be07e7aea1f638fee0190c7d8ce65eefc54eebe6917a06d14da04d0c9c8f9891a
@@ -733,7 +728,6 @@ DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20210428140749-89ef3d95e781.mod 179 BLAK
 DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20210428140749-89ef3d95e781.zip 1557827 BLAKE2B 65969f3f9638c2ed7d5a36d862bcef3cf15d0046371faee37dc4da6848c197d2be4fbd132fe7ad9b2c40948c88b1665430be8d50522f3d01ea81f7e9c9a23ca4 SHA512 d6252d06c32f8edb41add604a696721717a817f2b372d528065ef78ab8caac395f9efb8948a153f9dd10b22c3505766c43edef42ff7bcd950352e8d7aa2152a1
 DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20210525063256-abc453219eb5.mod 179 BLAKE2B a505fef7e073e6305a5a8b8c3494942da61a944af095abe6caa2774152b7427437d74405967eeb6b38b114a14f0e09e72d00de2a6eba1f4694293a08daaa826b SHA512 a1c24164598eb8a5e5005b0df0cf9b3efd285c90efe6472a0474907f368166c243942765f182d8cc65f23159cd0a8b52c547ab14ee67c4261f768e31d05ed5e5
 DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20210716203947-853a461950ff.mod 179 BLAKE2B a505fef7e073e6305a5a8b8c3494942da61a944af095abe6caa2774152b7427437d74405967eeb6b38b114a14f0e09e72d00de2a6eba1f4694293a08daaa826b SHA512 a1c24164598eb8a5e5005b0df0cf9b3efd285c90efe6472a0474907f368166c243942765f182d8cc65f23159cd0a8b52c547ab14ee67c4261f768e31d05ed5e5
-DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20210716203947-853a461950ff.zip 1566909 BLAKE2B 794ed535fd5fdd4e432266a7f1e73469467e1c8c99ba999a4501b3efc27b2bb26d1697de255a9481f1671040a09fb00123cc6b32a85500cfbc11495a31214d7a SHA512 77f7a79cfa26e16732f42d3c54b0ea217491dca83f497e63ba16892c82766d750be62cca72779ab51a1a17cf60a0480c8404cc5ba0ff9af536ee033ae03d1abb
 DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20210805182204-aaa1db679c0d.mod 179 BLAKE2B a505fef7e073e6305a5a8b8c3494942da61a944af095abe6caa2774152b7427437d74405967eeb6b38b114a14f0e09e72d00de2a6eba1f4694293a08daaa826b SHA512 a1c24164598eb8a5e5005b0df0cf9b3efd285c90efe6472a0474907f368166c243942765f182d8cc65f23159cd0a8b52c547ab14ee67c4261f768e31d05ed5e5
 DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20210924151903-3ad01bbaa167.mod 179 BLAKE2B a505fef7e073e6305a5a8b8c3494942da61a944af095abe6caa2774152b7427437d74405967eeb6b38b114a14f0e09e72d00de2a6eba1f4694293a08daaa826b SHA512 a1c24164598eb8a5e5005b0df0cf9b3efd285c90efe6472a0474907f368166c243942765f182d8cc65f23159cd0a8b52c547ab14ee67c4261f768e31d05ed5e5
 DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20210924151903-3ad01bbaa167.zip 1574322 BLAKE2B 4526b4de18294064937461f2c9d81e16ba15c798b024bcea0e66b20debde59067c597c291c6caa86f71620abb7c92075bf17de4d14eba847c510cd499a10a90e SHA512 8bf2019477bfbbc6034e96cbf00de64b87bc634a16cbbdb987fcab21f1a134415d7157dc6c9df9ac038866855b2ac695a4478cae944af95bac971ab56792c9bb
@@ -823,11 +817,8 @@ DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210510120138-977fb7262007.mod 33 BLAKE
 DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210603081109-ebe580a85c40.mod 33 BLAKE2B b74677ab15ab6b31640d71b052db667b0fb585ed6d1044e26bc5e4cf8da90e1ede81f8876babea843dd322b8b707189138e70c24d13d931f1f6dd04978ac222c SHA512 85e511b1261c1935f5ee4754ad31d1d946f9e10f0af9905f44c4348d6ce5104319c03fb38517dde616698f6487b0c62788cfa96bc0ffb3b6db80accd7e552655
 DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210615035016-665e8c7367d1.mod 33 BLAKE2B b74677ab15ab6b31640d71b052db667b0fb585ed6d1044e26bc5e4cf8da90e1ede81f8876babea843dd322b8b707189138e70c24d13d931f1f6dd04978ac222c SHA512 85e511b1261c1935f5ee4754ad31d1d946f9e10f0af9905f44c4348d6ce5104319c03fb38517dde616698f6487b0c62788cfa96bc0ffb3b6db80accd7e552655
 DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210630005230-0f9fa26af87c.mod 33 BLAKE2B b74677ab15ab6b31640d71b052db667b0fb585ed6d1044e26bc5e4cf8da90e1ede81f8876babea843dd322b8b707189138e70c24d13d931f1f6dd04978ac222c SHA512 85e511b1261c1935f5ee4754ad31d1d946f9e10f0af9905f44c4348d6ce5104319c03fb38517dde616698f6487b0c62788cfa96bc0ffb3b6db80accd7e552655
-DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210630005230-0f9fa26af87c.zip 1646674 BLAKE2B a2975e42ede4b3923b53f6c28b8360a49b47734e5512ffe9e52e8920f79af09420d3702d3d7e54e5755c04fddd0836e11c7fb83441065bf9dd31da363f5121a2 SHA512 6a36b9dd8ab6582abf0721e3fdfd19c2cbf9caf02a2f8aeff8952175553e35ab9f9972c2e524ad947e51e24f5eaee23984fc1670d512c04e50b2d71890c5d392
 DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210809222454-d867a43fc93e.mod 33 BLAKE2B b74677ab15ab6b31640d71b052db667b0fb585ed6d1044e26bc5e4cf8da90e1ede81f8876babea843dd322b8b707189138e70c24d13d931f1f6dd04978ac222c SHA512 85e511b1261c1935f5ee4754ad31d1d946f9e10f0af9905f44c4348d6ce5104319c03fb38517dde616698f6487b0c62788cfa96bc0ffb3b6db80accd7e552655
 DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210816074244-15123e1e1f71.mod 33 BLAKE2B b74677ab15ab6b31640d71b052db667b0fb585ed6d1044e26bc5e4cf8da90e1ede81f8876babea843dd322b8b707189138e70c24d13d931f1f6dd04978ac222c SHA512 85e511b1261c1935f5ee4754ad31d1d946f9e10f0af9905f44c4348d6ce5104319c03fb38517dde616698f6487b0c62788cfa96bc0ffb3b6db80accd7e552655
-DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210819135213-f52c844e1c1c.mod 33 BLAKE2B b74677ab15ab6b31640d71b052db667b0fb585ed6d1044e26bc5e4cf8da90e1ede81f8876babea843dd322b8b707189138e70c24d13d931f1f6dd04978ac222c SHA512 85e511b1261c1935f5ee4754ad31d1d946f9e10f0af9905f44c4348d6ce5104319c03fb38517dde616698f6487b0c62788cfa96bc0ffb3b6db80accd7e552655
-DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210819135213-f52c844e1c1c.zip 1656332 BLAKE2B 1a6e6a7a0f8f602b955723eba094ab05daca84aabc64a02dc3b4c95cbf582d84442c0486242695c97b5f31dd2c22db72ea3bc44966056dbe713e3ec740efb6da SHA512 72a2609295cf36d314188a1ef5446cc91c3192be17b5f6b3472d9e0be69364a15f84d9619eee7698a79045ce41b98becc30db53b089afa03459d5446b179f479
 DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210925032602-92d5a993a665.mod 33 BLAKE2B b74677ab15ab6b31640d71b052db667b0fb585ed6d1044e26bc5e4cf8da90e1ede81f8876babea843dd322b8b707189138e70c24d13d931f1f6dd04978ac222c SHA512 85e511b1261c1935f5ee4754ad31d1d946f9e10f0af9905f44c4348d6ce5104319c03fb38517dde616698f6487b0c62788cfa96bc0ffb3b6db80accd7e552655
 DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210925032602-92d5a993a665.zip 1657137 BLAKE2B 7d3626feb8cbfab53a5a83c5185ff3ca38c5c87a80967e5f0f1a28524d471f34e518b4700d6ad5e653482c673d85a089d28321af8b8224ebe5842d61afc39ddd SHA512 d736ec6ae15e597b13df9f185b78afea38b52ec705d6847b3a6dcade6ffc37130fa3c5c6ef95ca8907bb957a30bfe7dc68da6f94b2afa45c72c0d77e8cb5d3e7
 DIST golang.org%2Fx%2Fterm%2F@v%2Fv0.0.0-20201126162022-7de9c90e9dd1.mod 95 BLAKE2B 8385688f2081360fc2694f05d128ff0c587ef131e1b5757a942d9335870200e06545318afb1a7d1f059d060f51fe94fc16a48a1d7ec31a9a83e07b3c93f34ce3 SHA512 a3401e3d20dc1aaaebbf3c296a783668003f2182ed77ec830431f97339e07eda1859fe8c3c7fdfb0125b3ed331d23208519df520f86e20c1a05c822b3d766b08
@@ -903,7 +894,6 @@ DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.1.0.mod 323 BLAKE2B 703b8f1e36b74c6bea0f94
 DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.1.0.zip 3276723 BLAKE2B 12b3291e8ce52a94677d56ad3cbf020f56777301c8b308b1f05189d346caa6395e8a0e177efa226e15e6e9235c1e387031d34cf61b08b4fc0f3769d65120ded1 SHA512 e1beb4466d35acaf836e0a8f015177e44c346f4fa31599a0b022cb19cf7b6623a3d3efcaf9c00114cd6f86a7634f19c14208a8a48ca3adee780da67964a60b57
 DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.1.1.mod 323 BLAKE2B db1fc72e77cc95fbe79c62b179628f8e6e130846832146af32f604bd063c6610a6a8cebd1f166294ad4adae451c6760a0988e431846e35d25ad741920e06e839 SHA512 6fa4c11d23d3c08fed7331586d9e8da5299602dc97e861d74ce68f248c2e8b1d9ba5e55d2acbb96eaa3e1484f9d287b7d8c2f0e96f75109c957bfee88776996f
 DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.1.5.mod 323 BLAKE2B db1fc72e77cc95fbe79c62b179628f8e6e130846832146af32f604bd063c6610a6a8cebd1f166294ad4adae451c6760a0988e431846e35d25ad741920e06e839 SHA512 6fa4c11d23d3c08fed7331586d9e8da5299602dc97e861d74ce68f248c2e8b1d9ba5e55d2acbb96eaa3e1484f9d287b7d8c2f0e96f75109c957bfee88776996f
-DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.1.5.zip 3513755 BLAKE2B 2537e470673cbca85684cb2896fe567db4b16cfd2d9b94570fdfd9a56d20eca550a7b22d8290d89a84281c02077790528d351e99c1f5dff223d867ab0e951f06 SHA512 3cedcd8d219cedd2f55e462cff9e235e3650f92d5a6dac4a44b9920a1431899a73ef41e2f07370c27d909000ce21c9a20a8b29d732471b59e4cb6777565081b8
 DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.1.6.mod 349 BLAKE2B fc518274afd52d82cbfb8306b87868f00d72da0a231246808c5f66b3e3a157ebe896c23890131cb24cde3ab77e2f568828f6d7b2e431055b919dfbeb55fe555b SHA512 0d8dd80c6f2f63c2639ac8a112d0e80b1b0b5929fe95544705688e636b9141790d3da6e82fccc35a9a49bcd7b10d68593491af42a6b2f571268d82605ad169a3
 DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.1.6.zip 3557226 BLAKE2B 3f24417198c55a326eb104553da97e75421aa56aa4f63273b2052d3c006830e4a3e37f73935ec8c7c6cf4dac81fa834236aa4a96bfc31498600e10711bf54b30 SHA512 e121e71ff3390144b9eb637e7f3eab20c4bc2df77f825c4e3d77dbdd781422d1c2caab148fdf8d07a1292a87c87da3ddb7673bbeb898af54005523b882ab3a1a
 DIST golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20190717185122-a985d3407aa7.mod 37 BLAKE2B 7449be81e1998a6439070de1a0ddf5bfd1e4971c90c2e358590a9c1c41128bfc1daa42a9bbc3709506df2442ec8420e6354343a095c837be46335c180083f28a SHA512 659d18a7a3a1be45ff6dc9e7475276b82ee7f11c47d39b0c237d7f872836a1dbdfff0902f21d6cd8093663997865da92e3e5a4acf1ad6129f972dc5e667b4f05
@@ -1052,9 +1042,7 @@ DIST sourcegraph.com%2Fsourcegraph%2Fappdash%2F@v%2Fv0.0.0-20190731080439-ebfcff
 DIST sourcegraph.com%2Fsourcegraph%2Fgo-diff%2F@v%2Fv0.5.0.mod 288 BLAKE2B e8f361d08bba5f5689a0e8b51dc17f11fe893c1fb3c0b671d323c6f66448d0c73d26b64586ce2236cc91f44839eba5ebf2a858b04aa85b5bde847c5956b0a519 SHA512 ef74bbbbb50cb01b861dc25c1a1ee276cebb64a383a31f4acf3f78db0e1b5fa907c6ecb9a88e4819d4aa7d5fccced97b574c12e147c36677a8d4e5f73b55d04c
 DIST sourcegraph.com%2Fsqs%2Fpbtypes%2F@v%2Fv0.0.0-20180604144634-d3ebe8f20ae4.mod 35 BLAKE2B ff9ae0413ef6833c8d2f6ea3938e675256d2c44e38b31cee5223b7a1bcd3ef38515337ef388a155b171bc18d2f5153bef2ad0b0cf06b7c3d01145e5a13338aa7 SHA512 4316ef9aa90178d1f45938d1c81e6e0ab0618eeae3337bdf1bb2509d05c7b0e22e42fc2f86cc5d2a6fb1fdefc50ac68acc030e1d2cce8277314bbc2cc101c262
 DIST syncthing-1.18.1.tar.gz 6145390 BLAKE2B 9c40daad6016a90dda135f91a3d17cf6d5cd0803417488720491fda9d56811bcb6ab6d32c8b638374b2354077261428f1de578ad8171baf4430b937b5ab68d5f SHA512 b20e49ccffda2646ebcf3904077a3496c6ef2744600d98fdd5db45758d9511c0dd9f2f3b5ac37c275e9bdb01827e37a0551bdcec92c118651937cf72ae7adb6e
-DIST syncthing-1.18.2.tar.gz 6152347 BLAKE2B cab3ae2aa0d77f00b423b1e54bfe257a69f208f82af693db0b35b7f6b150a78d7286e3c15e0eaa84b73ec6e3bd10cae2280ddbfb1df2df01265f2e5bd81ac215 SHA512 b5acd207aed1163d8de1534fffe04faeefb1c6aca00933d4b7b96db10451d71acdce5c8147d2b0c3d13a37c3dcfa70da1ac0a9f14dc3a60046da94a960c169f5
-DIST syncthing-1.18.3.tar.gz 6153430 BLAKE2B e1bdc5b893b2300e0cceb15a7216cfa641c5e671d944165f83eb1b76edad181b61a7142f45a5642e7e42ba119ecc31958b6ea910d605fd5966f7ee7a2eab6b06 SHA512 d667fcdecc2f810d98e7da5fc9e00d4abebb68f31130363cd4982de47bb8550029cc9285d1b1242a5d9510dcb8db11aa44877bb48750b87a09895476a08669a4
+DIST syncthing-1.18.4.tar.gz 6168557 BLAKE2B b1abb649f406ca010b956c0dfd8920b6d7d6297433a93a2d27d09f2fbcd0220a32f8237fde1d301199749af162f6f29dfb3caa177839841f155c79acec9b4799 SHA512 176ff8f40c0d6644b8f81583e09e9f8a411548772ffdbbd70fcca20371511a8faa4311d23c7bd3815f0205c00b9b7284846fce3183ffbca6bb9460e6aef7f0d8
 EBUILD syncthing-1.18.1.ebuild 41406 BLAKE2B 22781758b24f1d82714dd3e8cdd5a2275e28d974e8b37882500c63ea46c08f28ce4c9af049e10fe70b437c9955c7a44ff7444b4763e79565d54e82f275307fde SHA512 f1a720e29812339deed36b919287043b48ca0d53f450b7d7cd8f50b093455227d1de8723fd7a9d5a66bb6fe7f05049603aa617c3fdfc379d7195c32bb782ca27
-EBUILD syncthing-1.18.2.ebuild 42485 BLAKE2B 6d788821a799da5c8b5fe99f343a4e506095191b61e0a96c1bb2f3b6dde9ee26fc7f110fa72d48f284a2a51d1e9fba6f23266e5e1a89ec1db28786d53c63e2f7 SHA512 99ac407856802ae27e4188293768ab61231a0e948d1013488e1a78c7f2f657a89f5265c202a2ca80e916eb2b15bd40ddaff4cc424666bff262c2a403fe44ec85
-EBUILD syncthing-1.18.3.ebuild 45483 BLAKE2B e8024efce7824f2dc5e5f29366c3bd85a67f3654eae40389fdba7c78f93d58359692789f3d8c32e161e77c94f4779c90425ca40c5cb892c430633f9a4d739580 SHA512 61221cdb63fa6ef1fcf50d4fdeb6192e03cd0abcdb59efd21357bb2fbf8d650ee8c9084ee23d34117039e0ab32b36e33186695e1c94c46d1d5dae823a6a8578d
+EBUILD syncthing-1.18.4.ebuild 45483 BLAKE2B e8024efce7824f2dc5e5f29366c3bd85a67f3654eae40389fdba7c78f93d58359692789f3d8c32e161e77c94f4779c90425ca40c5cb892c430633f9a4d739580 SHA512 61221cdb63fa6ef1fcf50d4fdeb6192e03cd0abcdb59efd21357bb2fbf8d650ee8c9084ee23d34117039e0ab32b36e33186695e1c94c46d1d5dae823a6a8578d
 MISC metadata.xml 870 BLAKE2B 9d6abd4129ab6ab9ece49e3cb74b6537cf185c5e7e0d7cf893543ea6e75be83e534a8d3f4d042aeb778f9284c9ed7a6f2d60461593ae46f65901a42a3582acc2 SHA512 ef4f1fb81733a7c53f4deb239de1d01d4d2710cf92cb4abfb49659f64bfe5a080c3ab50ec9ec9bda531d0ca87f2f5b9ac80fe1beba1eaaccd1971b1759b3e93a
diff --git a/net-p2p/syncthing/syncthing-1.18.2.ebuild b/net-p2p/syncthing/syncthing-1.18.2.ebuild
deleted file mode 100644
index 617de806a595..000000000000
--- a/net-p2p/syncthing/syncthing-1.18.2.ebuild
+++ /dev/null
@@ -1,836 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit desktop go-module systemd xdg-utils
-
-EGO_SUM=(
-	"cloud.google.com/go v0.26.0/go.mod"
-	"cloud.google.com/go v0.31.0/go.mod"
-	"cloud.google.com/go v0.34.0/go.mod"
-	"cloud.google.com/go v0.37.0/go.mod"
-	"dmitri.shuralyov.com/app/changes v0.0.0-20180602232624-0a106ad413e3/go.mod"
-	"dmitri.shuralyov.com/html/belt v0.0.0-20180602232347-f7d459c86be0/go.mod"
-	"dmitri.shuralyov.com/service/change v0.0.0-20181023043359-a85b471d5412/go.mod"
-	"dmitri.shuralyov.com/state v0.0.0-20180228185332-28bcc343414c/go.mod"
-	"git.apache.org/thrift.git v0.0.0-20180902110319-2566ecd5d999/go.mod"
-	"github.com/AudriusButkevicius/pfilter v0.0.10"
-	"github.com/AudriusButkevicius/pfilter v0.0.10/go.mod"
-	"github.com/AudriusButkevicius/recli v0.0.6"
-	"github.com/AudriusButkevicius/recli v0.0.6/go.mod"
-	"github.com/Azure/go-ntlmssp v0.0.0-20200615164410-66371956d46c"
-	"github.com/Azure/go-ntlmssp v0.0.0-20200615164410-66371956d46c/go.mod"
-	"github.com/BurntSushi/toml v0.3.1/go.mod"
-	"github.com/Knetic/govaluate v3.0.1-0.20171022003610-9aa49832a739+incompatible/go.mod"
-	"github.com/Shopify/sarama v1.19.0/go.mod"
-	"github.com/Shopify/toxiproxy v2.1.4+incompatible/go.mod"
-	"github.com/StackExchange/wmi v0.0.0-20190523213315-cbe66965904d"
-	"github.com/StackExchange/wmi v0.0.0-20190523213315-cbe66965904d/go.mod"
-	"github.com/VividCortex/gohistogram v1.0.0/go.mod"
-	"github.com/afex/hystrix-go v0.0.0-20180502004556-fa1af6a1f4f5/go.mod"
-	"github.com/alecthomas/kong v0.2.16"
-	"github.com/alecthomas/kong v0.2.16/go.mod"
-	"github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc/go.mod"
-	"github.com/alecthomas/template v0.0.0-20190718012654-fb15b899a751/go.mod"
-	"github.com/alecthomas/units v0.0.0-20151022065526-2efee857e7cf/go.mod"
-	"github.com/alecthomas/units v0.0.0-20190717042225-c3de453c63f4/go.mod"
-	"github.com/alecthomas/units v0.0.0-20190924025748-f65c72e2690d/go.mod"
-	"github.com/anmitsu/go-shlex v0.0.0-20161002113705-648efa622239/go.mod"
-	"github.com/apache/thrift v0.12.0/go.mod"
-	"github.com/apache/thrift v0.13.0/go.mod"
-	"github.com/armon/circbuf v0.0.0-20150827004946-bbbad097214e/go.mod"
-	"github.com/armon/go-metrics v0.0.0-20180917152333-f0300d1749da/go.mod"
-	"github.com/armon/go-radix v0.0.0-20180808171621-7fddfc383310/go.mod"
-	"github.com/aryann/difflib v0.0.0-20170710044230-e206f873d14a/go.mod"
-	"github.com/aws/aws-lambda-go v1.13.3/go.mod"
-	"github.com/aws/aws-sdk-go v1.27.0/go.mod"
-	"github.com/aws/aws-sdk-go-v2 v0.18.0/go.mod"
-	"github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod"
-	"github.com/beorn7/perks v1.0.0/go.mod"
-	"github.com/beorn7/perks v1.0.1"
-	"github.com/beorn7/perks v1.0.1/go.mod"
-	"github.com/bgentry/speakeasy v0.1.0/go.mod"
-	"github.com/bkaradzic/go-lz4 v0.0.0-20160924222819-7224d8d8f27e"
-	"github.com/bkaradzic/go-lz4 v0.0.0-20160924222819-7224d8d8f27e/go.mod"
-	"github.com/bradfitz/go-smtpd v0.0.0-20170404230938-deb6d6237625/go.mod"
-	"github.com/buger/jsonparser v0.0.0-20181115193947-bf1c66bbce23/go.mod"
-	"github.com/calmh/xdr v1.1.0"
-	"github.com/calmh/xdr v1.1.0/go.mod"
-	"github.com/casbin/casbin/v2 v2.1.2/go.mod"
-	"github.com/ccding/go-stun v0.1.3"
-	"github.com/ccding/go-stun v0.1.3/go.mod"
-	"github.com/cenkalti/backoff v2.2.1+incompatible/go.mod"
-	"github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod"
-	"github.com/certifi/gocertifi v0.0.0-20210429200110-83314bf6d27c"
-	"github.com/certifi/gocertifi v0.0.0-20210429200110-83314bf6d27c/go.mod"
-	"github.com/cespare/xxhash/v2 v2.1.1"
-	"github.com/cespare/xxhash/v2 v2.1.1/go.mod"
-	"github.com/cheekybits/genny v1.0.0"
-	"github.com/cheekybits/genny v1.0.0/go.mod"
-	"github.com/chmduquesne/rollinghash v0.0.0-20180912150627-a60f8e7142b5"
-	"github.com/chmduquesne/rollinghash v0.0.0-20180912150627-a60f8e7142b5/go.mod"
-	"github.com/clbanning/x2j v0.0.0-20191024224557-825249438eec/go.mod"
-	"github.com/client9/misspell v0.3.4/go.mod"
-	"github.com/cockroachdb/datadriven v0.0.0-20190809214429-80d97fb3cbaa/go.mod"
-	"github.com/codahale/hdrhistogram v0.0.0-20161010025455-3a0bb77429bd/go.mod"
-	"github.com/coreos/go-semver v0.2.0/go.mod"
-	"github.com/coreos/go-systemd v0.0.0-20180511133405-39ca1b05acc7/go.mod"
-	"github.com/coreos/go-systemd v0.0.0-20181012123002-c6f51f82210d/go.mod"
-	"github.com/coreos/pkg v0.0.0-20160727233714-3ac0863d7acf/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.7/go.mod"
-	"github.com/d4l3k/messagediff v1.2.1"
-	"github.com/d4l3k/messagediff v1.2.1/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/dchest/siphash v1.2.2"
-	"github.com/dchest/siphash v1.2.2/go.mod"
-	"github.com/dgrijalva/jwt-go v3.2.0+incompatible/go.mod"
-	"github.com/dustin/go-humanize v0.0.0-20171111073723-bb3d318650d4/go.mod"
-	"github.com/dustin/go-humanize v1.0.0/go.mod"
-	"github.com/eapache/go-resiliency v1.1.0/go.mod"
-	"github.com/eapache/go-xerial-snappy v0.0.0-20180814174437-776d5712da21/go.mod"
-	"github.com/eapache/queue v1.1.0/go.mod"
-	"github.com/edsrzf/mmap-go v1.0.0/go.mod"
-	"github.com/envoyproxy/go-control-plane v0.6.9/go.mod"
-	"github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.mod"
-	"github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod"
-	"github.com/fatih/color v1.7.0/go.mod"
-	"github.com/flynn-archive/go-shlex v0.0.0-20150515145356-3f9db97f8568"
-	"github.com/flynn-archive/go-shlex v0.0.0-20150515145356-3f9db97f8568/go.mod"
-	"github.com/flynn/go-shlex v0.0.0-20150515145356-3f9db97f8568/go.mod"
-	"github.com/francoispqt/gojay v1.2.13/go.mod"
-	"github.com/franela/goblin v0.0.0-20200105215937-c9ffbefa60db/go.mod"
-	"github.com/franela/goreq v0.0.0-20171204163338-bcd34c9993f8/go.mod"
-	"github.com/fsnotify/fsnotify v1.4.7/go.mod"
-	"github.com/fsnotify/fsnotify v1.4.9"
-	"github.com/fsnotify/fsnotify v1.4.9/go.mod"
-	"github.com/getsentry/raven-go v0.2.0"
-	"github.com/getsentry/raven-go v0.2.0/go.mod"
-	"github.com/ghodss/yaml v1.0.0/go.mod"
-	"github.com/gliderlabs/ssh v0.1.1/go.mod"
-	"github.com/go-asn1-ber/asn1-ber v1.5.1/go.mod"
-	"github.com/go-asn1-ber/asn1-ber v1.5.3"
-	"github.com/go-asn1-ber/asn1-ber v1.5.3/go.mod"
-	"github.com/go-errors/errors v1.0.1/go.mod"
-	"github.com/go-kit/kit v0.8.0/go.mod"
-	"github.com/go-kit/kit v0.9.0/go.mod"
-	"github.com/go-kit/kit v0.10.0/go.mod"
-	"github.com/go-ldap/ldap/v3 v3.3.0"
-	"github.com/go-ldap/ldap/v3 v3.3.0/go.mod"
-	"github.com/go-logfmt/logfmt v0.3.0/go.mod"
-	"github.com/go-logfmt/logfmt v0.4.0/go.mod"
-	"github.com/go-logfmt/logfmt v0.5.0/go.mod"
-	"github.com/go-ole/go-ole v1.2.4"
-	"github.com/go-ole/go-ole v1.2.4/go.mod"
-	"github.com/go-sql-driver/mysql v1.4.0/go.mod"
-	"github.com/go-stack/stack v1.8.0/go.mod"
-	"github.com/go-task/slim-sprig v0.0.0-20210107165309-348f09dbbbc0"
-	"github.com/go-task/slim-sprig v0.0.0-20210107165309-348f09dbbbc0/go.mod"
-	"github.com/gobwas/glob v0.2.3"
-	"github.com/gobwas/glob v0.2.3/go.mod"
-	"github.com/gogo/googleapis v1.1.0/go.mod"
-	"github.com/gogo/protobuf v1.1.1/go.mod"
-	"github.com/gogo/protobuf v1.2.0/go.mod"
-	"github.com/gogo/protobuf v1.2.1/go.mod"
-	"github.com/gogo/protobuf v1.3.2"
-	"github.com/gogo/protobuf v1.3.2/go.mod"
-	"github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod"
-	"github.com/golang/groupcache v0.0.0-20160516000752-02826c3e7903/go.mod"
-	"github.com/golang/groupcache v0.0.0-20190702054246-869f871628b6/go.mod"
-	"github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da"
-	"github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da/go.mod"
-	"github.com/golang/lint v0.0.0-20180702182130-06c8688daad7/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.4.4/go.mod"
-	"github.com/golang/mock v1.6.0"
-	"github.com/golang/mock v1.6.0/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.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.2/go.mod"
-	"github.com/golang/protobuf v1.4.3/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/golang/snappy v0.0.0-20180518054509-2e65f85255db/go.mod"
-	"github.com/golang/snappy v0.0.1"
-	"github.com/golang/snappy v0.0.1/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.5.1/go.mod"
-	"github.com/google/go-cmp v0.5.4/go.mod"
-	"github.com/google/go-cmp v0.5.5"
-	"github.com/google/go-cmp v0.5.5/go.mod"
-	"github.com/google/go-github v17.0.0+incompatible/go.mod"
-	"github.com/google/go-querystring v1.0.0/go.mod"
-	"github.com/google/gofuzz v1.0.0/go.mod"
-	"github.com/google/martian v2.1.0+incompatible/go.mod"
-	"github.com/google/pprof v0.0.0-20181206194817-3ea8567a2e57/go.mod"
-	"github.com/google/renameio v0.1.0/go.mod"
-	"github.com/google/uuid v1.0.0/go.mod"
-	"github.com/googleapis/gax-go v2.0.0+incompatible/go.mod"
-	"github.com/googleapis/gax-go/v2 v2.0.3/go.mod"
-	"github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1/go.mod"
-	"github.com/gorilla/context v1.1.1/go.mod"
-	"github.com/gorilla/mux v1.6.2/go.mod"
-	"github.com/gorilla/mux v1.7.3/go.mod"
-	"github.com/gorilla/websocket v0.0.0-20170926233335-4201258b820c/go.mod"
-	"github.com/greatroar/blobloom v0.7.0"
-	"github.com/greatroar/blobloom v0.7.0/go.mod"
-	"github.com/gregjones/httpcache v0.0.0-20180305231024-9cad4c3443a7/go.mod"
-	"github.com/grpc-ecosystem/go-grpc-middleware v1.0.1-0.20190118093823-f849b5445de4/go.mod"
-	"github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0/go.mod"
-	"github.com/grpc-ecosystem/grpc-gateway v1.5.0/go.mod"
-	"github.com/grpc-ecosystem/grpc-gateway v1.9.5/go.mod"
-	"github.com/hashicorp/consul/api v1.3.0/go.mod"
-	"github.com/hashicorp/consul/sdk v0.3.0/go.mod"
-	"github.com/hashicorp/errwrap v1.0.0/go.mod"
-	"github.com/hashicorp/go-cleanhttp v0.5.1/go.mod"
-	"github.com/hashicorp/go-immutable-radix v1.0.0/go.mod"
-	"github.com/hashicorp/go-msgpack v0.5.3/go.mod"
-	"github.com/hashicorp/go-multierror v1.0.0/go.mod"
-	"github.com/hashicorp/go-rootcerts v1.0.0/go.mod"
-	"github.com/hashicorp/go-sockaddr v1.0.0/go.mod"
-	"github.com/hashicorp/go-syslog v1.0.0/go.mod"
-	"github.com/hashicorp/go-uuid v1.0.0/go.mod"
-	"github.com/hashicorp/go-uuid v1.0.1/go.mod"
-	"github.com/hashicorp/go-version v1.2.0/go.mod"
-	"github.com/hashicorp/go.net v0.0.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/hashicorp/logutils v1.0.0/go.mod"
-	"github.com/hashicorp/mdns v1.0.0/go.mod"
-	"github.com/hashicorp/memberlist v0.1.3/go.mod"
-	"github.com/hashicorp/serf v0.8.2/go.mod"
-	"github.com/hpcloud/tail v1.0.0/go.mod"
-	"github.com/hudl/fargo v1.3.0/go.mod"
-	"github.com/inconshreveable/mousetrap v1.0.0/go.mod"
-	"github.com/influxdata/influxdb1-client v0.0.0-20191209144304-8bf82d3c094d/go.mod"
-	"github.com/jackpal/gateway v1.0.7"
-	"github.com/jackpal/gateway v1.0.7/go.mod"
-	"github.com/jackpal/go-nat-pmp v1.0.2"
-	"github.com/jackpal/go-nat-pmp v1.0.2/go.mod"
-	"github.com/jellevandenhooff/dkim v0.0.0-20150330215556-f50fe3d243e1/go.mod"
-	"github.com/jmespath/go-jmespath v0.0.0-20180206201540-c2b33e8439af/go.mod"
-	"github.com/jonboulle/clockwork v0.1.0/go.mod"
-	"github.com/jpillora/backoff v1.0.0/go.mod"
-	"github.com/json-iterator/go v1.1.6/go.mod"
-	"github.com/json-iterator/go v1.1.7/go.mod"
-	"github.com/json-iterator/go v1.1.8/go.mod"
-	"github.com/json-iterator/go v1.1.10/go.mod"
-	"github.com/jstemmer/go-junit-report v0.0.0-20190106144839-af01ea7f8024/go.mod"
-	"github.com/jtolds/gls v4.20.0+incompatible/go.mod"
-	"github.com/julienschmidt/httprouter v1.2.0/go.mod"
-	"github.com/julienschmidt/httprouter v1.3.0"
-	"github.com/julienschmidt/httprouter v1.3.0/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/errcheck v1.1.0/go.mod"
-	"github.com/kisielk/errcheck v1.5.0/go.mod"
-	"github.com/kisielk/gotool v1.0.0/go.mod"
-	"github.com/klauspost/cpuid/v2 v2.0.4/go.mod"
-	"github.com/klauspost/cpuid/v2 v2.0.6"
-	"github.com/klauspost/cpuid/v2 v2.0.6/go.mod"
-	"github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod"
-	"github.com/konsorten/go-windows-terminal-sequences v1.0.3/go.mod"
-	"github.com/kr/logfmt v0.0.0-20140226030751-b84e30acd515/go.mod"
-	"github.com/kr/pretty v0.1.0/go.mod"
-	"github.com/kr/pty v1.1.1/go.mod"
-	"github.com/kr/pty v1.1.3/go.mod"
-	"github.com/kr/text v0.1.0"
-	"github.com/kr/text v0.1.0/go.mod"
-	"github.com/lib/pq v1.10.1"
-	"github.com/lib/pq v1.10.1/go.mod"
-	"github.com/lightstep/lightstep-tracer-common/golang/gogo v0.0.0-20190605223551-bc2310a04743/go.mod"
-	"github.com/lightstep/lightstep-tracer-go v0.18.1/go.mod"
-	"github.com/lucas-clemente/quic-go v0.22.0"
-	"github.com/lucas-clemente/quic-go v0.22.0/go.mod"
-	"github.com/lunixbochs/vtclean v1.0.0/go.mod"
-	"github.com/lyft/protoc-gen-validate v0.0.13/go.mod"
-	"github.com/mailru/easyjson v0.0.0-20190312143242-1de009706dbe/go.mod"
-	"github.com/marten-seemann/qpack v0.2.1/go.mod"
-	"github.com/marten-seemann/qtls-go1-15 v0.1.4"
-	"github.com/marten-seemann/qtls-go1-15 v0.1.4/go.mod"
-	"github.com/marten-seemann/qtls-go1-15 v0.1.5"
-	"github.com/marten-seemann/qtls-go1-15 v0.1.5/go.mod"
-	"github.com/marten-seemann/qtls-go1-16 v0.1.4"
-	"github.com/marten-seemann/qtls-go1-16 v0.1.4/go.mod"
-	"github.com/marten-seemann/qtls-go1-17 v0.1.0-rc.1"
-	"github.com/marten-seemann/qtls-go1-17 v0.1.0-rc.1/go.mod"
-	"github.com/maruel/panicparse v1.6.1"
-	"github.com/maruel/panicparse v1.6.1/go.mod"
-	"github.com/maruel/panicparse/v2 v2.1.1/go.mod"
-	"github.com/mattn/go-colorable v0.0.9/go.mod"
-	"github.com/mattn/go-colorable v0.1.7/go.mod"
-	"github.com/mattn/go-isatty v0.0.3/go.mod"
-	"github.com/mattn/go-isatty v0.0.4/go.mod"
-	"github.com/mattn/go-isatty v0.0.12/go.mod"
-	"github.com/mattn/go-runewidth v0.0.2/go.mod"
-	"github.com/matttproud/golang_protobuf_extensions v1.0.1"
-	"github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod"
-	"github.com/maxbrunsfeld/counterfeiter/v6 v6.3.0"
-	"github.com/maxbrunsfeld/counterfeiter/v6 v6.3.0/go.mod"
-	"github.com/mgutz/ansi v0.0.0-20200706080929-d51e80ef957d/go.mod"
-	"github.com/microcosm-cc/bluemonday v1.0.1/go.mod"
-	"github.com/miekg/dns v1.0.14/go.mod"
-	"github.com/minio/sha256-simd v1.0.0"
-	"github.com/minio/sha256-simd v1.0.0/go.mod"
-	"github.com/miscreant/miscreant.go v0.0.0-20200214223636-26d376326b75"
-	"github.com/miscreant/miscreant.go v0.0.0-20200214223636-26d376326b75/go.mod"
-	"github.com/mitchellh/cli v1.0.0/go.mod"
-	"github.com/mitchellh/go-homedir v1.0.0/go.mod"
-	"github.com/mitchellh/go-testing-interface v1.0.0/go.mod"
-	"github.com/mitchellh/gox v0.4.0/go.mod"
-	"github.com/mitchellh/iochan v1.0.0/go.mod"
-	"github.com/mitchellh/mapstructure v0.0.0-20160808181253-ca63d7c062ee/go.mod"
-	"github.com/mitchellh/mapstructure v1.1.2/go.mod"
-	"github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod"
-	"github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod"
-	"github.com/modern-go/reflect2 v0.0.0-20180701023420-4b7aa43c6742/go.mod"
-	"github.com/modern-go/reflect2 v1.0.1/go.mod"
-	"github.com/mwitkow/go-conntrack v0.0.0-20161129095857-cc309e4a2223/go.mod"
-	"github.com/mwitkow/go-conntrack v0.0.0-20190716064945-2f068394615f/go.mod"
-	"github.com/nats-io/jwt v0.3.0/go.mod"
-	"github.com/nats-io/jwt v0.3.2/go.mod"
-	"github.com/nats-io/nats-server/v2 v2.1.2/go.mod"
-	"github.com/nats-io/nats.go v1.9.1/go.mod"
-	"github.com/nats-io/nkeys v0.1.0/go.mod"
-	"github.com/nats-io/nkeys v0.1.3/go.mod"
-	"github.com/nats-io/nuid v1.0.1/go.mod"
-	"github.com/neelance/astrewrite v0.0.0-20160511093645-99348263ae86/go.mod"
-	"github.com/neelance/sourcemap v0.0.0-20151028013722-8c68805598ab/go.mod"
-	"github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e"
-	"github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e/go.mod"
-	"github.com/nxadm/tail v1.4.4"
-	"github.com/nxadm/tail v1.4.4/go.mod"
-	"github.com/nxadm/tail v1.4.8"
-	"github.com/nxadm/tail v1.4.8/go.mod"
-	"github.com/oklog/oklog v0.3.2/go.mod"
-	"github.com/oklog/run v1.0.0/go.mod"
-	"github.com/olekukonko/tablewriter v0.0.0-20170122224234-a0225b3f23b5/go.mod"
-	"github.com/onsi/ginkgo v1.6.0/go.mod"
-	"github.com/onsi/ginkgo v1.7.0/go.mod"
-	"github.com/onsi/ginkgo v1.12.1/go.mod"
-	"github.com/onsi/ginkgo v1.14.0"
-	"github.com/onsi/ginkgo v1.14.0/go.mod"
-	"github.com/onsi/ginkgo v1.16.2/go.mod"
-	"github.com/onsi/ginkgo v1.16.4"
-	"github.com/onsi/ginkgo v1.16.4/go.mod"
-	"github.com/onsi/gomega v1.4.3/go.mod"
-	"github.com/onsi/gomega v1.7.1/go.mod"
-	"github.com/onsi/gomega v1.10.1/go.mod"
-	"github.com/onsi/gomega v1.10.3"
-	"github.com/onsi/gomega v1.10.3/go.mod"
-	"github.com/onsi/gomega v1.13.0"
-	"github.com/onsi/gomega v1.13.0/go.mod"
-	"github.com/op/go-logging v0.0.0-20160315200505-970db520ece7/go.mod"
-	"github.com/opentracing-contrib/go-observer v0.0.0-20170622124052-a52f23424492/go.mod"
-	"github.com/opentracing/basictracer-go v1.0.0/go.mod"
-	"github.com/opentracing/opentracing-go v1.0.2/go.mod"
-	"github.com/opentracing/opentracing-go v1.1.0/go.mod"
-	"github.com/openzipkin-contrib/zipkin-go-opentracing v0.4.5/go.mod"
-	"github.com/openzipkin/zipkin-go v0.1.1/go.mod"
-	"github.com/openzipkin/zipkin-go v0.1.6/go.mod"
-	"github.com/openzipkin/zipkin-go v0.2.1/go.mod"
-	"github.com/openzipkin/zipkin-go v0.2.2/go.mod"
-	"github.com/oschwald/geoip2-golang v1.5.0"
-	"github.com/oschwald/geoip2-golang v1.5.0/go.mod"
-	"github.com/oschwald/maxminddb-golang v1.8.0"
-	"github.com/oschwald/maxminddb-golang v1.8.0/go.mod"
-	"github.com/pact-foundation/pact-go v1.0.4/go.mod"
-	"github.com/pascaldekloe/goe v0.0.0-20180627143212-57f6aae5913c/go.mod"
-	"github.com/pborman/uuid v1.2.0/go.mod"
-	"github.com/performancecopilot/speed v3.0.0+incompatible/go.mod"
-	"github.com/petermattis/goid v0.0.0-20180202154549-b0b1615b78e5"
-	"github.com/petermattis/goid v0.0.0-20180202154549-b0b1615b78e5/go.mod"
-	"github.com/pierrec/lz4 v1.0.2-0.20190131084431-473cd7ce01a1/go.mod"
-	"github.com/pierrec/lz4 v2.0.5+incompatible/go.mod"
-	"github.com/pkg/errors v0.8.0/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/pkg/profile v1.2.1/go.mod"
-	"github.com/pmezard/go-difflib v1.0.0"
-	"github.com/pmezard/go-difflib v1.0.0/go.mod"
-	"github.com/posener/complete v1.1.1/go.mod"
-	"github.com/prometheus/client_golang v0.8.0/go.mod"
-	"github.com/prometheus/client_golang v0.9.1/go.mod"
-	"github.com/prometheus/client_golang v0.9.3-0.20190127221311-3c4408c8b829/go.mod"
-	"github.com/prometheus/client_golang v1.0.0/go.mod"
-	"github.com/prometheus/client_golang v1.3.0/go.mod"
-	"github.com/prometheus/client_golang v1.7.1/go.mod"
-	"github.com/prometheus/client_golang v1.10.0"
-	"github.com/prometheus/client_golang v1.10.0/go.mod"
-	"github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910/go.mod"
-	"github.com/prometheus/client_model v0.0.0-20190115171406-56726106282f/go.mod"
-	"github.com/prometheus/client_model v0.0.0-20190129233127-fd36f4220a90/go.mod"
-	"github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod"
-	"github.com/prometheus/client_model v0.1.0/go.mod"
-	"github.com/prometheus/client_model v0.2.0"
-	"github.com/prometheus/client_model v0.2.0/go.mod"
-	"github.com/prometheus/common v0.0.0-20180801064454-c7de2306084e/go.mod"
-	"github.com/prometheus/common v0.2.0/go.mod"
-	"github.com/prometheus/common v0.4.1/go.mod"
-	"github.com/prometheus/common v0.7.0/go.mod"
-	"github.com/prometheus/common v0.10.0/go.mod"
-	"github.com/prometheus/common v0.18.0"
-	"github.com/prometheus/common v0.18.0/go.mod"
-	"github.com/prometheus/procfs v0.0.0-20180725123919-05ee40e3a273/go.mod"
-	"github.com/prometheus/procfs v0.0.0-20181005140218-185b4288413d/go.mod"
-	"github.com/prometheus/procfs v0.0.0-20190117184657-bf6a532e95b1/go.mod"
-	"github.com/prometheus/procfs v0.0.2/go.mod"
-	"github.com/prometheus/procfs v0.0.8/go.mod"
-	"github.com/prometheus/procfs v0.1.3/go.mod"
-	"github.com/prometheus/procfs v0.6.0"
-	"github.com/prometheus/procfs v0.6.0/go.mod"
-	"github.com/rcrowley/go-metrics v0.0.0-20181016184325-3113b8401b8a/go.mod"
-	"github.com/rcrowley/go-metrics v0.0.0-20201227073835-cf1acfcdf475"
-	"github.com/rcrowley/go-metrics v0.0.0-20201227073835-cf1acfcdf475/go.mod"
-	"github.com/rogpeppe/fastuuid v0.0.0-20150106093220-6724a57986af/go.mod"
-	"github.com/rogpeppe/go-internal v1.3.0/go.mod"
-	"github.com/russross/blackfriday v1.5.2"
-	"github.com/russross/blackfriday v1.5.2/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/ryanuber/columnize v0.0.0-20160712163229-9b3edd62028f/go.mod"
-	"github.com/samuel/go-zookeeper v0.0.0-20190923202752-2cc03de413da/go.mod"
-	"github.com/sasha-s/go-deadlock v0.2.0"
-	"github.com/sasha-s/go-deadlock v0.2.0/go.mod"
-	"github.com/sclevine/spec v1.4.0"
-	"github.com/sclevine/spec v1.4.0/go.mod"
-	"github.com/sean-/seed v0.0.0-20170313163322-e2103e2c3529/go.mod"
-	"github.com/sergi/go-diff v1.0.0/go.mod"
-	"github.com/shirou/gopsutil/v3 v3.21.4"
-	"github.com/shirou/gopsutil/v3 v3.21.4/go.mod"
-	"github.com/shurcooL/component v0.0.0-20170202220835-f88ec8f54cc4/go.mod"
-	"github.com/shurcooL/events v0.0.0-20181021180414-410e4ca65f48/go.mod"
-	"github.com/shurcooL/github_flavored_markdown v0.0.0-20181002035957-2122de532470/go.mod"
-	"github.com/shurcooL/go v0.0.0-20180423040247-9e1955d9fb6e/go.mod"
-	"github.com/shurcooL/go-goon v0.0.0-20170922171312-37c2f522c041/go.mod"
-	"github.com/shurcooL/gofontwoff v0.0.0-20180329035133-29b52fc0a18d/go.mod"
-	"github.com/shurcooL/gopherjslib v0.0.0-20160914041154-feb6d3990c2c/go.mod"
-	"github.com/shurcooL/highlight_diff v0.0.0-20170515013008-09bb4053de1b/go.mod"
-	"github.com/shurcooL/highlight_go v0.0.0-20181028180052-98c3abbbae20/go.mod"
-	"github.com/shurcooL/home v0.0.0-20181020052607-80b7ffcb30f9/go.mod"
-	"github.com/shurcooL/htmlg v0.0.0-20170918183704-d01228ac9e50/go.mod"
-	"github.com/shurcooL/httperror v0.0.0-20170206035902-86b7830d14cc/go.mod"
-	"github.com/shurcooL/httpfs v0.0.0-20171119174359-809beceb2371/go.mod"
-	"github.com/shurcooL/httpgzip v0.0.0-20180522190206-b1c53ac65af9/go.mod"
-	"github.com/shurcooL/issues v0.0.0-20181008053335-6292fdc1e191/go.mod"
-	"github.com/shurcooL/issuesapp v0.0.0-20180602232740-048589ce2241/go.mod"
-	"github.com/shurcooL/notifications v0.0.0-20181007000457-627ab5aea122/go.mod"
-	"github.com/shurcooL/octicon v0.0.0-20181028054416-fa4f57f9efb2/go.mod"
-	"github.com/shurcooL/reactions v0.0.0-20181006231557-f2e0b4ca5b82/go.mod"
-	"github.com/shurcooL/sanitized_anchor_name v0.0.0-20170918181015-86672fcb3f95/go.mod"
-	"github.com/shurcooL/sanitized_anchor_name v1.0.0/go.mod"
-	"github.com/shurcooL/users v0.0.0-20180125191416-49c67e49c537/go.mod"
-	"github.com/shurcooL/webdavfs v0.0.0-20170829043945-18c3829fa133/go.mod"
-	"github.com/sirupsen/logrus v1.2.0/go.mod"
-	"github.com/sirupsen/logrus v1.4.2/go.mod"
-	"github.com/sirupsen/logrus v1.6.0/go.mod"
-	"github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d/go.mod"
-	"github.com/smartystreets/goconvey v1.6.4/go.mod"
-	"github.com/soheilhy/cmux v0.1.4/go.mod"
-	"github.com/sony/gobreaker v0.4.1/go.mod"
-	"github.com/sourcegraph/annotate v0.0.0-20160123013949-f4cad6c6324d/go.mod"
-	"github.com/sourcegraph/syntaxhighlight v0.0.0-20170531221838-bd320f5d308e/go.mod"
-	"github.com/spf13/cobra v0.0.3/go.mod"
-	"github.com/spf13/pflag v1.0.1/go.mod"
-	"github.com/streadway/amqp v0.0.0-20190404075320-75d898a42a94/go.mod"
-	"github.com/streadway/amqp v0.0.0-20190827072141-edfb9018d271/go.mod"
-	"github.com/streadway/handy v0.0.0-20190108123426-d5acb3125c2a/go.mod"
-	"github.com/stretchr/objx v0.1.0/go.mod"
-	"github.com/stretchr/objx v0.1.1/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.5.1/go.mod"
-	"github.com/stretchr/testify v1.6.1/go.mod"
-	"github.com/stretchr/testify v1.7.0"
-	"github.com/stretchr/testify v1.7.0/go.mod"
-	"github.com/syncthing/notify v0.0.0-20210308121556-f45149b04939"
-	"github.com/syncthing/notify v0.0.0-20210308121556-f45149b04939/go.mod"
-	"github.com/syndtr/goleveldb v1.0.1-0.20200815071216-d9e9293bd0f7"
-	"github.com/syndtr/goleveldb v1.0.1-0.20200815071216-d9e9293bd0f7/go.mod"
-	"github.com/tarm/serial v0.0.0-20180830185346-98f6abe2eb07/go.mod"
-	"github.com/thejerf/suture/v4 v4.0.1"
-	"github.com/thejerf/suture/v4 v4.0.1/go.mod"
-	"github.com/tklauser/go-sysconf v0.3.4/go.mod"
-	"github.com/tklauser/numcpus v0.2.1/go.mod"
-	"github.com/tmc/grpc-websocket-proxy v0.0.0-20170815181823-89b8d40f7ca8/go.mod"
-	"github.com/urfave/cli v1.20.0/go.mod"
-	"github.com/urfave/cli v1.22.1/go.mod"
-	"github.com/urfave/cli v1.22.5"
-	"github.com/urfave/cli v1.22.5/go.mod"
-	"github.com/viant/assertly v0.4.8/go.mod"
-	"github.com/viant/toolbox v0.24.0/go.mod"
-	"github.com/vitrun/qart v0.0.0-20160531060029-bf64b92db6b0"
-	"github.com/vitrun/qart v0.0.0-20160531060029-bf64b92db6b0/go.mod"
-	"github.com/xiang90/probing v0.0.0-20190116061207-43a291ad63a2/go.mod"
-	"github.com/yuin/goldmark v1.1.27/go.mod"
-	"github.com/yuin/goldmark v1.2.1/go.mod"
-	"github.com/yuin/goldmark v1.3.5/go.mod"
-	"go.etcd.io/bbolt v1.3.3/go.mod"
-	"go.etcd.io/etcd v0.0.0-20191023171146-3cf2f69b5738/go.mod"
-	"go.opencensus.io v0.18.0/go.mod"
-	"go.opencensus.io v0.20.1/go.mod"
-	"go.opencensus.io v0.20.2/go.mod"
-	"go.opencensus.io v0.22.2/go.mod"
-	"go.uber.org/atomic v1.3.2/go.mod"
-	"go.uber.org/atomic v1.5.0/go.mod"
-	"go.uber.org/multierr v1.1.0/go.mod"
-	"go.uber.org/multierr v1.3.0/go.mod"
-	"go.uber.org/tools v0.0.0-20190618225709-2cfd321de3ee/go.mod"
-	"go.uber.org/zap v1.10.0/go.mod"
-	"go.uber.org/zap v1.13.0/go.mod"
-	"go4.org v0.0.0-20180809161055-417644f6feb5/go.mod"
-	"golang.org/x/build v0.0.0-20190111050920-041ab4dc3f9d/go.mod"
-	"golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod"
-	"golang.org/x/crypto v0.0.0-20181029021203-45a5f77698d3/go.mod"
-	"golang.org/x/crypto v0.0.0-20181030102418-4d3f4d9ffa16/go.mod"
-	"golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod"
-	"golang.org/x/crypto v0.0.0-20190313024323-a1f597ede03a/go.mod"
-	"golang.org/x/crypto v0.0.0-20190510104115-cbcb75029529/go.mod"
-	"golang.org/x/crypto v0.0.0-20190701094942-4def268fd1a4/go.mod"
-	"golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod"
-	"golang.org/x/crypto v0.0.0-20200221231518-2aa609cf4a9d/go.mod"
-	"golang.org/x/crypto v0.0.0-20200604202706-70a84ac30bf9/go.mod"
-	"golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod"
-	"golang.org/x/crypto v0.0.0-20210711020723-a769d52b0f97"
-	"golang.org/x/crypto v0.0.0-20210711020723-a769d52b0f97/go.mod"
-	"golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod"
-	"golang.org/x/lint v0.0.0-20180702182130-06c8688daad7/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-20190930215403-16217165b5de/go.mod"
-	"golang.org/x/mod v0.0.0-20190513183733-4bf6d317e70e/go.mod"
-	"golang.org/x/mod v0.1.1-0.20191105210325-c90efee705ee/go.mod"
-	"golang.org/x/mod v0.2.0/go.mod"
-	"golang.org/x/mod v0.3.0"
-	"golang.org/x/mod v0.3.0/go.mod"
-	"golang.org/x/mod v0.4.2"
-	"golang.org/x/mod v0.4.2/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-20180906233101-161cd47e91fd/go.mod"
-	"golang.org/x/net v0.0.0-20181023162649-9b4f9f5ad519/go.mod"
-	"golang.org/x/net v0.0.0-20181029044818-c44066c5c816/go.mod"
-	"golang.org/x/net v0.0.0-20181106065722-10aee1819953/go.mod"
-	"golang.org/x/net v0.0.0-20181114220301-adae6a3d119a/go.mod"
-	"golang.org/x/net v0.0.0-20181201002055-351d144fa1fc/go.mod"
-	"golang.org/x/net v0.0.0-20181220203305-927f97764cc3/go.mod"
-	"golang.org/x/net v0.0.0-20190108225652-1e06a53dbb7e/go.mod"
-	"golang.org/x/net v0.0.0-20190125091013-d26f9f9a57f3/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-20190313220215-9f648a60d977/go.mod"
-	"golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod"
-	"golang.org/x/net v0.0.0-20190603091049-60506f45cf65/go.mod"
-	"golang.org/x/net v0.0.0-20190613194153-d28f0bde5980/go.mod"
-	"golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod"
-	"golang.org/x/net v0.0.0-20190813141303-74dc4d7220e7/go.mod"
-	"golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod"
-	"golang.org/x/net v0.0.0-20200520004742-59133d7f0dd7/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-20200813134508-3edf25e44fcc/go.mod"
-	"golang.org/x/net v0.0.0-20201006153459-a7d1128ccaa0/go.mod"
-	"golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod"
-	"golang.org/x/net v0.0.0-20201026091529-146b70c837a4/go.mod"
-	"golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod"
-	"golang.org/x/net v0.0.0-20210405180319-a5a99cb37ef4/go.mod"
-	"golang.org/x/net v0.0.0-20210428140749-89ef3d95e781"
-	"golang.org/x/net v0.0.0-20210428140749-89ef3d95e781/go.mod"
-	"golang.org/x/net v0.0.0-20210716203947-853a461950ff"
-	"golang.org/x/net v0.0.0-20210716203947-853a461950ff/go.mod"
-	"golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod"
-	"golang.org/x/oauth2 v0.0.0-20181017192945-9dcd33a902f4/go.mod"
-	"golang.org/x/oauth2 v0.0.0-20181203162652-d668ce993890/go.mod"
-	"golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod"
-	"golang.org/x/perf v0.0.0-20180704124530-6e6d33e29852/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-20201020160332-67f06af15bc9/go.mod"
-	"golang.org/x/sync v0.0.0-20201207232520-09787c993a3a/go.mod"
-	"golang.org/x/sync v0.0.0-20210220032951-036812b2e83c/go.mod"
-	"golang.org/x/sys v0.0.0-20180823144017-11551d06cbcc/go.mod"
-	"golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod"
-	"golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod"
-	"golang.org/x/sys v0.0.0-20180909124046-d0be0721c37e/go.mod"
-	"golang.org/x/sys v0.0.0-20180926160741-c2ed4eda69e7/go.mod"
-	"golang.org/x/sys v0.0.0-20181026203630-95b1ffbd15a5/go.mod"
-	"golang.org/x/sys v0.0.0-20181029174526-d69651ed3497/go.mod"
-	"golang.org/x/sys v0.0.0-20181107165924-66b7b1311ac8/go.mod"
-	"golang.org/x/sys v0.0.0-20181116152217-5ac8a444bdc5/go.mod"
-	"golang.org/x/sys v0.0.0-20181122145206-62eef0e2fa9b/go.mod"
-	"golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod"
-	"golang.org/x/sys v0.0.0-20190316082340-a2f829d7f35f/go.mod"
-	"golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod"
-	"golang.org/x/sys v0.0.0-20190422165155-953cdadca894/go.mod"
-	"golang.org/x/sys v0.0.0-20190502145724-3ef323f4f1fd/go.mod"
-	"golang.org/x/sys v0.0.0-20190726091711-fc99dfbffb4e/go.mod"
-	"golang.org/x/sys v0.0.0-20190826190057-c7b8b68b1456/go.mod"
-	"golang.org/x/sys v0.0.0-20190904154756-749cb33beabd/go.mod"
-	"golang.org/x/sys v0.0.0-20191005200804-aed5e4c7ecf9/go.mod"
-	"golang.org/x/sys v0.0.0-20191120155948-bd437916bb0e/go.mod"
-	"golang.org/x/sys v0.0.0-20191220142924-d4481acd189f/go.mod"
-	"golang.org/x/sys v0.0.0-20191224085550-c709ea063b76/go.mod"
-	"golang.org/x/sys v0.0.0-20200106162015-b016eb3dc98e/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-20200519105757-fe76b779f299/go.mod"
-	"golang.org/x/sys v0.0.0-20200615200032-f1bc736245b1/go.mod"
-	"golang.org/x/sys v0.0.0-20200625212154-ddb9806d33ae/go.mod"
-	"golang.org/x/sys v0.0.0-20200724161237-0e2f3a69832c/go.mod"
-	"golang.org/x/sys v0.0.0-20200814200057-3d37ad5750ed/go.mod"
-	"golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod"
-	"golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod"
-	"golang.org/x/sys v0.0.0-20210112080510-489259a85091/go.mod"
-	"golang.org/x/sys v0.0.0-20210124154548-22da62e12c0c/go.mod"
-	"golang.org/x/sys v0.0.0-20210217105451-b926d437f341/go.mod"
-	"golang.org/x/sys v0.0.0-20210309074719-68d13333faf2/go.mod"
-	"golang.org/x/sys v0.0.0-20210330210617-4fbd30eecc44/go.mod"
-	"golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod"
-	"golang.org/x/sys v0.0.0-20210510120138-977fb7262007/go.mod"
-	"golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod"
-	"golang.org/x/sys v0.0.0-20210630005230-0f9fa26af87c"
-	"golang.org/x/sys v0.0.0-20210630005230-0f9fa26af87c/go.mod"
-	"golang.org/x/sys v0.0.0-20210819135213-f52c844e1c1c"
-	"golang.org/x/sys v0.0.0-20210819135213-f52c844e1c1c/go.mod"
-	"golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/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"
-	"golang.org/x/text v0.3.6/go.mod"
-	"golang.org/x/time v0.0.0-20180412165947-fbb02b2291d2/go.mod"
-	"golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod"
-	"golang.org/x/time v0.0.0-20191024005414-555d28b269f0/go.mod"
-	"golang.org/x/time v0.0.0-20210220033141-f8bda1e9f3ba"
-	"golang.org/x/time v0.0.0-20210220033141-f8bda1e9f3ba/go.mod"
-	"golang.org/x/tools v0.0.0-20180221164845-07fd8470d635/go.mod"
-	"golang.org/x/tools v0.0.0-20180828015842-6cd1fcedba52/go.mod"
-	"golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod"
-	"golang.org/x/tools v0.0.0-20181030000716-a0a13e073c7b/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-20190312170243-e65039ee4138/go.mod"
-	"golang.org/x/tools v0.0.0-20190328211700-ab21143f2384/go.mod"
-	"golang.org/x/tools v0.0.0-20190425150028-36563e24a262/go.mod"
-	"golang.org/x/tools v0.0.0-20190524140312-2c0ae7006135/go.mod"
-	"golang.org/x/tools v0.0.0-20190621195816-6e04913cbbac/go.mod"
-	"golang.org/x/tools v0.0.0-20191029041327-9cc4af7d6b2c/go.mod"
-	"golang.org/x/tools v0.0.0-20191029190741-b9c20aec41a5/go.mod"
-	"golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod"
-	"golang.org/x/tools v0.0.0-20200103221440-774c71fcf114/go.mod"
-	"golang.org/x/tools v0.0.0-20200619180055-7c47624df98f/go.mod"
-	"golang.org/x/tools v0.0.0-20201023174141-c8cfbd0f21e6/go.mod"
-	"golang.org/x/tools v0.0.0-20201224043029-2b0845dc783e/go.mod"
-	"golang.org/x/tools v0.0.0-20210106214847-113979e3529a/go.mod"
-	"golang.org/x/tools v0.1.1/go.mod"
-	"golang.org/x/tools v0.1.5"
-	"golang.org/x/tools v0.1.5/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.0.0-20180910000450-7ca32eb868bf/go.mod"
-	"google.golang.org/api v0.0.0-20181030000543-1d582fd0359e/go.mod"
-	"google.golang.org/api v0.1.0/go.mod"
-	"google.golang.org/api v0.3.1/go.mod"
-	"google.golang.org/appengine v1.1.0/go.mod"
-	"google.golang.org/appengine v1.2.0/go.mod"
-	"google.golang.org/appengine v1.3.0/go.mod"
-	"google.golang.org/appengine v1.4.0/go.mod"
-	"google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod"
-	"google.golang.org/genproto v0.0.0-20180831171423-11092d34479b/go.mod"
-	"google.golang.org/genproto v0.0.0-20181029155118-b69ba1387ce2/go.mod"
-	"google.golang.org/genproto v0.0.0-20181202183823-bd91e49a0898/go.mod"
-	"google.golang.org/genproto v0.0.0-20190306203927-b5d61aea6440/go.mod"
-	"google.golang.org/genproto v0.0.0-20190307195333-5fe7a883aa19/go.mod"
-	"google.golang.org/genproto v0.0.0-20190425155659-357c62f0e4bb/go.mod"
-	"google.golang.org/genproto v0.0.0-20190530194941-fb225487d101/go.mod"
-	"google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55/go.mod"
-	"google.golang.org/grpc v1.14.0/go.mod"
-	"google.golang.org/grpc v1.16.0/go.mod"
-	"google.golang.org/grpc v1.17.0/go.mod"
-	"google.golang.org/grpc v1.19.0/go.mod"
-	"google.golang.org/grpc v1.20.0/go.mod"
-	"google.golang.org/grpc v1.20.1/go.mod"
-	"google.golang.org/grpc v1.21.0/go.mod"
-	"google.golang.org/grpc v1.22.1/go.mod"
-	"google.golang.org/grpc v1.23.0/go.mod"
-	"google.golang.org/grpc v1.23.1/go.mod"
-	"google.golang.org/grpc v1.26.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.23.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/alecthomas/kingpin.v2 v2.2.6/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-20200902074654-038fdea0a05b"
-	"gopkg.in/check.v1 v1.0.0-20200902074654-038fdea0a05b/go.mod"
-	"gopkg.in/cheggaaa/pb.v1 v1.0.25/go.mod"
-	"gopkg.in/errgo.v2 v2.1.0/go.mod"
-	"gopkg.in/fsnotify.v1 v1.4.7/go.mod"
-	"gopkg.in/gcfg.v1 v1.2.3/go.mod"
-	"gopkg.in/inf.v0 v0.9.1/go.mod"
-	"gopkg.in/resty.v1 v1.12.0/go.mod"
-	"gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7"
-	"gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7/go.mod"
-	"gopkg.in/warnings.v0 v0.1.2/go.mod"
-	"gopkg.in/yaml.v2 v2.0.0-20170812160011-eb3733d160e7/go.mod"
-	"gopkg.in/yaml.v2 v2.2.1/go.mod"
-	"gopkg.in/yaml.v2 v2.2.2/go.mod"
-	"gopkg.in/yaml.v2 v2.2.4/go.mod"
-	"gopkg.in/yaml.v2 v2.2.5/go.mod"
-	"gopkg.in/yaml.v2 v2.3.0"
-	"gopkg.in/yaml.v2 v2.3.0/go.mod"
-	"gopkg.in/yaml.v2 v2.4.0"
-	"gopkg.in/yaml.v2 v2.4.0/go.mod"
-	"gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c"
-	"gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod"
-	"grpc.go4.org v0.0.0-20170609214715-11d0a25b4919/go.mod"
-	"honnef.co/go/tools v0.0.0-20180728063816-88497007e858/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-20190523083050-ea95bdfd59fc/go.mod"
-	"honnef.co/go/tools v0.0.1-2019.2.3/go.mod"
-	"sigs.k8s.io/yaml v1.1.0/go.mod"
-	"sourcegraph.com/sourcegraph/appdash v0.0.0-20190731080439-ebfcffb1b5c0/go.mod"
-	"sourcegraph.com/sourcegraph/go-diff v0.5.0/go.mod"
-	"sourcegraph.com/sqs/pbtypes v0.0.0-20180604144634-d3ebe8f20ae4/go.mod"
-)
-
-go-module_set_globals
-
-DESCRIPTION="Open Source Continuous File Synchronization"
-HOMEPAGE="https://syncthing.net"
-SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
-	${EGO_SUM_SRC_URI}"
-
-LICENSE="Apache-2.0 BSD BSD-2 CC0-1.0 ISC MIT MPL-2.0 Unlicense"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
-IUSE="selinux tools"
-
-RDEPEND="acct-group/syncthing
-	acct-user/syncthing
-	tools? ( acct-group/stdiscosrv
-		acct-group/strelaysrv
-		acct-user/stdiscosrv
-		acct-user/strelaysrv )
-	selinux? ( sec-policy/selinux-syncthing )"
-
-DOCS=( README.md AUTHORS CONTRIBUTING.md )
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.3.4-TestIssue5063_timeout.patch
-)
-
-src_prepare() {
-	# Bug #679280
-	xdg_environment_reset
-
-	default
-	sed -i \
-		's|^ExecStart=.*|ExecStart=/usr/libexec/syncthing/strelaysrv|' \
-		cmd/strelaysrv/etc/linux-systemd/strelaysrv.service \
-		|| die
-
-	# We do not need this and it sometimes causes build failures
-	rm -rf cmd/stupgrades
-}
-
-src_compile() {
-	go run build.go -version "v${PV}" -no-upgrade install \
-		$(usex tools "all" "") || die "build failed"
-}
-
-src_test() {
-	go run build.go test || die "test failed"
-}
-
-src_install() {
-	doman man/*.[157]
-	einstalldocs
-
-	dobin bin/syncthing
-	domenu etc/linux-desktop/*.desktop
-	if use tools ; then
-		exeinto /usr/libexec/syncthing
-		local exe
-		for exe in bin/* ; do
-			[[ "${exe}" == "bin/syncthing" ]] || doexe "${exe}"
-		done
-	fi
-
-	# openrc and systemd service files
-	systemd_dounit etc/linux-systemd/system/${PN}{@,-resume}.service
-	systemd_douserunit etc/linux-systemd/user/${PN}.service
-	newconfd "${FILESDIR}/${PN}.confd" ${PN}
-	newinitd "${FILESDIR}/${PN}.initd" ${PN}
-
-	keepdir /var/log/${PN}
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}/${PN}.logrotate" ${PN}
-
-	if use tools ; then
-		# openrc and systemd service files
-
-		systemd_dounit "${FILESDIR}/stdiscosrv.service"
-		newconfd "${FILESDIR}/stdiscosrv.confd" stdiscosrv
-		newinitd "${FILESDIR}/stdiscosrv.initd" stdiscosrv
-
-		systemd_dounit cmd/strelaysrv/etc/linux-systemd/strelaysrv.service
-		newconfd "${FILESDIR}/strelaysrv.confd" strelaysrv
-		newinitd "${FILESDIR}/strelaysrv.initd" strelaysrv
-
-		insinto /etc/logrotate.d
-		newins "${FILESDIR}/stdiscosrv.logrotate" strelaysrv
-		newins "${FILESDIR}/strelaysrv.logrotate" strelaysrv
-	fi
-}
-
-pkg_postinst() {
-	xdg_desktop_database_update
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-}
diff --git a/net-p2p/syncthing/syncthing-1.18.3.ebuild b/net-p2p/syncthing/syncthing-1.18.4.ebuild
index fd70b687e5db..fd70b687e5db 100644
--- a/net-p2p/syncthing/syncthing-1.18.3.ebuild
+++ b/net-p2p/syncthing/syncthing-1.18.4.ebuild
diff --git a/net-p2p/vuze/Manifest b/net-p2p/vuze/Manifest
index fc74acc7934c..6283b7676bf4 100644
--- a/net-p2p/vuze/Manifest
+++ b/net-p2p/vuze/Manifest
@@ -10,5 +10,4 @@ AUX vuze-5.7.6.0-commons-lang.patch 7613 BLAKE2B 00df394b0dddd442b693251d29a3bfd
 AUX vuze.desktop 164 BLAKE2B fa225e36d05244707ff0c0e72d2455cdc3843a2e1c7633f43f902c6372fccb14bb4baf77f07a00314a02f02e6ee682a09f95d75ff12ea0ce16d6681df0d9371e SHA512 4d68ed3af2c983435d1014ea1281076fd5d1171b23ebbe7cc8d7e6c45b39b036e7f4660fce81481ba3b7bddd29c8255ce22bbb79230f77c6ecfdecb24736d480
 DIST Vuze_5760_source.zip 10928786 BLAKE2B df8bbb797f2a1b0c92bc19be122a0da3b6382dc80f51bb652026e3d68503d19ddb3b16e3bc6c333f12c8bfa52b014f85b0812fd5683fe4553040feff39ab77d8 SHA512 c4c1cc84d3c8ce31772bd677f105f6d00e0a6d867d6890b6a834c9e189bb1752e065a64308cdf1315bace1ca4783843553b45fbf3c15240c57584e2926ba92c5
 EBUILD vuze-5.7.6.0-r1.ebuild 4068 BLAKE2B 1df51a38b5663a9869e2f572341cc0e7ddddfe5544ce659ea5f7419921349e83663f62fa52dfc3f3b72d6047b03a5e7975c583de619d765de1467e0d7810f2b1 SHA512 3d31e3b0bb898524720a4807762bbb17df573f0f6886ed5dd930c6a3be22f064355d86f09c6d4ff0dba7b0a08ca32bf53508799eff15a0e5cd9a4a2c8f02adb4
-EBUILD vuze-5.7.6.0-r2.ebuild 4066 BLAKE2B 8902aeb177e467f834ee9216d5d278dce4327725102b80a5fbaeaa4b0b9c907dbf108cecc3e33e0694dc4f0dc1a6012905557d0a2493872fdcb657d76cf660ff SHA512 a77f8b30210a0bd5608ff9301b8f25d17b1e726bfe5f9faf48290e331fdc4acacaa8be9d1dd194ef7a871b907992577bd713ff91f7e5436a5302b17eecf4d5bc
 MISC metadata.xml 314 BLAKE2B 6e8758ffb95e1641ddb121951555ed9a9da59d48688db9bc51cf9d2d02574faddf35d874a9ca901e73f47bf456221bd8b5f2035b3e789ea13196a8c2c58b03c4 SHA512 bf06d56995ee3bb79073d3c12ed3486126dc336dc77d0fb86a6fb3229596df39836e0f0682128b883c66eb02061aff512ef64299f6cd2067bb10bd6c7f63527e
diff --git a/net-p2p/vuze/vuze-5.7.6.0-r2.ebuild b/net-p2p/vuze/vuze-5.7.6.0-r2.ebuild
deleted file mode 100644
index 69fe621c5fe6..000000000000
--- a/net-p2p/vuze/vuze-5.7.6.0-r2.ebuild
+++ /dev/null
@@ -1,144 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-JAVA_PKG_IUSE="source"
-
-inherit desktop edos2unix java-pkg-2 java-ant-2 xdg-utils
-
-MY_PV=$(ver_rs 1- "")
-MY_SRC="Vuze_${MY_PV}"
-
-DESCRIPTION="BitTorrent client in Java, formerly called Azureus"
-HOMEPAGE="http://www.vuze.com/"
-SRC_URI="mirror://sourceforge/azureus/${PN}/${MY_SRC}/${MY_SRC}_source.zip"
-LICENSE="GPL-2 BSD"
-
-SLOT="0"
-KEYWORDS="amd64 ppc64"
-
-# bundles parts of http://www.programmers-friend.org/
-# bundles bcprov - 1.37 required but not in the tree
-CDEPEND="
-	dev-java/log4j:0
-	dev-java/swt:4.10[cairo]
-	dev-java/commons-cli:1
-	dev-java/commons-text:0
-	dev-java/json-simple:0"
-
-RDEPEND="
-	${CDEPEND}
-	>=virtual/jre-1.8:*"
-
-# does not compile with java 11, uses classes deprecated even in java 8
-DEPEND="
-	${CDEPEND}
-	app-arch/unzip
-	dev-util/desktop-file-utils
-	virtual/jdk:1.8"
-
-PDEPEND="~net-p2p/vuze-coreplugins-${PV}"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-5.3.0.0-java5.patch
-	"${FILESDIR}"/${PN}-5.3.0.0-remove-classpath.patch
-	"${FILESDIR}"/${PN}-5.3.0.0-disable-shared-plugins.patch
-	"${FILESDIR}"/${PN}-5.7.2.0-disable-osx.patch
-	"${FILESDIR}"/${PN}-5.3.0.0-disable-updaters.patch
-	"${FILESDIR}"/${PN}-5.3.0.0-unbundle-json.patch
-	"${FILESDIR}"/${PN}-5.7.6.0-commons-lang.patch
-)
-
-src_unpack() {
-	mkdir -p "${S}" || die
-	cd "${S}" || die
-	unpack ${A}
-
-	# build.xml disappeared from 4.4.0.0 although it was there in 4.3.1.4
-	if [[ -f build.xml ]]; then
-		die "upstream has build.xml again, don't overwrite"
-	fi
-	cp "${FILESDIR}"/build.xml "${S}" || die "failed to copy build.xml"
-}
-
-src_prepare() {
-	# upstream likes randomly changing a subset of files to CRLF every release
-	edos2unix $(find "${S}" -type f -name "*.java")
-
-	default
-
-	# OSX / Windows
-	rm "${S}"/org/gudy/azureus2/ui/swt/osx/CarbonUIEnhancer.java || die
-	rm "${S}"/org/gudy/azureus2/ui/swt/osx/Start.java || die
-	rm "${S}"/org/gudy/azureus2/ui/swt/win32/Win32UIEnhancer.java || die
-
-	# Tree2 file does not compile on linux
-	rm -rf "${S}"/org/eclipse || die
-	# Bundled apache
-	rm -rf "${S}"/org/apache || die
-	# Bundled json
-	rm -rf "${S}"/org/json || die
-	# Bundled bcprov
-	# currently disabled - requires bcprov 1.37
-	#rm -rf "${S}"/org/bouncycastle || die
-
-	rm -rf "${S}"/org/gudy/azureus2/ui/console/multiuser/TestUserManager.java || die
-	mkdir -p "${S}"/build/libs || die
-}
-
-JAVA_ANT_REWRITE_CLASSPATH="true"
-EANT_GENTOO_CLASSPATH="swt-4.10,json-simple,log4j,commons-cli-1,commons-text"
-
-src_compile() {
-	local mem
-	use amd64 && mem="320"
-	use x86   && mem="256"
-	use ppc   && mem="192"
-	use ppc64 && mem="256"
-	use sparc && mem="320"
-	export ANT_OPTS="-Xmx${mem}m"
-	java-pkg-2_src_compile
-
-	# bug #302058 - build.xml excludes .txt but upstream jar has it...
-	jar uf dist/Azureus2.jar ChangeLog.txt || die
-}
-
-src_install() {
-	java-pkg_dojar dist/Azureus2.jar
-	dodoc ChangeLog.txt
-
-	java-pkg_dolauncher "${PN}" \
-		--main org.gudy.azureus2.ui.common.Main -pre "${FILESDIR}/${PN}-4.1.0.0-pre" \
-		--java_args '-Dazureus.install.path=/usr/share/vuze/ ${JAVA_OPTIONS}' \
-		--pkg_args '--ui=${UI}'
-	dosym vuze /usr/bin/azureus
-
-	# https://bugs.gentoo.org/show_bug.cgi?id=204132
-	java-pkg_register-environment-variable MOZ_PLUGIN_PATH /usr/lib/nsbrowser/plugins
-
-	newicon "${S}"/org/gudy/azureus2/ui/icons/a32.png vuze.png
-	domenu "${FILESDIR}"/${PN}.desktop
-
-	use source && java-pkg_dosrc "${S}"/{com,edu,org}
-}
-
-pkg_postinst() {
-	ewarn "Running Vuze as root is not supported and may result in untracked"
-	ewarn "updates to shared components and then collisions on updates"
-	echo
-	elog "Vuze was formerly called Azureus and many references to the old name remain."
-	elog
-	elog "After running Vuze for the first time, configuration options will be"
-	elog "placed in '~/.azureus/gentoo.config'."
-	elog
-	elog "If you need to change some startup options, you should modify this file"
-	elog "rather than the startup script.  You can enable the console UI by"
-	elog "editing this config file."
-	echo
-	xdg_desktop_database_update
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-}