gentoo resync : 25.11.2020

43 files changed, 4094 insertions, 842 deletions

diff --git a/www-servers/Manifest.gz b/www-servers/Manifest.gz
index ae703c2eff17..00501fe58716 100644
--- a/www-servers/Manifest.gz
+++ b/www-servers/Manifest.gz
diff --git a/www-servers/caddy/Manifest b/www-servers/caddy/Manifest
index 9e0f852e8861..6e23f10ce360 100644
--- a/www-servers/caddy/Manifest
+++ b/www-servers/caddy/Manifest
@@ -1,4 +1,5 @@
 DIST caddy-2.0.0.tar.gz 350050 BLAKE2B 5cf53b85fa267d6686ce00754d4653013aab56e1fd076f4c4f8c864d57f924ab3fedaba4bce24972159e83ce7ae3889b75d5d0e259c8d77a0620e0b53b3888e2 SHA512 b7393f117e33529990424a78804c0e04a86ff8af8393564134066ab7b6a1d64a141b73708928209c1f29147a2f8fd94b2056f11642b8205b6de4ede6a783f2af
+DIST caddy-2.2.1.tar.gz 390153 BLAKE2B 982a0a6ca171a50969211240a72befe572c9f413be840914581b24f8937a0e747d58838f9bab0497844169644494955427db55fd1166416caf23916d8569f1ea SHA512 9d59bc87c923da61caa7b6be2e4a360dac859b17c24a46207924b44dab46498931eb64cc877ed9e32d0b70f6b62798c85db741b58f52379c73052e9e4bf8e38f
 DIST cloud.google.com%2Fgo%2F@v%2Fv0.26.0.mod 27 BLAKE2B 814b0fa8f12d5ce6171fa629b5a7eb34e0e882cc0c5430986896bb38c243e08dc83098f271227f4ba019e78f16dc97fbb381e833aff1819833d243b08add916b SHA512 5132f3438533427c0ab0fbb7a12112a7830ea9122662ed46019ff89c71d9cf80c02edc32dd5c892da572031b5a2cce100f2602fa6a19bea6be7c02781f701273
 DIST cloud.google.com%2Fgo%2F@v%2Fv0.31.0.mod 27 BLAKE2B 814b0fa8f12d5ce6171fa629b5a7eb34e0e882cc0c5430986896bb38c243e08dc83098f271227f4ba019e78f16dc97fbb381e833aff1819833d243b08add916b SHA512 5132f3438533427c0ab0fbb7a12112a7830ea9122662ed46019ff89c71d9cf80c02edc32dd5c892da572031b5a2cce100f2602fa6a19bea6be7c02781f701273
 DIST cloud.google.com%2Fgo%2F@v%2Fv0.34.0.mod 27 BLAKE2B 814b0fa8f12d5ce6171fa629b5a7eb34e0e882cc0c5430986896bb38c243e08dc83098f271227f4ba019e78f16dc97fbb381e833aff1819833d243b08add916b SHA512 5132f3438533427c0ab0fbb7a12112a7830ea9122662ed46019ff89c71d9cf80c02edc32dd5c892da572031b5a2cce100f2602fa6a19bea6be7c02781f701273
@@ -65,6 +66,8 @@ DIST github.com%2F!azure%2Fgo-autorest%2Ftracing%2F@v%2Fv0.1.0.zip 13692 BLAKE2B
 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%2F!data!dog%2Fzstd%2F@v%2Fv1.4.1.mod 31 BLAKE2B 3f699ae120e91b47e91e35449ae06e146a77a3b8c6834a6494ee4809e3f524bcfbb7b0d9a53b6c64b6ba9f3b1814a7cefa525030871557e52e54be629bae3aee SHA512 5d47517c29477f39a7f12d63ee80c1c64cbbe8065ede96732c133a0159e541b95bb17f10fea0ed5acde361deb84cbb66e79a38cf4be0dc7b28d8b8e342d45a88
+DIST github.com%2F!data!dog%2Fzstd%2F@v%2Fv1.4.1.zip 565502 BLAKE2B cdcd85a821838a709b28b3d7e8dae6af9d562f7394ae155624f9975900cad193d91ed80e6183aff82d95a367a8ce0af28c575cefd5f8cd16b7bc16596f6eb22c SHA512 e4551cb3fb58cc60e1e141c2c11952c524c07280e530309ffee13ade0e9cadc873def7b279d024b3efb3d6aada5817c2d248aaf140323507172fca2d2d5a1855
 DIST github.com%2F!geert!johan%2Fgo.incremental%2F@v%2Fv1.0.0.mod 53 BLAKE2B ed6781e3006723a251f94bf5f96aba2964e7926617255ddedfb932ba74fd3265fe28ec906b90f7f1956509f521dc2c29701fcc7301513eb1a1764d33e50c2c8b SHA512 e46209635777bfc42c4399ff0eef13320a9b5d7a23dbe26f79da44a462b14941a949d812c586c023e3b4e617e741612ada3db8da7ae4e70ab242b8ffc123e880
 DIST github.com%2F!geert!johan%2Fgo.rice%2F@v%2Fv1.0.0.mod 349 BLAKE2B c25e546d66f5bb4679a66949169f3a4568602a7b6f8ac1386bfa7993704d79821c07d4f0931cc2779fb862b73465ed41d0f050f59149bc39dfa1602ea706f207 SHA512 51a8db67904d3f632dfad620e223c7b59efe42d8254bd4e0ef49ef1a40759e1dbe4558f87209059841b80e0ccda5130cabef7c869a399eff3786d4b4d8d3a747
 DIST github.com%2F!masterminds%2Fglide%2F@v%2Fv0.13.2.mod 36 BLAKE2B 90eea1d6bfb78f872b781706703178c3c010c549c94e28eac0b3ca2ca2ee4bf126bb5320fa8bc0c22aa2aeebb2361572081014253d12a0a8dcfcf28ee607a554 SHA512 37cffb84d5a0e51f4306f042f62a549cbac31f714b497a590149c78d1a16d9b9fb7c3ea9c4c89856dc38b1548fe18afbb537628f0c511faab6a4eb631bcbf43f
@@ -76,13 +79,18 @@ DIST github.com%2F!masterminds%2Fsemver%2Fv3%2F@v%2Fv3.0.1.mod 49 BLAKE2B 75301d
 DIST github.com%2F!masterminds%2Fsemver%2Fv3%2F@v%2Fv3.0.1.zip 29369 BLAKE2B 675db8802b544429f3eb3d03016b3362d17aaebea0ae931b8d610afa1c2b38baf78e591b640f1e180a96f5c32f5da50030a70847de3e6d831a06af8a4d7d95a3 SHA512 3612d456e242b053cf9af4518aa101a3f1b2d24893a2a7cceb9943ad0a1e96a139b48f22c3a8055dce13e05540f9115241ef6e2e09d78ddf37e61cacc3299844
 DIST github.com%2F!masterminds%2Fsemver%2Fv3%2F@v%2Fv3.0.3.mod 49 BLAKE2B 75301dd276a9f53c22d9d15f2ec4fa32cb90eeacabd9ddcc604d7f306d7e9481f9ed3f8f8bdfa5090951623f2ad2bdc671808dd8eae512bf911be30a6b93cc99 SHA512 7b9615ed8dbc53987e0370b5ff24bf62bfbf4cd3644859b735dd267826ce75177666106d8447a113dd508542086919336c82819385c92ee520082f6f6ada7ac9
 DIST github.com%2F!masterminds%2Fsemver%2Fv3%2F@v%2Fv3.0.3.zip 29035 BLAKE2B 44ceec916a8ed19a1e9bbc3b4b4f325e5b9fe1d55991553f30eac70b3ad3b93ae92b1f0487ed57354b40db1b5b1458885a127c5db92a27ee806b9f8f1498f3dc SHA512 3954271496e703d876e1bd9716ae1bdfcde08335cf20915aefa71c5ade8a836733f0635005d9eda8b01fb1991dbfd25d0df2aa71a1d52ae3677477eb34382aab
+DIST github.com%2F!masterminds%2Fsemver%2Fv3%2F@v%2Fv3.1.0.mod 49 BLAKE2B 75301dd276a9f53c22d9d15f2ec4fa32cb90eeacabd9ddcc604d7f306d7e9481f9ed3f8f8bdfa5090951623f2ad2bdc671808dd8eae512bf911be30a6b93cc99 SHA512 7b9615ed8dbc53987e0370b5ff24bf62bfbf4cd3644859b735dd267826ce75177666106d8447a113dd508542086919336c82819385c92ee520082f6f6ada7ac9
+DIST github.com%2F!masterminds%2Fsemver%2Fv3%2F@v%2Fv3.1.0.zip 29693 BLAKE2B b82bf12654737a5719056c9aa16c0a2fbb510fc0680844485c79b45c1d54c2254832f41517440f4ff37f3d7bf292f594dace50038e221ef790ded3ccd18bef24 SHA512 ac438522dffc4312f7b67ae0dabd8b640584f5c934682e316b212c106cd4046486bf9a29ea4a7f00afbae98288b95633acb2cacc5034da65372fc8fb9e15a505
 DIST github.com%2F!masterminds%2Fsprig%2Fv3%2F@v%2Fv3.0.0.mod 405 BLAKE2B 8b1bba137a8b24663d45eac0ed56e83f148438910e8dfef338cad483c366624dea27eeb84bee8b699640002c7f2db21b564901a318a409809ab3fc41526a68d8 SHA512 51877bb3be8b8a388b82ed7876dd4023ebe4b5ddf59ee30c5ecea31fe0420e1f93b963d160e4b91185eb33764015a3381c4bac4dfde60548a800b5668bae4a6c
 DIST github.com%2F!masterminds%2Fsprig%2Fv3%2F@v%2Fv3.0.0.zip 65549 BLAKE2B adf2f127d73a027e234dfb60dd5edb84bcc08ae8f378429c192a1deaa021ad2f4b592412475324ca187e33a6500d02b3f5200c42fc9bd54cfb290c7599da5d43 SHA512 2596e3f541f941b9337289fe3a30f2e90b617bd81d7444c90c8f5fb54e18484e9c7c12e88ebdbab3d18507d3847566bffc464081bd81708771b5ec9b30bd4d29
 DIST github.com%2F!masterminds%2Fsprig%2Fv3%2F@v%2Fv3.0.2.mod 405 BLAKE2B 9c6d467ebf1d4627bf376f7865a64ec587bbddc41b8032daf75b67cf799cbc1c6a30d7669fad3463cf58d0ff51d3aa077a81e85ab007809ee36a82fefb1374b7 SHA512 264a23b0fae206105a5cc428d7e3c11793c4cde9c5ba9f0db326d22a903d4652a7002ba353a574a5da50b289b2d07f9d3371d82d0aa5968cf4e9ca45cb921993
 DIST github.com%2F!masterminds%2Fsprig%2Fv3%2F@v%2Fv3.0.2.zip 65647 BLAKE2B 76553a2c54a36401fa6ef3c374031bf593f209d692373f78ffef942a27dc5d7d453c3f06382acb8ac6c1c0eca87c8cddb0038080f07b5d61aa0050d462936e6e SHA512 5bab547c857895610fbbb16c589ce96f0025b19ec5da08d2249dae2815c536cd1f9def2fb2767fab49ffa6ecdd52ee1b769a69435a78e63ef03fcd046e18d1dc
+DIST github.com%2F!masterminds%2Fsprig%2Fv3%2F@v%2Fv3.1.0.mod 405 BLAKE2B 1fc7d2cd7fcc518aea753db768465f5a16c8ba91fdfe7857bd4e8ebc9dae9dfce8565fa6e5c97f2d68f8446797480a4d7239f9f34996cd0427fa01e4b11e0778 SHA512 c7dec4a7d2b69239d4e583bec5839b7611bbe03d2274740bde007bdf72afefcb1e6e189242b30c48b58bec88eaba888f68abfbbd2a0ed851e38698a81f27f54d
+DIST github.com%2F!masterminds%2Fsprig%2Fv3%2F@v%2Fv3.1.0.zip 67936 BLAKE2B 658935dd88446c8b33fb2bde13bc46975b49e98b50855149984485a4c1ac8b85211b43c428e7cc461dea615f784390f1439d338185833cce17b692e3e33b2b10 SHA512 04c1aa98bb863370b0075ed39dc999525ce7a6d8b1bc3bfa99e16ea02c6734889720cab7e7f820bee013bdcaaef57a3bc74d7cb02a1789e9892c5775d42bb01e
 DIST github.com%2F!masterminds%2Fvcs%2F@v%2Fv1.13.0.mod 34 BLAKE2B 3775b686ef0a7d190a38eb6cddc8a2c5d0dff7ffc656dc762ea8733def2abc81fdc3f990854a9e3e97cacdac3149be6a05f7b271cc7f8d63d11ac3512f2d64e8 SHA512 c5c6e7621f9018f117ead83e96a26b75c7f1c0bf2a71579bcdf494e1bc49553c4def4b4246f740970ed52851a66582695702c8fe2f619073e6422e593a350143
 DIST github.com%2F!microsoft%2Fgo-winio%2F@v%2Fv0.4.14.mod 177 BLAKE2B 1b5b5169436173ec669c16023c6993e233f5fadbb574533e7e2db2140c2db22cd9b8697135a46fe7d8787b8e5ae8c16019f15e5cd7a8c4ad59a46f6e6db9bb5e SHA512 83b5d04d488db971f78cd1853903e7f5cb1d547d5b5270bcaf35aff4240f0b96c300ce311014775028e1424c6fad714991c27f0c676d8b8eb37aaa62330450ec
 DIST github.com%2F!one!of!one%2Fxxhash%2F@v%2Fv1.2.2.mod 34 BLAKE2B 83966cb7de9bb687f99f17c5c89c03718258d2df34e3dda01b96a2fcb1273a0ba0e3253ba5950d5458193d3e54962371317a8fe85020ae338b44e864bd96667f SHA512 9081c69a2480ef726f547047306dc9136211ac7550882e68d458e2c04e5343366cb08f20525a51c804ab9a554dfe8363a1d9660bc0f9e501e1d996f7b6f320e4
+DIST github.com%2F!one!of!one%2Fxxhash%2F@v%2Fv1.2.2.zip 17606 BLAKE2B ee5acf57c658d87b97b533d695cb72c9d83e281f9e533271f03d85d52f92c3c90e240f3b6d2a01bebbea6befb147ab66d7f75c403fb8bb3e58a2bc0bb1269f6e SHA512 89912d8630bed5c71dcf391b57e4537b93f01c4f1cf320a8c11d5d34d47fa4e3ea4abbfb3bc3aa76ad3cf08350da67e190cd80322597d0de3123fbaccbcea9e4
 DIST github.com%2F!open!d!n!s%2Fvegadns2client%2F@v%2Fv0.0.0-20180418235048-a3fa4a771d87.mod 41 BLAKE2B f15406a71c1091ea2c2bf262a96e7976a737914548702da94f1c0353dfd518f03972beb46d743915fa7a6173bf47ca94a853c40266e152386fba9a04bb688e19 SHA512 39317e44be189a47107f71b302a895ab57721d39c464aee35080866486b67a0f257151e1e4f09893e3c87626d6558917b68ce69cbeeedd8d9f341683ffa14683
 DIST github.com%2F!open!d!n!s%2Fvegadns2client%2F@v%2Fv0.0.0-20180418235048-a3fa4a771d87.zip 8063 BLAKE2B 4c1eafbf2516c51fd76cb712e5ce034dfe30579ed8b1182317b699a11fa27d32cdaeb64897eb7c0aeb5388551b27ef328e26f09a75db66d75dea1c09b3710726 SHA512 b03a6bed0f788c7e54be5bb8f01622d8ddbd95322bed75d8173c712b8e4425f0a925184a28f7690a9dd1b40d0fd24de012a4bf3b1b2314258ac14bff7698d7f0
 DIST github.com%2F!open!pee!dee!p%2Fdepguard%2F@v%2Fv1.0.0.mod 39 BLAKE2B 8a682140a1d07e82263b0e833426a913fe653381cda13a51ae57546b3364268706318eac76964341746db81863adf5d617ae6f35c5f99975b7678760e1ef98ea SHA512 d513ea6695c5f40b36e8f861d4004e3c8d222dd6568ab60b836dc80608e7e58cfb08e76718a706ad6064da16e3d0d75bb90cc5a33b4ba3a1e0b1db8e6eda7eb7
@@ -103,10 +111,13 @@ DIST github.com%2Falecthomas%2Fchroma%2F@v%2Fv0.7.2-0.20200305040604-4f3623dce67
 DIST github.com%2Falecthomas%2Fchroma%2F@v%2Fv0.7.2-0.20200305040604-4f3623dce67a.zip 787011 BLAKE2B 9547a16fac8182b8c24017290c1399209df4e950431aa58ddbcc8ddbbea1b40c755f0f373ea7069d5e58a83156d479527176ca8ff8d9ade747ccb03b7d550c45 SHA512 9b5e4672141b347c2e9dca72ddc0deb5b18aa4211902a14f496980501bd1490e510c1b570f3d110696a884383e96a5bc705e8ac20ef80db5a5cf8afefe1534ea
 DIST github.com%2Falecthomas%2Fchroma%2F@v%2Fv0.7.2.mod 674 BLAKE2B 41eb6ab1dedaf85f4eae33fd39f9bcaab0aad42ade09b145bb36f0f1e254c8e0b55584f4bfedd0c813ba7bdd0c26ba2ea09b8af9e8c7b622710550918d9c02fe SHA512 b8d1d453815756d8d12d6a5009921a7967dee726884bef700ddfe5318b16a29f834734857f223c6d6a5d8d676c65d1c8ccdfbdbda849969c0c572c63adb59fa3
 DIST github.com%2Falecthomas%2Fchroma%2F@v%2Fv0.7.2.zip 764704 BLAKE2B 5d71f83694161f6c38edc1074d6f092578699c99287c52f1002eb6313f0e8f475a2e353f3fd629be30b6371732b1088ad8daf66660f68514be01fb240c169fff SHA512 ef6bfa7b06dacf38db3a533b8b5b175ea4edb0a75bbaaa540ac6914ba2e1536bdc1fcdb9051ea9f7acd31ca70c4dba37cf6ed73060747fbd5858d518fe200294
+DIST github.com%2Falecthomas%2Fchroma%2F@v%2Fv0.8.0.mod 687 BLAKE2B b987855d98e0e6181e8f28c12976081b5e0699cffc79b0721c811eaf6962e6edc5a01135519f787eac6d38e742517aa4d6e061ac4e5ba986e5c5e0cbd2a19177 SHA512 bf5c7b4933d685d90882099aa8c5bc33f8ec58e5a35138180b58771185306b6119cfaab319a43ade929b4560be9746f9155c8d55d1755df12b177613982c7617
+DIST github.com%2Falecthomas%2Fchroma%2F@v%2Fv0.8.0.zip 795117 BLAKE2B f271cddcaaa2b428c91a916f63fe5ef194ad11a7af6a921c2ac15dbb39507e0f6f8f71e097e49a46953bf7d647285f73aed8784d1fd38d987f6ea1e25809318c SHA512 ac7bbf0f173de0d7100db4d28b457ee1f810441198415365cfc501e731b28c0b396e8446ed3ebb0fcc849a5ad00b2704d994f493dcc172b5c538441d8be73c98
 DIST github.com%2Falecthomas%2Fcolour%2F@v%2Fv0.0.0-20160524082231-60882d9e2721.mod 36 BLAKE2B 60ece6720c6735e5b01efc335fef7d7f1186087068e573d5fa073b811053ea60b761350f9c371dada8cdeb5b285911c4ff87495b800f9c19ffeb69739f4b143b SHA512 971e35af5346054a0930f5543dc936c5f32ca801433d3ca26461ae7c1583b4f814376e8880f4d5329c46c36a3bde5ee4290b825bf19fd70c6bf2fbbab03f8ff1
 DIST github.com%2Falecthomas%2Fcolour%2F@v%2Fv0.0.0-20160524082231-60882d9e2721.zip 4919 BLAKE2B a939fbc897831f04ef6995f3d6220d56b8b3a8e3ae4486b605b9601aeb5bf764249cdd619248ba55b650e15e208a720fe1571df99a850a0b742755ab36f86c0f SHA512 7947f0ed3b2b42b8454af3cfb0fb27ec38af8234936d7cfe29017d1168b80873dbb6ac1345719fc5c405df9c814bd732a4ecf6f985da880f4ad83cf2f25b7834
 DIST github.com%2Falecthomas%2Fkong%2F@v%2Fv0.1.17-0.20190424132513-439c674f7ae0.mod 252 BLAKE2B b5f48eb1337d61fd08a98d21e76d501d1206aaa607f1a112ca1e9240a3e87534db351cef7ed8768b48ba7ed956cb8f1d2cf393f1cbbd1df695d6bde55ec9a1dc SHA512 5d0b90c334067d9df55deb984b909ba31197e987c9d28b4fbda73995458762f319dac2bf152f4c36263721fe2bd6f5651d508bdcba61cf7f574ac332ec0dbc78
 DIST github.com%2Falecthomas%2Fkong%2F@v%2Fv0.2.1-0.20190708041108-0548c6b1afae.mod 252 BLAKE2B b5f48eb1337d61fd08a98d21e76d501d1206aaa607f1a112ca1e9240a3e87534db351cef7ed8768b48ba7ed956cb8f1d2cf393f1cbbd1df695d6bde55ec9a1dc SHA512 5d0b90c334067d9df55deb984b909ba31197e987c9d28b4fbda73995458762f319dac2bf152f4c36263721fe2bd6f5651d508bdcba61cf7f574ac332ec0dbc78
+DIST github.com%2Falecthomas%2Fkong%2F@v%2Fv0.2.4.mod 219 BLAKE2B 188d73a4d4cf4bcb52cea7b32d8d8898086532d50e8ed0e92825e2b34ae1e035111dbc27b995b9a12d70e6be509d99bc693a0af8e3734641dc23cd1da39cf984 SHA512 165cb7ab17309c66d509af018c8a521bd90f9a58fec8fa9437e5b32aa2105ef1be19a1a0a1b13a51300e308c5e63c6cb74897ad938bd6f8b3bfb2d372347d02f
 DIST github.com%2Falecthomas%2Fkong-hcl%2F@v%2Fv0.1.8-0.20190615233001-b21fea9723c8.mod 216 BLAKE2B 60964b79efee4fbf34288b3d659551eb51191e85a067b5c73751f22496bb8baafb68199cdf4580bf256133c1cc51e9229952cd4436b241f98db4d1e5e7b61fd1 SHA512 44eabb63e8480c53e9abf8ea92ef6cdb6dd5a6318f62993f5e21e4d1ebf80fff7217a5f5137da822e6d84f1ea7b078f04ff97f8e33fb36b9b37a478b0eefd527
 DIST github.com%2Falecthomas%2Frepr%2F@v%2Fv0.0.0-20180818092828-117648cd9897.mod 34 BLAKE2B 6b3b01c8066b701d0ea30efa5b144fe9bfe8e9f196ce4f0dce058e0947890e4f2d458bdade3816c3df1e35a972bbeef478c91e02579f81116603d0dc20855315 SHA512 5896c9174737c300a726f70b7d6300b892e790e41598b5f82ec82aca020f93159f9ea94afb6a4db605aca196d527a7a42df9b1babb73b8d182fe6749e95975d0
 DIST github.com%2Falecthomas%2Frepr%2F@v%2Fv0.0.0-20180818092828-117648cd9897.zip 5773 BLAKE2B c1026dc04da3122194368b90c597d7a3b7a90279d5ca27e6f3b397f0054c4f51dbb61205804fb0257c07ce078ec3b328fdc638e752411b379474cd51d2337488 SHA512 0c048e8778641577f394433483fdd4f916c9ff16ddd4d7b1b37c4b999b5107353e6867c2b2430b183027807e53f160ebb2419ad85f1d1b2e0bc0b190efe47352
@@ -123,6 +134,8 @@ DIST github.com%2Fanmitsu%2Fgo-shlex%2F@v%2Fv0.0.0-20161002113705-648efa622239.m
 DIST github.com%2Fantihax%2Foptional%2F@v%2Fv0.0.0-20180407024304-ca021399b1a6.mod 35 BLAKE2B 42febcb2e06c46797f14a850943d1df3c0e15630f376b8f1c860cf4e26ae4e2acbb38947f1348f501665f719943510aa2c0ad091f336e635430408794e61feed SHA512 c3d0bc6de3cac8395d0a231f041437b4caf00a4678270ae447b2e76bba3a588a6913cc1df6ba438bf6dd361b48860c365e9d32af55575208bd0f4b705b0504f6
 DIST github.com%2Fantlr%2Fantlr4%2F@v%2Fv0.0.0-20190819145818-b43a4c3a8015.mod 31 BLAKE2B 8ba7e45848280b2365b9c8fafcffd70ac32c1c22bca0d2bccb965b98f1aba961faba0824e33941ba06e7330a7e89d6804860ce16e0c0d6dcff77ad4d9f8e68b6 SHA512 f82c53780113048de082df94ef28072fbd86dadd4531270567ee8cbf31295b2590973c83992c2271df2cc1abe0cad808e4d8c5f7857e3dfc94768db69327d2c4
 DIST github.com%2Fantlr%2Fantlr4%2F@v%2Fv0.0.0-20190819145818-b43a4c3a8015.zip 5521853 BLAKE2B c5e12e4cea51874affa518311f7b92ad609b5fcb69fa5080c0d14738efb1ab4b75a7ea5419b91d51f8bece0990baa3c3ad8d0cd9ad29b5d88eedf8be6d6cc408 SHA512 b6bb5b340417579aff36ad9cd732ddab6fce3065605d0f4577867a2c64b3801103002175811321d10ffbf63c5ee3865ab05ef72b1cb1cd77af0a2bf8180acc64
+DIST github.com%2Fantlr%2Fantlr4%2F@v%2Fv0.0.0-20200503195918-621b933c7a7f.mod 31 BLAKE2B 8ba7e45848280b2365b9c8fafcffd70ac32c1c22bca0d2bccb965b98f1aba961faba0824e33941ba06e7330a7e89d6804860ce16e0c0d6dcff77ad4d9f8e68b6 SHA512 f82c53780113048de082df94ef28072fbd86dadd4531270567ee8cbf31295b2590973c83992c2271df2cc1abe0cad808e4d8c5f7857e3dfc94768db69327d2c4
+DIST github.com%2Fantlr%2Fantlr4%2F@v%2Fv0.0.0-20200503195918-621b933c7a7f.zip 5551669 BLAKE2B 551127506bf4b093e1f9331065d7c0fe2f80b1f0764334bef9bc77608ff67b8834ce8d4f512a281e747ddebcb0f23d5fc0a63a5b7191c5067234983c6eadc649 SHA512 b404ac23139a20bbdb68a2fa291903c581c5a678b0a2543cb75ac69f5b1ebb3f0548d80726614cd8fe8c3e9bc151c6dc94e6560677ec35a732f8e1eb229934f2
 DIST github.com%2Fapache%2Fthrift%2F@v%2Fv0.12.0.mod 32 BLAKE2B f5b7273a6c32fd9eb6e4a8956477bac6cdc2a5415eb1dd5dfa5dbafb28f5f8d1cc477196a4c3347025d9c184bb68ab269f4622ae03a01516f5e9c67124a10776 SHA512 190c3c9b3fe9e247246976b3c916c2ff41da6cfc04091de1d050eb78badedb067d9e960c2295a17b167ceeaf27fa62d149b33a8794ff2bddacf93e9731660564
 DIST github.com%2Farmon%2Fconsul-api%2F@v%2Fv0.0.0-20180202201655-eb2c6b5be1b6.mod 35 BLAKE2B e9ca430f98cfcfdc5bc1e50ef421253011f21fe2a9a06b15b4b818f336c64a544ede9a8d1552740e85358fcb16a588345124b06fb2788951c24c9dd92c3b1cda SHA512 a0c76da94f068f583607520b728036f45ea071b727d3aee601eee712bd952b5f6c8cd5df1e1484195b07bb4c3b224771dda1fc7848dcd086a6dc93ada3ff2ce8
 DIST github.com%2Faryann%2Fdifflib%2F@v%2Fv0.0.0-20170710044230-e206f873d14a.mod 33 BLAKE2B c5557c9c02300d9fc6ecaac5694461cd440f5a1f5cf9ddcdb38e6fc51d9a55d9ca1e98bfabecb6c83fce81e87979e66e56c585760ef61fdf1866480c0e32eab3 SHA512 15b2cb1fba3e5103879548ffdad032ae30f0e723cfd26fa6bcf69afff14b18c2cf3373f511702b3690fbdb7040996c437f9cd0253bdfbf211b665ff14e97aafd
@@ -131,10 +144,13 @@ DIST github.com%2Fasaskevich%2Fgovalidator%2F@v%2Fv0.0.0-20180720115003-f9ffefc3
 DIST github.com%2Faws%2Faws-sdk-go%2F@v%2Fv1.19.18.mod 109 BLAKE2B 70ae989bab9ef295dcf17e421481a371312fed6b07d1dd5e8892419c3dedea91dccd0aa0fc63fb728c24863b15ac24677261624ff16e75605678ceb39576b3d9 SHA512 89b17b1155f12c8a75fe85d815ef7724b96a009485b73e4df937990dbd6958b58cdaf8346610d5a614a3122450dcbea2687a510fba556b980d079cd3b1bee801
 DIST github.com%2Faws%2Faws-sdk-go%2F@v%2Fv1.23.0.mod 109 BLAKE2B 70ae989bab9ef295dcf17e421481a371312fed6b07d1dd5e8892419c3dedea91dccd0aa0fc63fb728c24863b15ac24677261624ff16e75605678ceb39576b3d9 SHA512 89b17b1155f12c8a75fe85d815ef7724b96a009485b73e4df937990dbd6958b58cdaf8346610d5a614a3122450dcbea2687a510fba556b980d079cd3b1bee801
 DIST github.com%2Faws%2Faws-sdk-go%2F@v%2Fv1.23.0.zip 12934706 BLAKE2B a53a13e819803c53690c2a2f508f9b7ed0c6aac597b320e9c99d5d7a9c6afe18a883b7c8a2d147d3ff4b1b8464247aa1e8f11e7ed5e34475084b96bfbe342652 SHA512 d944239825d73d1c496f924a51b3c02bc1cfb65adbc447442c9065ba0947977714602257f3b606a28518f4d5f889e0cfbe2eada703c1029ccb8cf81395bdc2b7
+DIST github.com%2Faws%2Faws-sdk-go%2F@v%2Fv1.30.29.mod 217 BLAKE2B 37aad2fa34cfaa65bef0b9aeaf421a69fecaea85895b1c30b24c31335ec7ce59e989478c08b1241fb5344d4c5708e1fab48e3b14c090eafc051b20df429e2969 SHA512 ec22b59d6d5febbe206b6697008cbea27b5ae35ee89799b92d7f137e205b6b4a65d2ebcc4ee00d41eca181a09ef8411513fc0ad851a6fb23db80c589a4d5c49e
+DIST github.com%2Faws%2Faws-sdk-go%2F@v%2Fv1.30.29.zip 16296182 BLAKE2B b8543af646c194af988d8bd920d07c62d116522e187ef8dc2554e4151760178d47c2b19fc6459e4b23bd9985663b177208e00b190081112f9bf96ebdf4ad9ff0 SHA512 4c9cff01d43cd5a9e2ae65c5948a29f3e14c4ef663490c397b99d64832fd68d1ad8ea072da1aa65806ac2f207ba2b587f5c2e5ebdea3351066835dff7f46f4d1
 DIST github.com%2Fbaiyubin%2Faliyun-sts-go-sdk%2F@v%2Fv0.0.0-20180326062324-cfa1a18b161f.mod 45 BLAKE2B 224d034afb0473cdf6f065978a0b8cbaea268a46e3dc6b1b8ea89bed2d013ff52bd32408bb6d768097d3ddb20f95e35953b9b679439309ff832b2481d4e35401 SHA512 b398c531571bc397b2d97f369731fb7bbe8e07328f95043dec62c9be4a9f09562a0ef0faebeb05f1bafd488a77c30e6e957189d54548ddb94b9dc115b85dff53
 DIST github.com%2Fbeorn7%2Fperks%2F@v%2Fv0.0.0-20180321164747-3a771d992973.mod 31 BLAKE2B f69b0989e51b0b649f81b044169fe4309f130eba5bcc6ff33aa9666b1b754aa0e524b8c7a627a91000ccc4f93bf93cdee3e97bd3b2184b050878bc3f413f0c72 SHA512 f21fd002853e4435421f8396e6be016f65be1537815c60d23940caf26e3f14dd6f2caac802cb64cd586b1b1f1220b2727de347b3d1816b8e741f68d87ebcf03f
 DIST github.com%2Fbeorn7%2Fperks%2F@v%2Fv1.0.0.mod 40 BLAKE2B ce42c81a7dcb03d21a99d6240ce12f8455297722513497b1a75f2c848b5fb7ef70b577c2406638442f16beedd68806de890a5c299cf1c008c439df23df2f5bb1 SHA512 ec4424da8e1e3849408da7bfe83d37e21ac75edb889de8ef63be897d59678679b018f4606be78500952e7eee73a6252ee6e477b1a1612e2d036dbf72c17b9c9b
 DIST github.com%2Fbeorn7%2Fperks%2F@v%2Fv1.0.1.mod 40 BLAKE2B 6cc86f2bceda8617678a251604b6c049cfdc80f9afcae0cead6b2cd04f90fe1b5d5d56d0c29f98fddd7f4ff6fb4a0f97c052193b153dbfc772cf6597d664c09d SHA512 d0c78b8f08d177e05148ce845f8d720fe79a193a420c12ce15504af8fa3dffc4d2fcebea8030f5cca90aff5775013e2252e0c289d4ed5094e07657ea97a79570
+DIST github.com%2Fbeorn7%2Fperks%2F@v%2Fv1.0.1.zip 14678 BLAKE2B 6647c66a45f2dc67b83a1e493bc73d4439de7962f7f1472dc267be9a9408b5ddda66b8ee2fdadf18b2973648035fb3907fe539a8b7ccb768b8c99c4cae573eab SHA512 f973efba5ce7c651d9c3e4e467a1423b00b102034a054874d09977957b7b55557e05da06fb4c158e693db7bac01bf601f950cae0d411dc92afd0686d7e1de4cf
 DIST github.com%2Fbgentry%2Fspeakeasy%2F@v%2Fv0.1.0.mod 36 BLAKE2B ad3bb22bde28277f26a819b093ab7392da57c027bfb91bbbab4686d225ddc4e239c0905f6eec64cda2fd47746bd625682f663a11007bdbbf64f9cbff7dd1de76 SHA512 f961ced2c3e902be60fb862fff6b1c4457c57bd7586375a18857863be63d9b3ea998b05fc0c9c3a7270387e9907861d6f9d6ce4024643ec84ea6a63e59e915c1
 DIST github.com%2Fbombsimon%2Fwsl%2Fv2%2F@v%2Fv2.0.0.mod 339 BLAKE2B c3d4dca2fe6d21c32f0266aeccf5dd64efd07f0c5539389571ebc46330a858da87f7adc8381ce43f76dfdd3f844b7ed80cfb5e9fdfdcda52c24974f103aaed02 SHA512 ce2b34b8d77541c7e222a43ecaa3b2b3a434ab7f6d2fd27efb1e56b3be5e693ed4251f22eef4bd53a7abd1d992c3368dab3d08cb50265c164d68a9ccaae90493
 DIST github.com%2Fboombuler%2Fbarcode%2F@v%2Fv1.0.0.mod 36 BLAKE2B 357371a37d5f2ee657900c4ca455d9aa8aa993989fc6829e182a2c72586f18447600442e31110c5a01f6fbb8de8a17f881d86ee6b882b4b27db1bc566ca33fb4 SHA512 1487d5ffde5f6d64bc21be1aa02926261a519fad462731254f03cf124758162cb6f6848fe412cd5b02606674f566ed213ae4fb7b5e54afe29df5ea60e08d3c03
@@ -142,13 +158,17 @@ DIST github.com%2Fbradfitz%2Fgo-smtpd%2F@v%2Fv0.0.0-20170404230938-deb6d6237625.
 DIST github.com%2Fbuger%2Fjsonparser%2F@v%2Fv0.0.0-20181115193947-bf1c66bbce23.mod 35 BLAKE2B 87fd74b3a198f0c8a9897797611b73c9017378af758bc559464b3e91a6f57ecc39752ad6ea9d73ec0df128a794a3caa6384cf1092808275fe6a55731b6f0bf8b SHA512 082d6dfd13dc8bbe32bb5fc0c8c7e0e2d8fe412397df32f87639179374e57eed96f7eea00a3cda8c0c9a78b354f9275c0be3fcea4b6c797aa627dec71870a41a
 DIST github.com%2Fcaddyserver%2Fcertmagic%2F@v%2Fv0.10.12.mod 188 BLAKE2B 42c2a9f176078c0bab6328d932452e1e5759ff5afd7e677fe856822c8ac2fcd00585e5396b6a3fa1e7c3a9de9c8ba04b48022b3fa5c3f5d60b5b5d3de31ebd09 SHA512 c085274ee66cb69cc5dced44e4c88a157d34166459d85bdeeae7c14aa0b965a6d78b50ab634aa9482b963d34deffef46ac3c714ca72030d1730d0f6c6390419e
 DIST github.com%2Fcaddyserver%2Fcertmagic%2F@v%2Fv0.10.12.zip 125509 BLAKE2B 4b87f402a83c4115f7b677ca0f6e7133080e55893feaaf7753d0b9a5f2ef46bd2a80049cfdb323988d40d8c8c4f5c5caf38db31240d6cb9a8524b96765909904 SHA512 827d5c4c8c7cb37b9054cf4327c05bd73785b07cc08ae2fc7ea8dfa6063069e1eddd36a3d71df0c8d368761c28b42ec1958797906f145570f115bbbcfbd49255
+DIST github.com%2Fcaddyserver%2Fcertmagic%2F@v%2Fv0.12.0.mod 272 BLAKE2B 9f8c531b8295fd85925b5bb45b9be0a30fcb329ec0062867d4e9c0b5a8c22973e30a2f090bbd1329252f2ac3e90739cf5c6079d0f6cf5eebb78b200c86832936 SHA512 aceac486e795d9ca300ac2baca3ed5c14ba7ec5c3a77f2b3361cd1b9b21d0ab68df1f13ec4e2e6b408563291a2b00de62eaedae0a33c1eab5afdce419b9ff4d9
+DIST github.com%2Fcaddyserver%2Fcertmagic%2F@v%2Fv0.12.0.zip 122114 BLAKE2B e5f4d3bc4efde65f220c51e0fe29d6aed9e28f72736f2c6809e4c2e07bee0492b10bffd662cf4528412f454da681d0d828b80c657aec87e3905ad70bf8fa535b SHA512 45d671efff32db7ed54df5d869b54041b8f4d5585ee10ef348a7801296af7ec20efea7424500c08d786796f382e22593e61d81acebf41a098e421b008e1d6908
 DIST github.com%2Fcenkalti%2Fbackoff%2Fv4%2F@v%2Fv4.0.0.mod 47 BLAKE2B f238800b26c16806af21a26f7bc037b5b81768b47e48fb469740e3a8ef4febfa6514bcd86c596b8c9f4159dbc7d741cd17939f510394c1654656c27350952ff0 SHA512 c398310bf078b9e1c748d96334b1c10188057c8078ad7e7b58d0d0ac286221b7f95ae0ce6a69f6a4a4b8b50d89f2bddd9e03adfa447e37cfc250f395644c1764
 DIST github.com%2Fcenkalti%2Fbackoff%2Fv4%2F@v%2Fv4.0.0.zip 15167 BLAKE2B eb7731c90c7b266ab6fc4d7e64d52784d358a030e1f4075afd44a2b4a18a0635d89489fe556c7bfa6b3d24a03cff7f45c357744a027b0df64d1d44c0c299663f SHA512 d2438de57fa3b290212432a0879dce16034ddf02dce4c8e7e34341dc90c4a0e6e3f4c8ff4917ad73fcff0b2cb50aabc6c081e140f1a242e96b241853f76810ad
 DIST github.com%2Fcensus-instrumentation%2Fopencensus-proto%2F@v%2Fv0.2.0.mod 58 BLAKE2B d724c8e5ab039b227f3c437ba570398b789f53fe80db6f8e57fd2cb2199a5e7acef24d7451f9b27a4da464770660d31fc785c7165deafbc35009718851329fc6 SHA512 23d6171dbcf339c72fe25ab7a7e70cb385dffd654998824fac0f6b6464717873332d39fe1f96101414f5e2d240faaab0b960da2e31c08ef98443aa238bbf02d4
 DIST github.com%2Fcensus-instrumentation%2Fopencensus-proto%2F@v%2Fv0.2.1.mod 58 BLAKE2B d724c8e5ab039b227f3c437ba570398b789f53fe80db6f8e57fd2cb2199a5e7acef24d7451f9b27a4da464770660d31fc785c7165deafbc35009718851329fc6 SHA512 23d6171dbcf339c72fe25ab7a7e70cb385dffd654998824fac0f6b6464717873332d39fe1f96101414f5e2d240faaab0b960da2e31c08ef98443aa238bbf02d4
 DIST github.com%2Fcensus-instrumentation%2Fopencensus-proto%2F@v%2Fv0.2.1.zip 210929 BLAKE2B 7b1c57ae92e16ffa7370b069f7037dca01e73cbe8cc5723c092139779bdbae2c5a4483d623ec2b62322818bf324f2ef41e27b03a9b9ed82bafc5a1cdcc6f18b0 SHA512 4dbdefde602fa13bb1f0ab9dc6e947dc158defd284753b51bbddf9e52410dac5429e145637f155bb8703cfe8723fd2f5e4ec7898552d4a2956c8dfa01d4946cb
 DIST github.com%2Fcespare%2Fxxhash%2F@v%2Fv1.1.0.mod 146 BLAKE2B 5efa8dad622ae253ffa106eafea277fd947fc0f28e6962e461283ce2267d992b85b1f0eb9074a90009d8ed1d47f9e1f3e03cfc0eb7ad7df104282cfd144cc12a SHA512 32c34a590e6c113a16700ef2faa5124ebb6c8773cd76594312157bd2b70d54cd939ff2c32fac47421b5615e804142cb7b393394d4745d5894f9b68392bc37ad9
+DIST github.com%2Fcespare%2Fxxhash%2F@v%2Fv1.1.0.zip 12221 BLAKE2B ea2f826b4582ec60f51c65783408df0e065d2a752d1cba17aaf277e0c2b48779a3bf3579982dcc26e5566c899c3f933e4c711d2f1e01c98c13e73d46fa08baad SHA512 09432cff34f69e9b0cc6f0d5bb9af376efccb85ab4396c14a4e0c072272f3172a93c240c5ae0aa89eab91799d1bed1a0e7e00ba83682843f46344c9e2fc2d4b6
 DIST github.com%2Fcespare%2Fxxhash%2Fv2%2F@v%2Fv2.1.1.mod 45 BLAKE2B 350e937e3f7b254b5c590445a9a7f7cc908daa2a5f208e293ac414d50b46bd29671bb483e55daeedca41d70a42fdcc62ce17fffd9992a932e29153ab6ca1168e SHA512 c1b9f572957bc4ed1ad0c61d22b7b5d6a4c863df2aaeb4cf914e304af21d949c9cfc53dc8eb67aacdf3dd56f339ee6f4a1f5fa464121d9db79b7b3febfb3251b
+DIST github.com%2Fcespare%2Fxxhash%2Fv2%2F@v%2Fv2.1.1.zip 12031 BLAKE2B 47bd92ee66282b671cdfea60969710e371540e79b3c1e2f510380e3dbbfe40ff76be23ab48f44855b1cbbbed7cdbfc4f1ea21bc4bd7a37716de7c27a7ef81329 SHA512 dc5efd476875fe3cfb3c5f5ce9314920bb2175be85fd1a4667faddee1b5360113b66bdc2f17e4fe889a7d104d684558744bdc6c56c8ac3afc585d7aad0114486
 DIST github.com%2Fcheekybits%2Fgenny%2F@v%2Fv1.0.0.mod 35 BLAKE2B 2447b3f6b52bb0ab4eb8af5ac3ca818b65bff046e0743cc8d8dd3d7e336ad121a8d017e3f7d7b83b0203b86392a82cdf56641acddfcd377a168553dfc28f3ac9 SHA512 f7d31069b4207aabc1683b00d85decf9e883387d598ec9125128724cad3b7d1f3462ffe616486e35579c97b178d703999c243a3a3aaca9223d9f661c07fe9d03
 DIST github.com%2Fcheekybits%2Fgenny%2F@v%2Fv1.0.0.zip 35021 BLAKE2B 06b4f88edb2e79b8a1776ed4b519b0f72314ef90761d6672647c1b5eefcdad4cb4715281a55b7de4c991350f401de98eaf26f20933964fe38b30dc2312f53940 SHA512 b8d346004622c7060aa4f25affafa846c7abc7f6bd04b87f53ef232f229d00d6721f139cad102c3d32eee711a82a0c814addbbc6f42e8109cc4bf8650d0aad43
 DIST github.com%2Fchzyer%2Flogex%2F@v%2Fv1.1.10.mod 31 BLAKE2B 683f04ea11a77fcee27cfc84f41a1974ca6d61ee854dc77f072493358099ec03e94f01b5cd5cbb5ef69c856dc36790b660a3e90d7d520fd553e572f1b01a2304 SHA512 0e40cd7ff22a86cd23b49b509f5b5653f67e31ca67a07ab82743f56e5504f126cb2c11d88da644afbaf024dffa657560a420ec6d82f6b463452ad8a8bdb576d2
@@ -191,6 +211,10 @@ DIST github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv1.1.1.mod 34 BLAKE2B 7e09c2779bf7a84
 DIST github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv1.1.1.zip 60320 BLAKE2B 86bdbc333e5c23ccf4f805945ca9f2aecc5c242d2ae824d20127eceaa2bf7bbab239ff2799572a2c8fa206166a36e97d5eccc8fc5021743d8ad32f39cd53b9eb SHA512 7b4e4df2fea731e23e05437f26f24e32b2e99028d685b72e3a726c1cb616ada4a77ca4fb9db4a6fae48178cc5172e724b74499bc776d63a9110cb97377d5edeb
 DIST github.com%2Fdgraph-io%2Fbadger%2F@v%2Fv1.5.3.mod 35 BLAKE2B cb878d5c7457af4aaeffc81f34740798fe5bfb413f15efbe80c0af5108add18a9623f44f24b6ec47d4f15cde98452efb71701c71dd9914dbe48c8e8ec84a4c05 SHA512 14987165f56487477f7622d40ee2ec121d6a693bc7f13525e802819959207f347e1d7e1ede45ec6afc097861bad0f702206b649d29e5603c77d2718d701d997c
 DIST github.com%2Fdgraph-io%2Fbadger%2F@v%2Fv1.5.3.zip 1069597 BLAKE2B 289ba8e12d349a3dc3c2fc5be7665244b1debb62a75cf05f67b3f31efe61a94ce48f1405969ca1891b11e97ed71f67745dda70aac6aeffc69370de981052efa3 SHA512 0bd1cbd19ac17e9ac41fe66c1146edfc2c40ed7f31b8a08c966d0cb799c5f3cc35a69d57873c6dbc2e387daddfa895ba35b02a275fa2e35ed39052d6f8a72857
+DIST github.com%2Fdgraph-io%2Fbadger%2Fv2%2F@v%2Fv2.0.1-rc1.0.20200413122845-09dd2e1a4195.mod 723 BLAKE2B 22933810a8ab28f5ffc24d64ff91f943d614d8e7f64bdd959645288a55a9657216e755837c3ec524f88a39d4997b8de2037cad5c3b49de51c095213db6a75461 SHA512 f5012f7bc69dda2837c6d2bff93da5bfabe4e2aeab5a5b2c7a0d812a67577247bad1ec64eb9522d4d0daca8e8ce57eefe36ced93ff71d3fa26aea773d156a3dd
+DIST github.com%2Fdgraph-io%2Fbadger%2Fv2%2F@v%2Fv2.0.1-rc1.0.20200413122845-09dd2e1a4195.zip 415754 BLAKE2B af9f6c13524f26bb149b64f986162c4c70b7bcf621366dd1f957068ce4c1f850a78099d8977fe0be2b0d9e29c46c08fca45a36323fd12a672302b39952ebe367 SHA512 bf1053992920e33e13fe0c128c58edf1a443cdb1de91f447ec3c468b69f1d284eae66644e04958f1651ce12156c7df3747cd1c9f1c2740707f5a8e94283f0d9b
+DIST github.com%2Fdgraph-io%2Fristretto%2F@v%2Fv0.0.2-0.20200115201040-8f368f2f2ab3.mod 193 BLAKE2B 0938da2ee0a3bc0acc3416db8387be68292b8848b72cf3b44c28e11d6d456037f7ed998fe08fd142f42ccb447bd0f0a7cb75ff72e72d73a5649a85f7def42070 SHA512 7752f28d6ae3da6cd4f2b5d23ff373a4bd8b8b24879d9bde17bd22b1689aa5b87ccd1c206f4f70aaf5acfd89f4e1f11a04ed822266a576abc0a1f979cdce2911
+DIST github.com%2Fdgraph-io%2Fristretto%2F@v%2Fv0.0.2-0.20200115201040-8f368f2f2ab3.zip 54509 BLAKE2B dec6fbe5781132bb74b414da959392904b8db04e2e150c3611ea750ecd953d86ee860eae15b63a74af40c949c61298fd2c2155804cf4e1cc4d0091c3aae787c4 SHA512 dd76f220cc14f3b380c8b13ccae067c8da0588c94320bfef0d6a4e964fbf1e5432bdc76c00b2e5134cd4d079fc769e2b069c909395168bc1af7bd40a2efdc9bd
 DIST github.com%2Fdgrijalva%2Fjwt-go%2F@v%2Fv3.2.0+incompatible.mod 35 BLAKE2B ae3ae89fc373221646f196cb2112e003afec9206977905007426d522c584b455fa207f105eaa35cc716fae74d605fcc2a88c0ab5b62e4025b7a739749410fbd9 SHA512 4d46c1b3280c5b4984d22e57b0541cc6762853c0f6cea19a7a5f392c23039e29ca616a4bd8f283c2a35c3c045ec54716f5000cb4f0f43f07f0464c12ed1369ec
 DIST github.com%2Fdgrijalva%2Fjwt-go%2F@v%2Fv3.2.0+incompatible.zip 57069 BLAKE2B 2c921bf5a88bf293a4c86bbaed6d7c391a323cf3ac39a54ac10fb74da5498e0f565db5e5220a9871ad5c4dedad7eacc0657ad9f8907c2bfccf147384b53b37b9 SHA512 c937c8b98196eb8496735410324a6a845e618d47e4631c500c9def70d8effb27cfb4efb17f81a8d304ce1a9d27fa6fbcfdec11ea10355de3d1918f1ddeef81d2
 DIST github.com%2Fdgryski%2Fgo-farm%2F@v%2Fv0.0.0-20190423205320-6a90982ecee2.mod 34 BLAKE2B 7db9f433942253e04513e9a7e88b2a76cecb28837e808c9fd2fa444f19bb75f1567358ccdb5537dc6caf0aebffa08898127dc93f8f464c838da838f7ed70615d SHA512 ee0f8fff193e70c23c830494ebc2bbd182c1882ba443baeb4a8ce03166f399765ab8e4ac85047306b27c03e84fd0980f93b5b5e29f94129569ec8021e8d127fa
@@ -227,6 +251,8 @@ DIST github.com%2Ffrancoispqt%2Fgojay%2F@v%2Fv1.2.13.mod 962 BLAKE2B 4e010a5ff24
 DIST github.com%2Ffrancoispqt%2Fgojay%2F@v%2Fv1.2.13.zip 231306 BLAKE2B 8db056d6fc6796e16bfc456d00ec08eeb0884fb7cf6e234193862453406a300e5bbfc23f0910bace51fc66e5c3801a14078aa8846dbf6b03a64c79414e350892 SHA512 822d1395436aee93d26cf53cdf65163247e8620b4f1bd3151270b9a9e2066012e9397158a10f433c0d0512dd8c4b6d53ec76b5e5d3f169be3e5970e3912dcccf
 DIST github.com%2Ffsnotify%2Ffsnotify%2F@v%2Fv1.4.7.mod 36 BLAKE2B 2b77fbdbb6c6c20767c120b390fbd2992bf79dcae0a35c27121a6e755233da3ecb7d74e74c38c0a2463976b546ed8bbfb8a8d8cb140526dd9a0c4f524cc131a4 SHA512 5749d33fb085d63b7c12f43df824c96f168323cf6d88cfea3e2536eeb7b56689dab9dddb8cde1ec8bc9c2848e7148b8a37abf8523a99c55ce10f896245c5f341
 DIST github.com%2Ffsnotify%2Ffsnotify%2F@v%2Fv1.4.7.zip 41278 BLAKE2B e0b440a81efbe3c7c16ad276b4509652fd58bc94cd162b9ab13bb37c1e6edcd561e3fbb999e55619d58c8e3279b785b8eb67fa4e200b38fe6fcb60f0918e6e8a SHA512 9b1075ccd3d1f53773db97687e06fb777741d6c3b228bcc329be580562fb3c34006768eb3f989f92367ca116c597140045b3c345fe36065f5015d1d4652633c3
+DIST github.com%2Ffsnotify%2Ffsnotify%2F@v%2Fv1.4.9.mod 106 BLAKE2B 4876f70d70d2d8703d7b6abea5457e093043912d6a672bf7794a892d1c17b159ed2b92dee05ba1625a1b7cd6c8d66d6dc715bfc1d7c0f1c47965ae8e30506bb2 SHA512 ea3a26ed1f6df26a7e2aa64ea9d5d4a4c3005163cd8adc05028cf25d56d01d115bcda38b7af992242013c2610f26a184ce43dd1826309c95fa008fa9c8c387d9
+DIST github.com%2Ffsnotify%2Ffsnotify%2F@v%2Fv1.4.9.zip 42349 BLAKE2B f2c476034a47330b5424159be4a323bded799ca489163c8d485e95f17ce519d6c4d771a35eaed83e831acbe20c1d9ec5b782469ce20aa224ab03de459228fe59 SHA512 8df5f490e26760bcfbfee216b5479321d060d4e48911c98e4d3375a6f84bd161b5d80769fb0326b3122534ff726e8a987bdce365464cdd042ab4cb5366d674aa
 DIST github.com%2Fghodss%2Fyaml%2F@v%2Fv1.0.0.mod 30 BLAKE2B 6a680b6e14f0cbca536b1ca02d633e16b2010cee7f590088748339785b2989cb0f86a51fba709da938d4c10ec810d5fe022d7d1a5c269d5ece253a78a5b2069f SHA512 7ffc7a5c3e0b39831e590ce3402dbf5c95392e88a08576a16d9e1887b11400efa71a9d183d3f1e080081246f28a70262a679348f009f7da6bd41f253a60b0741
 DIST github.com%2Fgliderlabs%2Fssh%2F@v%2Fv0.1.1.mod 33 BLAKE2B 18725478b6c6a565e4adc96f4edf09f8369553b8b6523f36f8e4733ae64eb9a859af67e14646e61d2faf5cfd651ada0a6bb2bae455ba6bb4570c92696b31f23c SHA512 e6592e0b4e0c9f344378efbc06365296f5978e173421824512ce6f8921212691aad2f35e73ff4562c72014897a4992b7b3e56e3c424a82159747f1fe328eaf50
 DIST github.com%2Fgo-acme%2Flego%2Fv3%2F@v%2Fv3.4.0.mod 2227 BLAKE2B 2770acc163869bc27e9a6badb76087ed323a2516eae45a9f83b6df1156be89860943d8eccba7e925974263117bf092eb8489546b94552a99143a163828f3da5d SHA512 6e6f7873278d618cc84c85be17714856b82b4b5a11453ab937f47a966382015839e6bd637a3d84b4a064986d23de2ae55cc1c9ace5159816c153399c33c0cd66
@@ -234,6 +260,8 @@ DIST github.com%2Fgo-acme%2Flego%2Fv3%2F@v%2Fv3.4.0.zip 632770 BLAKE2B a53c4b920
 DIST github.com%2Fgo-acme%2Flego%2Fv3%2F@v%2Fv3.6.0.mod 2074 BLAKE2B 617402618d8f577ef9fb73d756a471579333f4c30474ffc2ca3f8a7fb47add79ca706b6e6d27bf030cadc1573be20b71806cd5495ff88da9b054a9b2a0a6cea2 SHA512 599d9292cd337fecae7d9c296efddd1df479b9ea3dbd8547fd12f35980848fe378a3e53cbf55a8838e6733c3d77ec178854b005fcb844a18dc348261a38522d4
 DIST github.com%2Fgo-acme%2Flego%2Fv3%2F@v%2Fv3.6.0.zip 694529 BLAKE2B ff85082738da46f492cd36329ed8f1bac916f1970d83ab712bfbf779a8a5ec2e32a2da52354ecd76151831398728ea8a6c4f5a7c96dbb327a33f5aaccba31652 SHA512 1f797f642d0e64da4b5fe33f3f1bee7fafdce9468a15d1fc845dea78c6d970165e0a864c75c7c5a5bb9fa3f53ffcb55fb168e3cf760f1641cec7575dad92b795
 DIST github.com%2Fgo-chi%2Fchi%2F@v%2Fv4.0.2+incompatible.mod 29 BLAKE2B 4332920508e4756b8f02245994a6817e6b12a463cea35613711952e2ebba0a902a2971e72cfebb82aaada062bdf9366d3a54326ed9ef41da0c3216e7547cb433 SHA512 7b02adad42c8b81f594661492450361cf74104c71257a8a27fc4117ac4bf8cec169f43fd2f1977a929c8ac94841eec03ddfbca3a19d1668f128ac028d81aec38
+DIST github.com%2Fgo-chi%2Fchi%2F@v%2Fv4.1.2+incompatible.mod 29 BLAKE2B 4332920508e4756b8f02245994a6817e6b12a463cea35613711952e2ebba0a902a2971e72cfebb82aaada062bdf9366d3a54326ed9ef41da0c3216e7547cb433 SHA512 7b02adad42c8b81f594661492450361cf74104c71257a8a27fc4117ac4bf8cec169f43fd2f1977a929c8ac94841eec03ddfbca3a19d1668f128ac028d81aec38
+DIST github.com%2Fgo-chi%2Fchi%2F@v%2Fv4.1.2+incompatible.zip 106340 BLAKE2B 651744a6932390c12567a547d855942a66bb2537d1a5c96ffc41f8a7cba1c79f67309d53d07206ddea9da44c5a1593191c3c0850535ddb540405e567a7fb50af SHA512 5aec42c3144ba16106ac16103adb200e2fd77e6cf2267c3e1a648d98addafc742749560ebf8b124fffe54caf7000c6e3a5b6a150216d7eaab1edd528f1ed51cb
 DIST github.com%2Fgo-cmd%2Fcmd%2F@v%2Fv1.0.5.mod 29 BLAKE2B 338d138ce8f281efc056343ce34aa90f4e1b6f056f3b193afea9ad990a1dadfd24d9b90c2f8fc038645448fd41972f532ec815c980900c89c0e1bdf796cc2ca5 SHA512 d1ddd5ff5f4f651201ea0150d804161538e15bc078ddc530d1503808c9b248bc5426035b09493d671e831f1847f0175409cf264ff5ab8a96bc3ed4bba2010152
 DIST github.com%2Fgo-critic%2Fgo-critic%2F@v%2Fv0.3.5-0.20190526074819-1df300866540.mod 537 BLAKE2B 7a70f84e859adcf37ecddeb2e80e4c1302dab28b15102ef30b995d4a2986151c6646f450705bb80b815cefbc80d68a26be28834c89780ab05f5e408ccce05362 SHA512 f1d930fa81501da87f58e0f96e7062be5e1406a1e99965ccabbc154a415cd2fe3fb374891e1fd7362f68003282c4bf59671a8521c5bedc064df9a730fdaa8ce4
 DIST github.com%2Fgo-critic%2Fgo-critic%2F@v%2Fv0.4.0.mod 581 BLAKE2B d5a833473122e501c28b9b2b3fa4ede337640e85aaf631111e90cceb2a9ea604581e3de0fdc4f989c95e8340ccb188a54a08e6c51cf1071330d416df7da61351 SHA512 6ad97e1147a499e8de5fae18370f49e0e7527ac6b170c995cc7da4af77bec97f4f05838e69595afc97582d0752b4641c4f971daec9124c5dc1dae6f5f781bed8
@@ -249,8 +277,11 @@ DIST github.com%2Fgo-lintpack%2Flintpack%2F@v%2Fv0.5.2.mod 475 BLAKE2B a6ee9f4b8
 DIST github.com%2Fgo-logfmt%2Flogfmt%2F@v%2Fv0.3.0.mod 35 BLAKE2B 0868f712c026b68559846a28bd29f39f584603cd79e1189a9ad76909cce7423a811f71265baf5b7f381a33bee76917759a9cb6ac131ab21450b4b52558cb6190 SHA512 526b97ecd0ccf878c0ada56c5217405c34c59d4c9cb53808f98b24a2823c0b3f1a74e862b9b1a5594034e570aa6749574d5e49212d6d48724e984f528b8c67ea
 DIST github.com%2Fgo-logfmt%2Flogfmt%2F@v%2Fv0.4.0.mod 100 BLAKE2B 2558b7edc234429c8bc0926d347231c2352cbfe83d83bc3c7e76ed0ac4b3a843de65cc3e0dede3f0acb7a2dedc623584eff8cb236787c12d7f5a47c9e1c39145 SHA512 5782a5d5e5d4c64244a8463e0f15dfb97de4b60b9fed527ebbd8dc5a26999af8ad0b3ce0064da30182c757785ea9b35f253c5946b233fa3d9a61c873b23011c7
 DIST github.com%2Fgo-ole%2Fgo-ole%2F@v%2Fv1.2.1.mod 32 BLAKE2B 165b3724097f123b839b3f65d2e401caf6d8046fe822d3d9b9f15d74e1da21c45b77706f79716fc1b9c5322127bec754b2dd35442fe077dad4f3e301cd168ca2 SHA512 14e60a75a483ff4a1f6313a7a8a1dbfbc6ed4c223c7a9d18c0b355e84261084204a22ef1125a40e30acb1b43abfc97e60c045dd91a16d2b4068a78a54d854d28
+DIST github.com%2Fgo-piv%2Fpiv-go%2F@v%2Fv1.5.0.mod 41 BLAKE2B 9a745b5b30bea918c74a3090698493c11a519cbe8e674bd091d4d506df987b30f9a629153bd61e085b34b4ba5a2f01c341e3cd6e49f920860ddaf88e99dcb246 SHA512 653964c5c17bd3917046870edeb3a51594d59693719f00d58d2c5bdfa8582638a85a5cba5ec271a75b22e00a3a1d95aa02b46b5983fc7ee3e86dab3a006dffec
 DIST github.com%2Fgo-sql-driver%2Fmysql%2F@v%2Fv1.4.1.mod 38 BLAKE2B 198f3a6fb7348bf50286e1dbb067e72ff854b1daedf1d181b643872aab377b930029feeb95d5d6ca21109facde089527a06922b9ea52cdd59ef553d69b984e06 SHA512 21ac6d6f8fd92ccbe09cb30d0dd6a37142907048cc5f9d0574824765918dfd8ccef96b7ceab9dd259f9a95f5c5be566ac00ff4eb3e37ba7c7c98f25b3185baef
 DIST github.com%2Fgo-sql-driver%2Fmysql%2F@v%2Fv1.4.1.zip 106521 BLAKE2B c7c61852b093d2b0452e9daf9ab26b83ee6426a9afa4f67abb0e0f98ef28961017f774075f5d90fc05d6de3c26fdf90a1916b426b32a41e2cee8fb0452e21f03 SHA512 023209372d47d4b5279789f581a6f4452aaff1e262ecbdb3fbdc48a0939599e319109b99d1c79414716f1c426c143cc1ce506dcd38f304dd5aa3e9348084628e
+DIST github.com%2Fgo-sql-driver%2Fmysql%2F@v%2Fv1.5.0.mod 47 BLAKE2B 7252c3d085ad65bc8d2694f6fabeaf42736c8af8f4e061f1b6f254c35859619db00c1e204057cf355434b40f403b1c67c29fa5f93661626284bde20c8877a606 SHA512 149783bbdf84f15c29931e06d98707db26048d13ae9fd157600b522c0ddc60612c39764dc177e063f844205321ba98a01eefc1744dbc6f786861d0607dbdb0bc
+DIST github.com%2Fgo-sql-driver%2Fmysql%2F@v%2Fv1.5.0.zip 113293 BLAKE2B 1bc68747a73c39e2b21bd2c45dbdc3cb41a6c69f9a2a5167a6960b4ed583fbc888a41f559a8866a004703939230ccf3536cb2dae43ff5a078d21151a115898c2 SHA512 d18a710e77e830e7a1e80a16a7743cfac418832c16a8e08da7749af791e2bc8116c2c3e7f028bcf9c4431cf8e61478d6f1a3549a47e569f725db2a623460986b
 DIST github.com%2Fgo-stack%2Fstack%2F@v%2Fv1.8.0.mod 33 BLAKE2B 366a1ff397488b2b1c7e42db8a946bced1eb8d4260a6c177a978eb978e14f89265e7ac1d0bcd77905bc89eb35b68b3ebb028c0dfc67ff71395ab14b62335d16c SHA512 f3dc70dfcf086b785750d5b346ea07d0dc7903937bdbba58eace0fb903e656b02ddf3a1d49b486ac29b1cac9ca9d346e964d55d3a4cc5ee5ae79ac40b24d0cd0
 DIST github.com%2Fgo-toolsmith%2Fastcast%2F@v%2Fv1.0.0.mod 146 BLAKE2B 929c15d08be251ebb09aac169eba126603d1f3bc4c8dfffa22b26baeb368d94d4725e3d91425aad4e96aedeebfe91f43b9dc707c5bb7bb11c28e44447e5d1b3b SHA512 fab7c8aca8025f6ffb09bc7cbfbbcc86e1a84608a1643b4443a386ac979aeddf6821e6b67538a033098c22a22c251077046c38b05e08bd8799deea5549b8d8a0
 DIST github.com%2Fgo-toolsmith%2Fastcopy%2F@v%2Fv1.0.0.mod 134 BLAKE2B 0aac384b872ae017d32169a21e2688b251a70d4f9b1a3479cc369d34ad0d81688caf207501fe6017c02764063d62497951270a3e2a2babbde20ce398dcb590cf SHA512 46da2d05a4724f95dca3057c5631239f1743e5fe3359bbdd81ebeb02fc13a22b59e69476bcca359361bab2603a57868e75dd8403cc24e80a27178ff071fb9028
@@ -279,6 +310,7 @@ DIST github.com%2Fgolang%2Fglog%2F@v%2Fv0.0.0-20160126235308-23def4e6c14b.mod 30
 DIST github.com%2Fgolang%2Fglog%2F@v%2Fv0.0.0-20160126235308-23def4e6c14b.zip 22449 BLAKE2B 8d2eaf41ab75e870a445d50b62c02877ae8049e282f066d9aedc0dfb54d04af55d921ebc84d1e4131cc66a3f9efdf8270a0e423e563d3f8fc5a6bdd403bcdb39 SHA512 a3c086e660f2285d9fb7d56d1eba74994e8f0052363413337413cb50009ba46d3a432e2b4c67a73bfb753e7c60646d96bdad308d8e634e53f0bb0bb97ea17bda
 DIST github.com%2Fgolang%2Fgroupcache%2F@v%2Fv0.0.0-20190129154638-5b532d6fd5ef.mod 36 BLAKE2B 3eee85c76d1ccaca7488ee3039bae6a7a9b4c8253481cdf6d62d1126623312a07264ed0e061bf5d7bde3aafb23e078b2bc86c3718cb2fff6618976c420c7dcae SHA512 5a0f44d45d666885e31206077a515fa02246d56699aa02f7809868029fdf6a718a5df8edac0ec245880f982882c2f4ca1d13a1dc0c7c0f79d7e89c6c46fab523
 DIST github.com%2Fgolang%2Fgroupcache%2F@v%2Fv0.0.0-20190702054246-869f871628b6.mod 36 BLAKE2B 3eee85c76d1ccaca7488ee3039bae6a7a9b4c8253481cdf6d62d1126623312a07264ed0e061bf5d7bde3aafb23e078b2bc86c3718cb2fff6618976c420c7dcae SHA512 5a0f44d45d666885e31206077a515fa02246d56699aa02f7809868029fdf6a718a5df8edac0ec245880f982882c2f4ca1d13a1dc0c7c0f79d7e89c6c46fab523
+DIST github.com%2Fgolang%2Fgroupcache%2F@v%2Fv0.0.0-20191027212112-611e8accdfc9.mod 36 BLAKE2B 3eee85c76d1ccaca7488ee3039bae6a7a9b4c8253481cdf6d62d1126623312a07264ed0e061bf5d7bde3aafb23e078b2bc86c3718cb2fff6618976c420c7dcae SHA512 5a0f44d45d666885e31206077a515fa02246d56699aa02f7809868029fdf6a718a5df8edac0ec245880f982882c2f4ca1d13a1dc0c7c0f79d7e89c6c46fab523
 DIST github.com%2Fgolang%2Fgroupcache%2F@v%2Fv0.0.0-20191227052852-215e87163ea7.mod 36 BLAKE2B 3eee85c76d1ccaca7488ee3039bae6a7a9b4c8253481cdf6d62d1126623312a07264ed0e061bf5d7bde3aafb23e078b2bc86c3718cb2fff6618976c420c7dcae SHA512 5a0f44d45d666885e31206077a515fa02246d56699aa02f7809868029fdf6a718a5df8edac0ec245880f982882c2f4ca1d13a1dc0c7c0f79d7e89c6c46fab523
 DIST github.com%2Fgolang%2Fgroupcache%2F@v%2Fv0.0.0-20191227052852-215e87163ea7.zip 39683 BLAKE2B cebd7b69e8f18547e77e07d49ca26fabd513b6bf95317553c5bcabac3b513dc1d7becc259118eadbad18ee4d45a1dffc3ec96864b80d87c0dc6885983bdbb3d4 SHA512 e7a8277f9b7d2e35d1e8586c580d03457ac1e755e1051fcda20ff9f819a6fb9c3cd1892be3a50d4cbf141b35d1c7b85b27bdc402eb45b700a37ce994be4e5b5e
 DIST github.com%2Fgolang%2Fgroupcache%2F@v%2Fv0.0.0-20200121045136-8c9f03a8e57e.mod 36 BLAKE2B 3eee85c76d1ccaca7488ee3039bae6a7a9b4c8253481cdf6d62d1126623312a07264ed0e061bf5d7bde3aafb23e078b2bc86c3718cb2fff6618976c420c7dcae SHA512 5a0f44d45d666885e31206077a515fa02246d56699aa02f7809868029fdf6a718a5df8edac0ec245880f982882c2f4ca1d13a1dc0c7c0f79d7e89c6c46fab523
@@ -294,6 +326,8 @@ DIST github.com%2Fgolang%2Fmock%2F@v%2Fv1.4.0.mod 131 BLAKE2B cbc0f2260c45f1696c
 DIST github.com%2Fgolang%2Fmock%2F@v%2Fv1.4.0.zip 95677 BLAKE2B fb807ef51512d0f1099b43e9cccf9a64ebe19eabcade8403ca6c033631790328922bb32360a48a7d0a3529e169e71dc8ad4519ec3bb87aeb678ccc0d2d48e87a SHA512 68bf6763cde94ad213a27d17ea5abc474905643274f9cf5ca46083f86f96410958504dc84224e4cbb307b223f70a0b6732373745074231ec6a0c95e944c2501a
 DIST github.com%2Fgolang%2Fmock%2F@v%2Fv1.4.1.mod 131 BLAKE2B cbc0f2260c45f1696c2dbe5b134328dc37ea8f95f75817da19f64b15d26cc4942aedec755155c21fe1ca2288190738702bea99511af61dd11e2071e9d423489a SHA512 fd32c642f3512807877fbaa2332c9b83a02d025d469226a527c19c144c8f6b20ca4bae3f6d1f17da74469d6396c1079014493b50ea8a1e7b4be3bb015a82aead
 DIST github.com%2Fgolang%2Fmock%2F@v%2Fv1.4.1.zip 96199 BLAKE2B f2657e17317a84844687fed180e61ad8851ae46ecf2c6594c00885373a2a23e6388d38749b4015534eb36dc8d0b668a42bc1fb5be0ec6b98b1810c45dca382bf SHA512 2c6d6fa94b5cf2bbb4ff6dc6ea8cf3edfc35143e3bbaa45121117af9684c0c7261248e8cd4751a0af3101d65753219c30f462c86ab70757e5f41cfaef469b9ee
+DIST github.com%2Fgolang%2Fmock%2F@v%2Fv1.4.4.mod 102 BLAKE2B fc65ca5527061bb3ae4b156ab646ab37acec93f14ef00beb21d4ea93100e13a7f25e7d7bd3860b603ba18923075ccb2e106376f6f55ff261cdaa37ae325c554c SHA512 4e386a43067044e410312e3d6015ae59d6e77506b0db35d08fe7e6cda7b3908a5bcf6fa7432fbc5391252dd4dcb346bf359727680250af1311d5c839a4cbf4d7
+DIST github.com%2Fgolang%2Fmock%2F@v%2Fv1.4.4.zip 95367 BLAKE2B a94e0a99550bbf412c113e9721d41b4ebd81f0ee0ee1cbad9240abfbdfc91205a32a4d26676ba2b77e3b74fc86a739b5f5910aa0663a820757e541e6c889c0a7 SHA512 0097c67ed2453ee0ecf7571f15f229ce49ff98a9f7a9df8f7bb374fc693c784b6a74453c57509bb3e006833d341da7cdb9887ef3ad7e55a4ae8681e73b783931
 DIST github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.2.0.mod 34 BLAKE2B a4239cba934b6e80714b93d47e88f22ad28ce41d1d984c4261cc3f5f3b857fb28785223fa911b258e2665be2a9d24ffbd925e9e0f374452a2aacd712ad9d5f75 SHA512 e059a34363bb826bbcb8981adbfc10da90e04b86dc5376ab20bdfe1fab135953cff41ef1daa116aff10e9f3e6503168f6baf902f09aa0e8cd9a0da96b932f4b6
 DIST github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.3.1.mod 34 BLAKE2B a4239cba934b6e80714b93d47e88f22ad28ce41d1d984c4261cc3f5f3b857fb28785223fa911b258e2665be2a9d24ffbd925e9e0f374452a2aacd712ad9d5f75 SHA512 e059a34363bb826bbcb8981adbfc10da90e04b86dc5376ab20bdfe1fab135953cff41ef1daa116aff10e9f3e6503168f6baf902f09aa0e8cd9a0da96b932f4b6
 DIST github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.3.2.mod 34 BLAKE2B a4239cba934b6e80714b93d47e88f22ad28ce41d1d984c4261cc3f5f3b857fb28785223fa911b258e2665be2a9d24ffbd925e9e0f374452a2aacd712ad9d5f75 SHA512 e059a34363bb826bbcb8981adbfc10da90e04b86dc5376ab20bdfe1fab135953cff41ef1daa116aff10e9f3e6503168f6baf902f09aa0e8cd9a0da96b932f4b6
@@ -301,7 +335,17 @@ DIST github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.3.2.zip 465217 BLAKE2B 4caaf832a22
 DIST github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.3.3.mod 43 BLAKE2B 1985b508a7ca5fbf7283bfe42510dd54e1e409894b4bf404c918943c8bbc38a3682d00322514c8fef7d6528059fc547534bd956fb262f91fc63dfd6e97fe0bcd SHA512 17d97ea39719fd59908591504c8df288f5914243fcc43a2cd8cba6c2c50fd6f5315b17afa008f92ecdbda732d5447f848d31bbbfe59ef9bec78aaa3f25f51833
 DIST github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.3.4.mod 43 BLAKE2B 1985b508a7ca5fbf7283bfe42510dd54e1e409894b4bf404c918943c8bbc38a3682d00322514c8fef7d6528059fc547534bd956fb262f91fc63dfd6e97fe0bcd SHA512 17d97ea39719fd59908591504c8df288f5914243fcc43a2cd8cba6c2c50fd6f5315b17afa008f92ecdbda732d5447f848d31bbbfe59ef9bec78aaa3f25f51833
 DIST github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.3.4.zip 458318 BLAKE2B 04daa21a72a6b8662d746828ccea97421d645e109afb6a6f48f1f56b614a8c014d2ba764b80f9601f3928b3573339936b9b522ba02ad7bcfb7c8f8323c3fc102 SHA512 dcdae1a76ed6795a7e223d3b1aae5ba2a1c2bc058d07dacca08673e484e1e18825aaa301dfe03fb8d8ce4eba253d61e1236058761eb1335ac45fefb2409417b8
+DIST github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.0-rc.1.0.20200221234624-67d41d38c208.mod 151 BLAKE2B 9c1bc32114f742984396777149c3fad997bb47288dfe265614a1d17412ae3946581c2e60ff9ab87e784d71cfbe423b7ed1ea5864b6cd3f81f35e9103c8c08a00 SHA512 431b8d4756fe79e43cdc2f8478f3171ac9c90912222e50503301fc83d34c90001fb6ee0fee3bc05f66e47d657977395769e54efa0fb74ba35f34429cc0dac5c3
+DIST github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.0-rc.1.mod 151 BLAKE2B 260f1bb3e48b0bf9870ea3b725b13f84d2f18a12c6ca1275afcc2897bef547fcc1e893bd6b1efd46330bc1de66a00e3ef133a4418a50a075302aa3141abed8e5 SHA512 b6d7911148c590b3ce2a14a158cfbb94dd56dd402b3a4a2399adcd0421604f85d904244ddf5f8dba65326f04a7817d5652b30a306c65f44fd248ed269485a21c
+DIST github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.0-rc.2.mod 151 BLAKE2B efe8a8f8394f082a813ed4983158ada7bcd20f92f9f8b9b0d0e61e8dbb968b3c825432ae05d69c9b61a04ad57533c1e60438d9a1964312d4c9168f86864ba2d3 SHA512 2df7aaf6cb36a18165dc458a7b3f4158e2bce3bf10165418de401dd43e06d44378511dd4fea6530cb668a8ebb17b4c3f294ba35f5018e6aeb1b7b9082aac8a84
+DIST github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.0-rc.4.0.20200313231945-b860323f09d0.mod 154 BLAKE2B 8645404d124dde54c3e9c284b1243b1faf2124f2b7d6c5e6566ca600d3c965f7787f09f6825840f5e3ea6d36c016ef2c7fef10e8e12dce354593f7a8a3210a33 SHA512 4c9416c4777123a39b23b49ecf6265295fc3432de083a04dbefc87264b8c69f0d9e342ebb7e8e488f30c3efdc02951fd7dec23dfd1fef0802c8f0250f96612a8
+DIST github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.0.mod 124 BLAKE2B 4c032e7f2e1c8765cdd720690c1067c7c0ba1005bbfae01cd928bc60d96bd82321052fdb18a4ae12119144e34865cf910e306c5116e4f4f56cc5f70f5d52004e SHA512 acbd5afd399b3798d4b24529479b18523ae4009e21acde15a3893d2af75f9a6e65fcbd5a237423849003eb8903718eaa0b1aed9177c390972ab9490f3acc0d1f
+DIST github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.1.mod 124 BLAKE2B 9e60030e0014cbc67c0bc7064eef3b127dec57dfe25bbf7f0d0e2b9c8c77e28477066daf073a6793428116419900e7c9f6dea6e8841a5f61812cf11ff77e7009 SHA512 14a0f1fed404939fad835398d5889ad57621edeb0e183785b3094957183bb29a2026e2af939b94c7155f8496e966116c4a6a2497fab113a175a9aef3f7ec3f32
+DIST github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.2.mod 124 BLAKE2B 3242575be48f0e1f74e2d0976d2a11f0edccc59c7b74cecde37233c19f97c51e576cd3032175cfad3c1ce9721cd41053f459341182fba836e0ff0456126e493e SHA512 9586be76b697c6a5c3216762ac13a7d297372ebe0c7ac5941d16c326d1580c8a73fb475236ed9a4214d158a7386e761877be16cdbd4ac2074e8a5e1dfdc95b54
+DIST github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.2.zip 206762 BLAKE2B 13c74350dfc3bf39540c37f6b7771f18930d6bfd6a5c83c27c723065da6458e0de544a6fa4d57c027e6c67eb528493c620228a56249b889f00d67a064218dbb0 SHA512 3d92469995664037149e3e11363db685b3175fff01f4ef3b578ada273853a16131b3c97899b497ab75ffbeb6191fe59a28f073779828f719681b8e15182b6211
 DIST github.com%2Fgolang%2Fsnappy%2F@v%2Fv0.0.0-20180518054509-2e65f85255db.mod 32 BLAKE2B 8b498b103962181cf69cf5de686eee1a7f0e481ccd35430e33999c951b91ebb98e9dcb1dc9c4e40cb379fe4abae40a47eb36d9456fea076e44245022552d055a SHA512 c9faa5760addf2869df9a3ec5ed9da02944823afc5be93b8b6193c43261d167cff2aeb65bb844d959d368ada83932c86056aefbff799be326e889d3de4c2b8f5
+DIST github.com%2Fgolang%2Fsnappy%2F@v%2Fv0.0.1.mod 32 BLAKE2B 8b498b103962181cf69cf5de686eee1a7f0e481ccd35430e33999c951b91ebb98e9dcb1dc9c4e40cb379fe4abae40a47eb36d9456fea076e44245022552d055a SHA512 c9faa5760addf2869df9a3ec5ed9da02944823afc5be93b8b6193c43261d167cff2aeb65bb844d959d368ada83932c86056aefbff799be326e889d3de4c2b8f5
+DIST github.com%2Fgolang%2Fsnappy%2F@v%2Fv0.0.1.zip 69641 BLAKE2B 7d5306ebb893e705188699f7b5e690c375bda9e0ab4c904aec10560dd75f278016c9f69ce4973260a4e5a8d8d7dd7c2f12a59f98e96a4456af6f23fd0db224c2 SHA512 fa400e3e1b6f57e29c93ecfb1dd94ccb1e4e4924f3b62ae125ad0bd88d56b5c48080ad78dbf545c1056bcacf860b93363a27780dbce2b812c5b58ca3c74fd11e
 DIST github.com%2Fgolangci%2Fcheck%2F@v%2Fv0.0.0-20180506172741-cfe4005ccda2.mod 33 BLAKE2B 23432552289b1edd0987877da8a828994a834b67d0c45f7abdf72ba2cfbec12ac90043623948526f4aa3267d462158cbcac90017c377bc89cb715173fad2bcdf SHA512 ddf0d034279047865a7f71bb3745e018b04a65613eef67c75ab246665aec2c833cf41e9d4b2583d89498b0e3e516a7b491766d9935f2aaad861ff67091e23909
 DIST github.com%2Fgolangci%2Fdupl%2F@v%2Fv0.0.0-20180902072040-3e9179ac440a.mod 32 BLAKE2B 23ef6e127c4b643852b0781780f448c8f16ed5f7a000b13008f5114338725f5ba573615385f2e158e0c276e972d7f9366943c9e7cd79973c76426f332f100bcb SHA512 1fae7cd9fc7f93bd10c51b52d7834733484e54352a4cfb812417e594968de4096b8f6fba075c567de411b1302c0507b0c9c5c1d71874645da73c28d434498754
 DIST github.com%2Fgolangci%2Ferrcheck%2F@v%2Fv0.0.0-20181223084120-ef45e06d44b6.mod 144 BLAKE2B c8d7e8f039150472539681c78080647400cd4060f42bd70001c8d3bab6d848f4e0a494a215b3d2731d121e724340db54760d2647b3cf028a0487ff16c22a2d8a SHA512 3326adc96464208bbcac0c76f1c61eed9f9cb2a3f8d2f904540c0b9b403e68cf06889f74801f2be5543ebdd33c9b343f575baaba15a3618be358a4c6f7084d29
@@ -328,7 +372,10 @@ 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%2Fcel-go%2F@v%2Fv0.4.1.mod 423 BLAKE2B f27df4dc2fad19e9c65efdd8ccf0e76770aa40cb1178eb95d372bc420f12366734357750dff159c15f87ef73d9f29e96a68983be6b3f9736951fb1de00c97e2a SHA512 2c4dab2b64619aea96859efbcd27e7c011166f5ae393be5eb3f32123a9d46f317b796485b7f785d6920b602b157c12845a92f302c0d7c16dfbe5c02d912ce77e
 DIST github.com%2Fgoogle%2Fcel-go%2F@v%2Fv0.4.1.zip 2239677 BLAKE2B 43ee2c765dd76d687fe36453d004c060d99d98ab5b0e830ffda981a14f4ecd6ee9861c2e69136537589dac928d39198cf4bcba320c0963437772a8ee4bfcd745 SHA512 577c74888be7804c4e1ef743a94f0a7ae1d361fdd0af36dbb6a1b0f57253026c6517e62fc0be40232909cdf5b4ef559b9665a698474afc522e381a01644e8ad7
+DIST github.com%2Fgoogle%2Fcel-go%2F@v%2Fv0.5.1.mod 305 BLAKE2B 212e4d4758524cc0b7ea30a4c17d4d4c2d658b91541a98edeb23388fc911310c9f24580cf9866503d756b44bed2f7274fa04276837c416e1f1bd1ce4b2159a94 SHA512 d9d8d0cdb7d3bf55aad0094c4546a35e591a3fb4b96dc056bafe3a8e5776b83b7acbcdbb754fa8352159b43ae994df8c12821dab3b089f3aabafcc4bc7dd2284
+DIST github.com%2Fgoogle%2Fcel-go%2F@v%2Fv0.5.1.zip 2245720 BLAKE2B 5fb8c4fbc3d2e3c056f3d3f97dfe5d21f361f9833a4a1697645ce03c60fa01c06fa7c39848dfcf9836f4db3dfcca7853a753ef2e2f93f0be8ba019826ab3bf6d SHA512 b444571e6856b8236f86e0d0799600e0b06a1b702e78f8681b3eaa43d617c2864d4c9ea49e84b853dcf6468fe8f2acca93def01e0eb94e59d42b52300133bec1
 DIST github.com%2Fgoogle%2Fcel-spec%2F@v%2Fv0.3.0.mod 34 BLAKE2B ef0bf5a6b3ad1bfa2b99d2e3c2d51d89baf14069c27de6c0c453f5f9af89815b13af0b284ee14891e81690b18190722847941e512196c6b90e6eb70d9ae2922f SHA512 5d6a53da05253474978a6b74c947ca949bb5f812bc94ce99ff16e3e3c5bdcc644629bf7e88856496995eca6a439999786818dfb560728e0a7e6cfe2f85a8dd64
+DIST github.com%2Fgoogle%2Fcel-spec%2F@v%2Fv0.4.0.mod 399 BLAKE2B ced1a50b673c6aab91c6d915d135cca105171118d2e89469cfd22e3f6ff1a6e1ab5a83e693ed1f350f1ee77f0dcede89d69edca10c146ff2ddbac9bf28729b11 SHA512 411da41f1eab20f946992a2e346bebe14c8a1c04bbad8e665581733c3a4a467377d04b42e9d4c3486eff7f7b4c0e194010fa12d940fe3e1ede27fb2159dad799
 DIST github.com%2Fgoogle%2Fcertificate-transparency-go%2F@v%2Fv1.1.0.mod 2973 BLAKE2B 9f6e350d37e83d53df485e6121978b912346d5e7d51975367112287ab8367849370aad195a09eb9cb16c0eb30625d2934bb9b5e35b7b5e507f1b229a6f1d20e6 SHA512 08fc1b8c6ba361e20b92095021c1552007d69d118d69fecc8ba0c7ea064daf7d4f84152d53fbc45fec332ca964e2a4f11ea584284a0395517d511f30333c7d61
 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
@@ -394,18 +441,25 @@ DIST github.com%2Fhpcloud%2Ftail%2F@v%2Fv1.0.0.mod 31 BLAKE2B 7202132cff9b47a448
 DIST github.com%2Fhpcloud%2Ftail%2F@v%2Fv1.0.0.zip 24894 BLAKE2B ab55c48bafc78202f2a0a494c6b00657dd81c078c0a23f797a59049e8ac59bc399f784ff81beb710aabd1d035e7ee3db5a4c90653d6e57dc3b3f0bcbd098fd39 SHA512 b77e39712e985744e277604bbbcd48f32d28ea69eac7a6b6cc0a3f8706e2970ccd5410761784b64eae73a07786cf81c665934c145369317b8b961b503582643a
 DIST github.com%2Fhuandu%2Fxstrings%2F@v%2Fv1.2.0.mod 33 BLAKE2B 1001759c50e0b825975577d6b7752503eb891aacc3d3a5642a3f338fa90091ae6de3cc81d2d7270ca7fa0ad40e01cc53bb433dfd079cf419904a1ba910014bef SHA512 3f1f76283ecc9d917de9b7061becf780dff161774eab48319d9094f08f51b7e4d82a4a068fb543ef766ba73d26346de29c6a69ac31e83f43186924aabf5b3bb4
 DIST github.com%2Fhuandu%2Fxstrings%2F@v%2Fv1.2.0.zip 23295 BLAKE2B 7509d0d278fb0e01c8a83013382c335d0974007ed7c7637248b1bb161cc75fc9eaa8e89766acca3f11f0749413388ceb07dc11ebe894545cac98726894855928 SHA512 9201c976a637124fda2853aa9963613653165f96d9a6a4d8f100ccadc692686b168355769e643e840c0f3e44944e5ccfefc18c58157f38ab6b8acaf3f4b29953
+DIST github.com%2Fhuandu%2Fxstrings%2F@v%2Fv1.3.1.mod 43 BLAKE2B ea72fa407faa556d4164e25aac2a8093cfdd8efdff6f68f9ebb277ddca3aa7efe0df0f22546a36fe6858c22dc638869cadcde024e32d0a930e0cf12ef5b17c7b SHA512 f6d3531d393904144d7c84cb254becfa2dad42f8695ce32e3f44789abe89d60019f01543936a64ae1728f8d395dd96bace969282e3cd9f8a9eda8085d3d1475d
+DIST github.com%2Fhuandu%2Fxstrings%2F@v%2Fv1.3.1.zip 24521 BLAKE2B 6fbe5fc8d03415b09b19029c9df95e8a3169c4d4181a988167a104b91f81b5d359779c9f3b51e71dbea191c8f4bdd70fa11d0f47235a10056725f0a6c97303e3 SHA512 20e6207e6ab0e5bd23e4e496c19573345228e0abc804db1a17dab11dfc2c9926200fba671292a63f09b88b91905d867d817506a7bda25c261b3c4002cab9e961
 DIST github.com%2Fianlancetaylor%2Fdemangle%2F@v%2Fv0.0.0-20181102032728-5e5cf60278f6.mod 42 BLAKE2B a20b1ee1675ded231069e976e9e3812b116d80b207914ecd1266ce87160bd6fd3c0bdfd7f7afa4a2a4d7891a01cd7e4a7b7bcafa90ae31c5875f6b0eca00268b SHA512 ff238b036db5df69dc734f4a0db4d1fd1a94a04131d64ea20c5268078a645327527f185da4aab38b2aca60da8c6a5f8f118b660f5b0773cc76d7d108a47297c9
 DIST github.com%2Ficrowley%2Ffake%2F@v%2Fv0.0.0-20180203215853-4178557ae428.mod 32 BLAKE2B 2f3638c020525d7a0cd92e055ce17e5d9df3b1ee52d16ae5f8dfc5a9eb5284c43c6c78a07b2c9a5c9b5bd8e74fccf4227f2ac6554871c723afc9f67cdfd9f9b3 SHA512 0d34c23179f8a14936f1d5bb45ae3e6bf0e5ace54bcf93a9d121f28fffb75e504d454a91f343189c2873186c79a688971ef3172a723dc5be027706c965bf3dc6
 DIST github.com%2Fiij%2Fdoapi%2F@v%2Fv0.0.0-20190504054126-0bbf12d6d7df.mod 28 BLAKE2B 73c260bb0fbe04443ed5bd584fb0b28050103a56737a6f9ca2b892e4e2f4efcc39ea122dec597c6af87d897bfcde1450d6f42affdcd370bb0a65fe06f92d4638 SHA512 f226d814fa62df341b5f365d419db001f72c57fcf0a136d770fbb49b0cd24cf9332dd65f0a2510a32bc95af84a6d058dddabe0202e893db52e6f95099e04a35f
 DIST github.com%2Fiij%2Fdoapi%2F@v%2Fv0.0.0-20190504054126-0bbf12d6d7df.zip 14849 BLAKE2B 5db259149a633bc2b3ea35b5040e0d85bbba51508b7bd7fff5ad7d15f76ef2a8bede59c029a2737b6723a009950e438298d2a719a656003ea2760582af985710 SHA512 ca56726b0b3c709fc09601d4f49e9ca5b1d6ca9d07422812cced5ae6dfa83335ad83ebf93fca4aa5a216aedf5c3a7f5b75643eb3ba5c76315d419f4a6480b969
 DIST github.com%2Fimdario%2Fmergo%2F@v%2Fv0.3.7.mod 32 BLAKE2B b90f36a2d75d98a23cf27a0bfde69a7c7ab91f3f58924624aae1fd1e924e10ec3dfb228bdff3d97ce3266360bafc06817d8d5fdde0b6ebe0f058866c84c85b91 SHA512 1128f41755f4d87f43322971323896d589e3790019beaf160f9cca1e41414dec968cde425be6d8b3912bef9ac09be186adf6417a6bdeb92ee5115cfff1405733
 DIST github.com%2Fimdario%2Fmergo%2F@v%2Fv0.3.7.zip 26261 BLAKE2B 65c5f6b4f0e2af1076e279c5d3f61f7d6b8654b8a7537aa291693a784886dc68da0c40b480d881c41bc46ffb28364b90d22d88b17cd82ac8380d5ecd9777414c SHA512 448dfe08b2a5f7f2f1e9868274be4dcf7d2f2ae495994d16c74924f8059742204547ef2abfb73428afac3938e5f477a9db51b29bc76fbda32e01b67419af46af
+DIST github.com%2Fimdario%2Fmergo%2F@v%2Fv0.3.8.mod 32 BLAKE2B b90f36a2d75d98a23cf27a0bfde69a7c7ab91f3f58924624aae1fd1e924e10ec3dfb228bdff3d97ce3266360bafc06817d8d5fdde0b6ebe0f058866c84c85b91 SHA512 1128f41755f4d87f43322971323896d589e3790019beaf160f9cca1e41414dec968cde425be6d8b3912bef9ac09be186adf6417a6bdeb92ee5115cfff1405733
+DIST github.com%2Fimdario%2Fmergo%2F@v%2Fv0.3.8.zip 28698 BLAKE2B 76fa171ec22419b864bf42855bc0286059dbb93de9e174f8693e132679c762346b1e7ade3616404a20b8b161336d1cb2ccda1c7366a1b8d9e329a82d4c2775f5 SHA512 6dbdd7d3f35f7b6fb1088c28dc1d05bad04fc46d907273acb55e991c708e7b06f5b2db86ae2d6669f0720c3bc95816971ec4b39e897e714344817a83d9ed4583
 DIST github.com%2Finconshreveable%2Fmousetrap%2F@v%2Fv1.0.0.mod 44 BLAKE2B 764581d416faa477a91695a42c68cef5638d019a1622fb3bcee976c1581e904995d33c79ffed1d3b805f660931ece844b3e17437f158f8b82ddae82e95f0358f SHA512 0c77200112d96f9cddf8cf7da0059204914b06a8c400e2e672443bd02a45d9ebb3274275c20e6e7ee0728992e77579d945b36de44ccbaab2ee92fd55f382f7ac
 DIST github.com%2Fjellevandenhooff%2Fdkim%2F@v%2Fv0.0.0-20150330215556-f50fe3d243e1.mod 40 BLAKE2B c5cfc13138ded13b58e87927dab91ee13e3c849559ef067ff5dfc7886e454946daed9a9c916fc33e7ca2d090ba3e20b66d2b3d5cce1ad52455621659ada6ddcb SHA512 400eef69c141ebd20b3b38df86e95cceac1cc214b0ee7837ee84c6c0acc96097a459add9ff20622f1fc7df10e7c525fbe1b573a0b0e7597678c9a8ebe52bc564
 DIST github.com%2Fjessevdk%2Fgo-flags%2F@v%2Fv1.4.0.mod 36 BLAKE2B 67fdbc6d14995318979fb3e5575136262165afd7a1582f078d2c84c5d7fcc893f52707f01d798bd2a43e1cef8fdab6613f34fd9e4f5f1f6a61d91bf09a55ffa7 SHA512 5db9838fe6a00be9849cb79ad148813a573b652d6f6cf220c55b68bd23636016e6bddd6733f6b29d63e5f02d2750a86c2dcea6b964ceb87d4048d5c5f3cc989b
 DIST github.com%2Fjmespath%2Fgo-jmespath%2F@v%2Fv0.0.0-20180206201540-c2b33e8439af.mod 39 BLAKE2B 6129177aeb4cc82860b5e233715d4330fc61c4b6783af687d936a5d783b32f7192f268ee0954d8a37fc1a6c22c147e86a1fc1c9ee8f48cc979931b0500fc92b9 SHA512 19819e43a514d9d7b1c8703c06c3729456a39a963a1cd3cdce7f6318a3ef67f8663c5a66b6bc402cf422d823b1b63540a6c79f371cb81ecd1f13de646598566a
 DIST github.com%2Fjmespath%2Fgo-jmespath%2F@v%2Fv0.0.0-20180206201540-c2b33e8439af.zip 231432 BLAKE2B 99b12826322d86b39d622bba690286fbc43b9e0336161d5218e6620caac0580fc7b3a021e60047a19815e35a4821d31066bf1ee6ca0e49f7bbfb1df10df21380 SHA512 331f1c4fa97173f022210d15719a9ae8a0dcc1c7574e1f019959070bd8cc3f77e34dba16d78e8d9e0083fee2ac24751aa36d5cdc0b2d1303a5118156ea514b7f
+DIST github.com%2Fjmespath%2Fgo-jmespath%2F@v%2Fv0.3.0.mod 92 BLAKE2B 8b5eebcb883871ea090297a64f2ac5171b87eb4881fab71e73fc737e2ca4c301d8fa3a14f184d5c468120ea4b3f22c89867c952795fedbea7abc9b7e618d14c1 SHA512 8361dae50e9bc2db7887bd94f516f817dfc1a3c509c776640b0f9380343236d52a3f43a5ca0093a49a4ab6b5474ec2ad24a4c8549d5949e4f5fed0b322b83c21
+DIST github.com%2Fjmespath%2Fgo-jmespath%2F@v%2Fv0.3.0.zip 195553 BLAKE2B 82dfb1c701a06e1759c91bede2d7ac9614b92909431a1619d6bbb2dc2977d7628379c6ed622b57562ff6f2a1b063f1d8bf325435c85bc66f1a684adc29011a95 SHA512 8eba43cd8e422879a1b92a672826867a89691207b99cde00ed906c4fd6fa87b5c2ba4b0e58f5f1b1dd79bf7376aa790aa18b1d3eaec4b144cc1d789ff763c4f4
 DIST github.com%2Fjonboulle%2Fclockwork%2F@v%2Fv0.1.0.mod 38 BLAKE2B 091e824ab9156af7978fe3aa6f61ae046588510903cf635ec166225395e40df6a1c715e4eb3c47aee849435eca3cc10db971a7c28acdae233eda85a4408c7520 SHA512 377d94cf7dd50f88b57ba829ded5169a6c41c5a304814660df0a3447d10860b87855f25cdb945a6e4de14c41281651330d4109c6dd6684c86fa4dbba27a3872d
+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.5.mod 35 BLAKE2B aa26eb3b67893fa913ea0f88bf22ac283c6cbac246683f41ede681940cb2e4437d033811fc12f2b47f9d94337dca9cdc926fbb5f044b2caed19c8e46a5879432 SHA512 e8bb59637bc1154ed648179314c4e20fa7f549353d094f4861e2fdfaeb70da1c1711c1159e78d82914a35b8ce184641937efd8808ffb1384136c7a6f3fbeb78c
 DIST github.com%2Fjson-iterator%2Fgo%2F@v%2Fv1.1.6.mod 35 BLAKE2B aa26eb3b67893fa913ea0f88bf22ac283c6cbac246683f41ede681940cb2e4437d033811fc12f2b47f9d94337dca9cdc926fbb5f044b2caed19c8e46a5879432 SHA512 e8bb59637bc1154ed648179314c4e20fa7f549353d094f4861e2fdfaeb70da1c1711c1159e78d82914a35b8ce184641937efd8808ffb1384136c7a6f3fbeb78c
 DIST github.com%2Fjson-iterator%2Fgo%2F@v%2Fv1.1.7.mod 295 BLAKE2B c143c3fdf7abf77b2a2f55a66f8efff4f0e99478a89cd3cfaf50fb042e0da2fda5dd1e203c227597cc2caa7039f269daa48339701233a3e21f898eaa028ecc87 SHA512 395eb3069c417f996120ec06ea8d7a712f6d8915c7398da1f346c5bf5e0fde4492bae0ff3833f3316a41a28d23fc7c9c494db312da72d5cacdf52b2bb95da6ff
@@ -429,12 +483,16 @@ DIST github.com%2Fkisielk%2Fgotool%2F@v%2Fv0.0.0-20161130080628-0de1eaf82fa3.mod
 DIST github.com%2Fkisielk%2Fgotool%2F@v%2Fv1.0.0.mod 35 BLAKE2B 2f43dcbab430f12316fde243db4bafe24372c74d60874b05917269e249a36660309c23da151db31d89c0d0a8fd0f179e2dd7f386af3ca533c95ef74017609af9 SHA512 86aca37f7f94ada381e0528a535b344c8fdbab9e0dcc7b71d716083501ad3d61db701ee159ccfb5455a351fc18a405301abe798037dd1200f9950bdd805d3dc9
 DIST github.com%2Fklauspost%2Fcompress%2F@v%2Fv1.10.4.mod 46 BLAKE2B b5879e59b7061f16bd04702694188fc8b148c5089aa7a3a195c9fce7c349bd191dda7dc3172f88f0d546cb8c3eaaa82eac73720992509baad59757c740d277f2 SHA512 55b1b23e692eed7e5cd2789b542c27eb85c019460a1ea75bfb31802263328b53da1a466e4b09085e4e002dc699047bf3ef5ab003022a6182c9b762e0b812febd
 DIST github.com%2Fklauspost%2Fcompress%2F@v%2Fv1.10.4.zip 16811818 BLAKE2B 8c54587021045b8c13f86a8e666bcdf5e975ccf5ec436d20b471a45a9e130f1f702dc20d4403dde42fa415bedd286a6e8b45473fd41488db2ee3733413312416 SHA512 fe00530375de5ff95764f96e770c98eb91deb4abcd378b81e9d62cdab107a3b87f3fb77ade17e27a09bc46042ad9f73bce933da65b7127aa1d9afa945cc025cb
+DIST github.com%2Fklauspost%2Fcompress%2F@v%2Fv1.11.0.mod 46 BLAKE2B b5879e59b7061f16bd04702694188fc8b148c5089aa7a3a195c9fce7c349bd191dda7dc3172f88f0d546cb8c3eaaa82eac73720992509baad59757c740d277f2 SHA512 55b1b23e692eed7e5cd2789b542c27eb85c019460a1ea75bfb31802263328b53da1a466e4b09085e4e002dc699047bf3ef5ab003022a6182c9b762e0b812febd
+DIST github.com%2Fklauspost%2Fcompress%2F@v%2Fv1.11.0.zip 17406554 BLAKE2B 7be53f7bc891916dbf3576dde77a8c2cf5608dd7ff614d1dc938225e97871662af7a314672a720b963a6016c11fa1160137383242a2d95e4840c838fdd41728e SHA512 0fb2f3d65b1ce96c5d71bc125b499b243a3b9655492c0f2afb7fe3425df251e138b82bbfef868dccb3f7f06402162ed7023d81ac97e6506a57363bf18586b0b8
 DIST github.com%2Fklauspost%2Fcompress%2F@v%2Fv1.4.0.mod 37 BLAKE2B aee0c04f2b8e92b2b4fb2aed9691b2e55f27eae078ca0d7161866b1f815b14e6b7de03c80c567e6f1407cf9e48606bb097eaa0a26c5b7d46db4a0d18852fd233 SHA512 18830e82c89186889b494ac46cc8c4fb398f3aff5416eb1cec3e3b09af281ebd50bb0e8ac7751f6cd89bb1bab3738a354183ba12eb3ea42aa7dab36177b613ec
 DIST github.com%2Fklauspost%2Fcompress%2F@v%2Fv1.4.1.mod 37 BLAKE2B aee0c04f2b8e92b2b4fb2aed9691b2e55f27eae078ca0d7161866b1f815b14e6b7de03c80c567e6f1407cf9e48606bb097eaa0a26c5b7d46db4a0d18852fd233 SHA512 18830e82c89186889b494ac46cc8c4fb398f3aff5416eb1cec3e3b09af281ebd50bb0e8ac7751f6cd89bb1bab3738a354183ba12eb3ea42aa7dab36177b613ec
 DIST github.com%2Fklauspost%2Fcpuid%2F@v%2Fv0.0.0-20180405133222-e7e905edc00e.mod 34 BLAKE2B 1fea82f0ae24add73e084ada4930a6192f6f1d7afac47e2fd4a018e0167779741e4c948ebe67965751a845fcee894fe88e57a1e42a00a8aba2a6589dc73b30e6 SHA512 c71392a06cc0dea75b46dcab30bc5b374eeb432aaffc678213d5896015cd31ef085387446a8086c3275b97bbfb02c93c0180f7b3bac5fc1cdf1fbe5bf7af9887
 DIST github.com%2Fklauspost%2Fcpuid%2F@v%2Fv1.2.0.mod 34 BLAKE2B 1fea82f0ae24add73e084ada4930a6192f6f1d7afac47e2fd4a018e0167779741e4c948ebe67965751a845fcee894fe88e57a1e42a00a8aba2a6589dc73b30e6 SHA512 c71392a06cc0dea75b46dcab30bc5b374eeb432aaffc678213d5896015cd31ef085387446a8086c3275b97bbfb02c93c0180f7b3bac5fc1cdf1fbe5bf7af9887
 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.2.5.mod 43 BLAKE2B 99324dc9b41ccf0b0012c4732c49c84d206cda9529e4d1ee58bf47266f1eefcb64d227e7ad285dced69c61e5a5d41e84d768bdc45a2a59df6bdb2b953299e6ad SHA512 e5b3325e43c7308becf2c0fffbf969d26624dd1f5a81ac47f91bfcc6adfa5d14f29f32d97cb53814e11a09512da3a0053deed3d0e8dfa3fa21d7ec180a84b0d9
+DIST github.com%2Fklauspost%2Fcpuid%2F@v%2Fv1.2.5.zip 369810 BLAKE2B c1dabcc73f8ccfcdccd15d038c5871825c081bff2e835b25b3b50162b5334cc61c87542082401a4223cb4990ef756f847171a0c5079c4844db4cfea9235d48cc SHA512 c0dbad72b97c61f65299863d590d37698ef086aeb7d7ab96935237613a772d6f00e3e01598e882e4ec013198dfdfe94905f7cd11ba20544c5f68dbb291c8f9b6
 DIST github.com%2Fkolo%2Fxmlrpc%2F@v%2Fv0.0.0-20190717152603-07c4ee3fd181.mod 30 BLAKE2B d5459de7c13dd18d24cdda6beaf02ac341eab5353626d462bdbd22dc7fdc5f67a41b078ee1a33ea578c9f718ab78bd20ac76d76a8355918ad31aa228aae0345d SHA512 a705d6ac18dd446fb821b3e614b74a5e0e5344d618ad889839f04b1d79283eaf0397bdb9d565385cd695b5ca2288150518d54f60fedbf9a8396bb07530b016cd
 DIST github.com%2Fkolo%2Fxmlrpc%2F@v%2Fv0.0.0-20190717152603-07c4ee3fd181.zip 15992 BLAKE2B 1f74bb00322f2419639e99c1c2b8b54ec35c6f3ed32f7c6dfc66e5da429eff8dbba43c762eb7378453e5d20690390a173c6d20c728a88439d4d9993de9d9cc76 SHA512 ced432b9b38cfbe55eaa4c78a7de33fd9aba1840f229335f128cfd91799f46136ec7193bb9af23e2866892027a2002e8559894c1ae826d8a15e540c12ba0f94e
 DIST github.com%2Fkonsorten%2Fgo-windows-terminal-sequences%2F@v%2Fv1.0.1.mod 58 BLAKE2B 4cf48282c28d2b8237fe9ff852ad25d102cce038fbd1852a1938bcf69c895df05dfdef6e533b3c0b4da28103eb5e3a9561f802414ccdd99b2d3ec2e2db0807ee SHA512 fe33ca4de6588b95f0155458b8b6daab218553b58de5dac220efe54019dfab085838cc6a22012a106fa36a6094447f744825cad04aaf0b158fce5aa676048fe5
@@ -459,6 +517,8 @@ DIST github.com%2Flib%2Fpq%2F@v%2Fv1.1.1.mod 25 BLAKE2B f81559c285e1be835f5ba6f9
 DIST github.com%2Flib%2Fpq%2F@v%2Fv1.2.0.mod 25 BLAKE2B f81559c285e1be835f5ba6f95730022986373524dc66f0ff825885bc3d959ebef5711ccaae86983c0710da8a501a3e97829a01cf67bbd560dc7fdae682b0b7f6 SHA512 493893b0368a6e9ba2c2aab1650135de1dcc087e6eb172226a623d62a48e4102857f68f9ab6cd4f7047e6a291c62824ba924076891d162bbae846d97166bd1e9
 DIST github.com%2Flibdns%2Flibdns%2F@v%2Fv0.0.0-20200501023120-186724ffc821.mod 41 BLAKE2B 9e33d8fb7686e456c85a18e5942e49bd91ab8b93b0e14bcf75727888c8f9487eca887e8442f66efc3de66512eedf59ddb98e3b914b37bd0f56d693c61a4f33bf SHA512 f588d1201e53b10ed14d020442225c87e024d7ff065f3ed1cb24427a8279599878c7ce1c2ddae079a2366f05bbb3331e930a1bf70dac8c04afcf7451de820dc7
 DIST github.com%2Flibdns%2Flibdns%2F@v%2Fv0.0.0-20200501023120-186724ffc821.zip 5467 BLAKE2B 8b6319e4b6b36b22d43daa8f69ea0df41a61d028242a7dcdeb67b2e565436038061802e782ee5bee05fd620a2d5a2b3476ee1c5870c50eb8d78f75fbf69af81b SHA512 d460b858c85f116d9bd1f29d2e8d12e01d2a8390b51506e28d95592037970a98ff90605e6d81c6a4064c912f5656f9ccfd261d93d0cc76d4ebdf5f2654908a3c
+DIST github.com%2Flibdns%2Flibdns%2F@v%2Fv0.1.0.mod 41 BLAKE2B 9e33d8fb7686e456c85a18e5942e49bd91ab8b93b0e14bcf75727888c8f9487eca887e8442f66efc3de66512eedf59ddb98e3b914b37bd0f56d693c61a4f33bf SHA512 f588d1201e53b10ed14d020442225c87e024d7ff065f3ed1cb24427a8279599878c7ce1c2ddae079a2366f05bbb3331e930a1bf70dac8c04afcf7451de820dc7
+DIST github.com%2Flibdns%2Flibdns%2F@v%2Fv0.1.0.zip 5131 BLAKE2B 044b7578512af94644892a43287989f78cead8efe8b9653a0045d302cb9bf3b053f23977ad793e84e8876ac8b0f230bbb4e4452f3ac18775115634edd1c4e67d SHA512 749121493234c989ac79698a6c6bf5d4a34de12e13ac14a61eb3557977ee301fb045b3e000e8757a30f8fe7728ea3f0a1639a4e1307cf49a203cac0b4fae7c81
 DIST github.com%2Flinode%2Flinodego%2F@v%2Fv0.10.0.mod 560 BLAKE2B 7e3cfbf77d8bbee8079fa320b9774d2f09534c6155f629329eb4c5b47b769bdd656158b2dc8601961428fed54db726091bc4896144c26d1d86caecf9922be278 SHA512 5a899e49a753311291abd853eaf95b2717a1f040612c0e44f18253e13dc9be8f6eedc845bc356ba2032b6f152bff1478ee906ffb0b33bd7ce7e11c8445bdad79
 DIST github.com%2Flinode%2Flinodego%2F@v%2Fv0.10.0.zip 362101 BLAKE2B 1b45cd262454ac3e1f399cb1ccec1ec049384258edb90ea775e83c75b5f80da181c30b41f0fd01db8f362847466443c9854cc1cf70116bffb7b5ef2456cfd8a6 SHA512 b5837991c79770eb4e775fc593160375318ae41eb92015b5c62991eb23226436c72af5e46a4d2bcbbef0d0051637e96bc0545490347b923319190f2590756e22
 DIST github.com%2Fliquidweb%2Fliquidweb-go%2F@v%2Fv1.6.0.mod 50 BLAKE2B 14ecd513688eb35a88bce9fc03caee2e27d525472e81066f5a4956e4c6a901e6f5ab55be3a8498135beff669a598a7b5ce2a576eafd760106123115d77f90fbb SHA512 229f3c2a980a0e4baddcc1ab23df2dc119a96fe7e5a19aef781106021e3c289f6c1ce7cafe81f342319020f0b35a2d50d0acae19bfe87e361ac32b6ce733448a
@@ -466,6 +526,8 @@ DIST github.com%2Fliquidweb%2Fliquidweb-go%2F@v%2Fv1.6.0.zip 22844 BLAKE2B 3c7a8
 DIST github.com%2Flogrusorgru%2Faurora%2F@v%2Fv0.0.0-20181002194514-a7b3b318ed4e.mod 37 BLAKE2B 400e3fd523a0995770046676b3a848d776c64948653c3730929e39e0c0a9fb2ffdddd8405359f676375bc506efb05bbb9423af6b6674d16baa16d53f264d64e8 SHA512 37c8088012b54286571d11de7e6b59d68a0c5b79542c35c31c30187ac3586f57466354498960aeb500226d740eaf62601ed6e569ee82039efc546a3bbcc7ec73
 DIST github.com%2Flucas-clemente%2Fquic-go%2F@v%2Fv0.15.3.mod 582 BLAKE2B 359b64b1efd46cf3dea5fe54e27e8e2309eba8a61d10436b7185599d47a080ffed231fa0c4c990d90095843ac685a0186289fa789d39ac919815172ab638c0cf SHA512 9719fa4f3bf9c6af382371358405d3fcf007a553203ae1c4f4a21d0ac88eda88721daefc0951854940656d42d1a5940658c5793f162ff8d46fe05c0e6474fd2f
 DIST github.com%2Flucas-clemente%2Fquic-go%2F@v%2Fv0.15.3.zip 678990 BLAKE2B fc26153db7fb0e5124545564ba89c6a47e40d9cc4468c8eca96c0eae06186bbb80d584baf5d5a9e0949eff5c4680f1678e91ed0bf3d874992d5b30e01516503c SHA512 8910f8e93aa91ce1d5c5aee3c34ab6a8c0417ce0f05eb6e03ff60ca9789366f5f098da0eda816f8a697d1dadff2143193a03456097c49383313ddeba1d82a1a3
+DIST github.com%2Flucas-clemente%2Fquic-go%2F@v%2Fv0.18.0.mod 761 BLAKE2B 39680bc99714d194fa22a44e4f163d0e3c9b575a23fa359d5e591a63f542b11b703d68df1b3fac5b0b798fc41179ab8f711a64cabac5376e664000812a952ee0 SHA512 bf0c06b3495d22616ae3bdf7de7fc80fc5594b231bb20ad247143028b9cbfc852e6032cc9aa2641fb10fb9a0a599a6040731ca3aa1562c26535ba6b2077ea9fe
+DIST github.com%2Flucas-clemente%2Fquic-go%2F@v%2Fv0.18.0.zip 731256 BLAKE2B f0e7af8ca89b7b440ac5c0a49e952ea4acf469b48ad33c92bb3818ca5d0c24782ff4238818c203071dac7c0a24a559318fa6f6b2c6d5d29d74b3101e840742fc SHA512 c19474c55c571f50e4556dd8a7b1778d9eb24db323e2ec92effc1189695e6be2dabd92708f2c500f5c85a5ad7ebc1b335d31271d16e4be0d2d9475f59eaa456f
 DIST github.com%2Flunixbochs%2Fvtclean%2F@v%2Fv1.0.0.mod 37 BLAKE2B 0d60c4f85be76a6a73bd4b6403a73e12378ceaebf9dd48bba245ab0e14e846bc1fb480671f959ff56d52c5e2b41db8de0804d4258fb4cb58d6b0c618c1401104 SHA512 6a0913935e88940258478e250207882eb1df8727e18e66419ba5d4a06a0b2c8691642ed379d4b4ef16df715893b35e59d1e967d5276e6b0ea75b1f481e852a65
 DIST github.com%2Flunixbochs%2Fvtclean%2F@v%2Fv1.0.0.zip 5986 BLAKE2B 2a64b2fc6c1c5ba028df7a0050bc30cbc78a6b5b15491734bf277bbc838a8e48a7cfaa7aff1714dc0db286656012f6065eee36584f69f9073ff5ecc858f397aa SHA512 1fb0eda44917fb59b299080ed300f16b6cc0123d0a45b477dbbc2b1d6aaf705a74997614b2e96bb35c4cc9ed5b076a2369d13ba3963bd55f19d87a5e69e4f777
 DIST github.com%2Fmagiconair%2Fproperties%2F@v%2Fv1.7.6.mod 40 BLAKE2B b8e71ef21c42894c31d75cce0e7423b21e716de0539a8a7ff462e0d5c05c77795238598630208055ad808af2db8c56a997e7e114ef391c07d380b996ce533544 SHA512 8a724e5cfce28512549e7b06ec42c9e02625adfb3398fd45af07f8c512782002a262e8567669929626814758f9d12041c318bd4258f88d110a851630537bd5d1
@@ -476,15 +538,25 @@ DIST github.com%2Fmanifoldco%2Fpromptui%2F@v%2Fv0.3.1.mod 38 BLAKE2B 8f8b32c7845
 DIST github.com%2Fmanifoldco%2Fpromptui%2F@v%2Fv0.3.1.zip 37084 BLAKE2B 18aea2de8b7e240a68a36f2371c60da8e48f05e341085a30cfaf2e6befd33395a5b8f24dcaebd3633c88c8f3f7d1bfd9af8e099d344ffd42ab5e4e67c5f07422 SHA512 42af1420cc25af7ccb33a7d967c9d0310f7c79de5116d9efa157655e35ba4ccb2bcf43b30f96861860c5eabe4b1a96bf5e78ac574991eab5e780774edb29e678
 DIST github.com%2Fmarten-seemann%2Fqpack%2F@v%2Fv0.1.0.mod 176 BLAKE2B f13ab7cbc5159bcb8e425bafffb50590b8ba21d0cf304bf690151d42db2facda3347d7ac3adf8030cc939c4f1930945f97df443ac59483d1575db01e2d354163 SHA512 f3d70545df7302538e468344498b131d8d5cda99696d02e025f255b77ed02cbb87941eab7c17235ce1027dbcea96d298fc304d2ce88db1bd34aa9d1fb4487bbe
 DIST github.com%2Fmarten-seemann%2Fqpack%2F@v%2Fv0.1.0.zip 42470 BLAKE2B d02c581ec771e44ceed4ad7bc6b82373a8aa853bbd8cac0d11fed5516e0af09db0f5e25d63dfbd2daf49ec206604500902a98985885e706286b37ddc95a10e8d SHA512 147f6d6aa35b4819aaa6073ab903aac88c4ac90be47e68171408796a928f198eb1a63937a20b319acff6e15fce7524ba00962d38cca3ae3eb887ac17e3c692f4
+DIST github.com%2Fmarten-seemann%2Fqpack%2F@v%2Fv0.2.0.mod 178 BLAKE2B 1044039faf6fb3c3d61c9b00ebf83caa7812cdd7b7787945b7f9f106b88899906d646a6f00f81361e14aa48e053a2177309cd59f1a63cabb706a832d5a7cda6c SHA512 3db41fe780063d019ba2e84c08116f754f5cf6de31dd4432364c7f9f808d802218d3eb039e10eec0dba6fe6ab836799663c5f3789a12f308605d0a52934a2960
+DIST github.com%2Fmarten-seemann%2Fqpack%2F@v%2Fv0.2.0.zip 49799 BLAKE2B 375887cda1b535f92ecc51cb96a51932d8de0ac432d33f2078bb930e5577d1094f5ef17f0639767bded572739e946d17a03c38e6dda013e220909695cb6cc01f SHA512 91b5aefea5fb2a49bc3b4ec96d910ecae31c187e4eb4aa67dc9250b127f5b79bfcff2ea15b686ef587ca511b4d273fe65fc179345db6b998dc279a4b7c8fadbb
+DIST github.com%2Fmarten-seemann%2Fqtls%2F@v%2Fv0.10.0.mod 201 BLAKE2B 12946a417b352c690b676012121a26e6dd80839e5bd7452262488044c17988fd094b1e1fdbacb5c15b156a6e50cc4604434c452a75c97081bee15de827ded57c SHA512 df90f7153c82b58c2141b2a59dc4b1cf145cdc99cc1b2eefc881a8924235c02eb5ba39795f394c4e90557fb3f74a79abc98ff66d07e4f915740a63ca0b3f4180
+DIST github.com%2Fmarten-seemann%2Fqtls%2F@v%2Fv0.10.0.zip 578850 BLAKE2B 0403309855bbfc905bc149f1ebb375f5b7f72eb7e432c18dd91dfa220f643d9508bbb9500597ecf8b2ab6f96a71e19aa752a67999af84853a5fa55cbad8c4bc2 SHA512 2b8b9631ff73a30f6590ba86a21a77ab531fede897a23658d3d7720b24da008006178e225725eb46605b968e5678f5d5410dde24a4b10d9e0b404b53a1c284a0
 DIST github.com%2Fmarten-seemann%2Fqtls%2F@v%2Fv0.9.0.mod 200 BLAKE2B e92c57381bad535c271d3e00c5c361d6b1ad8f5eacc002d511f2e473d4d824db11fe3c223ebd874416bc28481b5eff9f42fc7cdafda3b334c150223ee152cef5 SHA512 485f69dc07637010a13314d890a1009b6ed9f144baf9263fa6fbf131b039df722bda6aa71b04fb03efd7fa721b87f73ae359bd2cd73568321884fdeba986a8ad
 DIST github.com%2Fmarten-seemann%2Fqtls%2F@v%2Fv0.9.0.zip 1156507 BLAKE2B 27bcc236125bf5723a2a1532dc915c6267ce11c1483dd4112a9aa7a8fb398a03dc7120b1af7be6eb94547c184d487778c0d27ca1a55fa3646b870d5be3dd0d5d SHA512 8ba16d79b00059d0a465d10dc74176a5095f0bb38cf09eb95c2b5333a29f58a4f349967013c93cbfbc2a34ba4360d45eecbe19564609dfb56e4b495b93d90d3c
+DIST github.com%2Fmarten-seemann%2Fqtls-go1-15%2F@v%2Fv0.1.0.mod 207 BLAKE2B 5b3d5ad841a5d0141a734651988d7d4fe37edf8f0452606a9368db7ab760986d6910a62c1f9fe404c02eef38f24b01ecb89da7131b8dbf29f771032bf0b26306 SHA512 a1596052f6915fbb2d54b6d5ec302f4005630d26952d42dd645a9beb62dfe65a80715a0de4bd64b04712c40fa3d67bd6ce4abd0c98a07ec0cdf37281ffe91f9a
+DIST github.com%2Fmarten-seemann%2Fqtls-go1-15%2F@v%2Fv0.1.0.zip 589816 BLAKE2B 690313edcd713bf57bbb66b18922d6d6d5a94a68bd4321c910e80b69b7a2e1f8c24ebf7ca1200e96027d603578aefd02e4036c9c02229457da2998269e4cd8d2 SHA512 ae2f6c302772afdf93cdf44f51c9c7c230da984fd2ff2d48715f522f6bb5a37f7ad8129eaf654c1e2ec1f4e018ee9296fe8d3b1f73a0c35313b49d0137a20b6d
 DIST github.com%2Fmatoous%2Fgodox%2F@v%2Fv0.0.0-20190911065817-5d6d842e92eb.mod 104 BLAKE2B 75db721c7244fb3093e6fd5b7dabf0bd35cf91ab1c74d77b118e90cd9950f522ac58aed60c82cc241d769aa0bf19327ad25004740ac16d180b33ed4c5f31c842 SHA512 5d973082b1d8ee636c161b64a0bc2366652a83fb3b2e5c62104025915ff2633f02fca23af35d9b5bd2483f9c4d12c2c0b42cfa2d0833c428686156659851e4ee
 DIST github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.0.9.mod 37 BLAKE2B 6bd675a05c0bb6f9dc12d09203d13de115801888cf8c02cb5d609f72d214b7e7ebf13a72ddfa2eb9172e9c2ba1f3e5a040f089a86ce9fe873d49288d5f7dc5a7 SHA512 3cc3ae26618b96a0fc076b18bab6f8f0f6a1064d6a9913c1015a9867fd3571d17f5d2867d72cec008e9bc7005883a596edb21424084f82ad5b572443de90f976
 DIST github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.0.9.zip 10606 BLAKE2B d9aed996970ecc4828716e86ddbc85a7949f60ceacc7326708ce499bfc09250bc8ee336806b229a44064839e7ce34f5cb2a7607da5e82c417a737ea869f97f03 SHA512 dd1763a8d04540b3e579d397fa4888c4bd8c00c3963cfcd1fe42af7c1990ef85f9a2e2fd5c5f2c7d3e6817448df5e2237241ff5a2cda651b061cc8932e0afdca
 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.6.mod 160 BLAKE2B 10c23e5a0edbdd398d6913ee8e4665e15ab0c30c6aad4d8e113533d421058858a4c23898f8f360b72cc39922bf9b4e7c6c656faab76ec4616e05285932bfef03 SHA512 60840c731813699f19e9a23f3cc0e890c0b0e8228510b0021aa2696f35f3aefa1fc06eb396c5035214ac185816d5757896da1bfaf59e2dd24ca750f5b792e6c5
+DIST github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.1.6.zip 13586 BLAKE2B 8f8bc0b542920d0effcd6939a66e34609401f564af0c1f6330bff2925abc664add3c36534bdf8602ac176e74ed85ec8c8597f748a7ec82db9e9f86207c563fee SHA512 bd6adb6aaf44c6c59bda2407a05e192d3336154cec35d0a6b6244cc5b93dc5e53509abded7c5999af166821749dd2e55333a8813ce64c310ba5db2df597bc171
 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.3.mod 34 BLAKE2B 55253c2475bc0169df729915bc92689eaad2908ff7b9dd81b8a553bd75d5f866c308a85fd69d664d31b0d2d373d8d52ee1701677cbebb07e361612ab8cf17f2a SHA512 00c272b4652db259c46875641b29489ecada2602e38beede8c8bd529d73b6e123bff58f8e0f8cadd2d680a6a5485aadffa448e9445548abbd2fb424b059a31e1
 DIST github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.4.mod 34 BLAKE2B 55253c2475bc0169df729915bc92689eaad2908ff7b9dd81b8a553bd75d5f866c308a85fd69d664d31b0d2d373d8d52ee1701677cbebb07e361612ab8cf17f2a SHA512 00c272b4652db259c46875641b29489ecada2602e38beede8c8bd529d73b6e123bff58f8e0f8cadd2d680a6a5485aadffa448e9445548abbd2fb424b059a31e1
 DIST github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.4.zip 7026 BLAKE2B 3cebbd0bdebcd1d32b7fc618b7190b7813876a1df010d1c3ca3800c41acd64b6537e4b3e4d4a574e3eb736822a27eda7bb2fffa197063baf9a347a820573883f SHA512 829b0596279218a2fad36695fa42036f265ce79903a0f5aad27495dfc7c6a33e8bad32010e59f4dc6853f1e38fd9e9f635ca2f56adaf5ea47e4914f2a892d251
@@ -496,11 +568,16 @@ DIST github.com%2Fmattn%2Fgo-sqlite3%2F@v%2Fv1.10.0.mod 35 BLAKE2B dfade1d4d17af
 DIST github.com%2Fmattn%2Fgo-tty%2F@v%2Fv0.0.0-20180219170247-931426f7535a.mod 31 BLAKE2B 01ec123858a9bf8d2e9b6b2bb8415431e5d4145cf3ce82c16522eaad6f5bcb7667e391ddc4544a3ee04a8dc9dbf3fbdfb74173da09f3a330952bb5eedbbe203e SHA512 8c099ef777c49b02a62031dbe9d4fdb18839f4b2265802ac5fc3e6c6fd1d3278dbd3bc01e8674a0b52d2d6e6a394d1d4ef7bd64f4388c68e9b81749a4228773e
 DIST github.com%2Fmattn%2Fgoveralls%2F@v%2Fv0.0.2.mod 34 BLAKE2B f00bbc47239c6bb31831b7a6a0f4ebd9e8d23275c2bbb0a851ba5726c310867d0a885c16984f55874b0b7378dda94533ac49a85a8de1d28fbada63ae7e94361a SHA512 e4e9e3ebfd69fb7f182352a03999e4bf657d58f783faf2c8fd0da1d71818502e12acba43292418ab929390623c638352b9603dbda6d8feda4711a9a765a931fb
 DIST github.com%2Fmatttproud%2Fgolang_protobuf_extensions%2F@v%2Fv1.0.1.mod 56 BLAKE2B 50d2d6dc9c1ee92d629af8c9aae9fe5f70a0c6fe270a95a8232cee3c50132ef90c68218ac64a3b5b72d94e23ecbea5f567fef39a81be3d4585bae3f4f5348545 SHA512 5235188477921a263176fefaffccdaca4bf8175a2e248356a06596e37fa868400203172c7fe9fb80d0a65d335d23d80edefd242657de0eb83d9360589e063bba
+DIST github.com%2Fmatttproud%2Fgolang_protobuf_extensions%2F@v%2Fv1.0.1.zip 44378 BLAKE2B 15ccda2b94bb024656859fb8a6968782b9a1bffb786b0b1ed69a3284b01f4a2100b3f3c46b6ebcb8f7febedb5bd4f6762fe333b7d4f1d14c700f8fce60843352 SHA512 e9349ee2a7d5e5b129ec6a1c0507854aebca82cf9ac2d0a681cac2f4630ea35551ede48e1931494362232a83dc9f26b6b4162c6114e0176084c50101b1da46b0
+DIST github.com%2Fmholt%2Facmez%2F@v%2Fv0.1.1.mod 130 BLAKE2B cb89ba05855f7264611a5d1fca4fd5753dcbb8e3917411645c811f9bf4fc187b153dc05f9f0d70abb10d21a27746f2bdc27c10587555fee6c37772d8753b3ecf SHA512 7187e399781af7ff0c146fbf643af4e705726382fa3ea7929a2e65e0b1a8dbcb1dd05651776cfa23873e3f9527e194ce0a52e31a75d6a5391f33b638d30d36ad
+DIST github.com%2Fmholt%2Facmez%2F@v%2Fv0.1.1.zip 65374 BLAKE2B 65359052b52cc3415fd46615ea450c47434b44ab8333108dfda4e2bf615e6baa109d83eb1af9d307e2f730ca68c078c77d523b4aec015ab1ecde954242c4962f SHA512 51c652e7b39be89ebcdcc27f9f2da107cfb33f7dcace2d20ca7fc50fd32bd72128204232570a3a26614b6500df292851d35b304f34804fe99ddaea531145e164
 DIST github.com%2Fmicrocosm-cc%2Fbluemonday%2F@v%2Fv1.0.1.mod 42 BLAKE2B 1d5bc998881315c3b4507519cf19774b640d614dd686c11fdd8a9ea8f75b7c361a5bfbf13e4d005e768f6d8646a774000e3eac16d817dd7ea2d04f617c7eeab3 SHA512 c3fd7d7dfbb06289594cd16f09122e73d8882153ff54e1fcdf6f7c009c244fbbd7eae3f30154207f99a06c3fdee761b74cbcc8423131f714c626556d75ecaa94
 DIST github.com%2Fmiekg%2Fdns%2F@v%2Fv1.1.15.mod 28 BLAKE2B 7846fb7a9c146e4b4cd0db250d3a84bca13c7c3b8292ba71215a041006c8ea39a36b88dac7749a9bba96dc463b499633591f6f19d43369067b0f4f46594b8ddc SHA512 4ce4d3df63fbdbfe3505816e81dc7e806554d79cfe0254ce8e0228bc16eafc014c98475c24f4a6e0c6efb6fa16e891e2e47c43c9ea10ce20a95dc69f686f6361
 DIST github.com%2Fmiekg%2Fdns%2F@v%2Fv1.1.15.zip 210715 BLAKE2B 246ffa14da7608d3f1b0dd2969b2ac4e3f0b62fbc5060ae3e7f39d8ce5cf40d17b2c074021205513c068b33607f108f887a9cfb42b5d9f013b642e70ef85158a SHA512 c7084476120e931394480ea1ef2d4df157500e89f5e5e2fcb05329e5439bb15c99d70a2566400bb74e419984ead7197809ec6cce16c624ac42b8cfff0e222d5a
 DIST github.com%2Fmiekg%2Fdns%2F@v%2Fv1.1.27.mod 333 BLAKE2B 8d0eee290f65ec90aa77494795ca379d6e0dc3c1a3e040b045309e1ddcac7623330a140fccbf829cbd32cd6788195f3446d340144d5757340734804504203f86 SHA512 838358c8d40bce54c7010bf6c141e2022f2036ba91129166dbf27e2fbf355b8c32392fe8fd6edece94934c460c1b9bc73c496627b4b7efd63341d7086fd0b114
 DIST github.com%2Fmiekg%2Fdns%2F@v%2Fv1.1.27.zip 218584 BLAKE2B 3369bc1602c73ab798e3654fe3523c1629f6d7989a9251cfd831181f615892e0b3adbfc600c82e15ca70f80d4c2b542ddc66aa23aa71e77c40c3a4715b1d3611 SHA512 b275ac6c3e816b66f0292668b2a7d11942792f58c231c4113ff2e3950ab9108aaaac5c8f4278f65f8127635f14cc025a0622791b6dc3804a8186c33195ce6d7d
+DIST github.com%2Fmiekg%2Fdns%2F@v%2Fv1.1.30.mod 333 BLAKE2B 8d0eee290f65ec90aa77494795ca379d6e0dc3c1a3e040b045309e1ddcac7623330a140fccbf829cbd32cd6788195f3446d340144d5757340734804504203f86 SHA512 838358c8d40bce54c7010bf6c141e2022f2036ba91129166dbf27e2fbf355b8c32392fe8fd6edece94934c460c1b9bc73c496627b4b7efd63341d7086fd0b114
+DIST github.com%2Fmiekg%2Fdns%2F@v%2Fv1.1.30.zip 220586 BLAKE2B 278d2b04a115fd65be0ef9dfa583cd587b5006133599e17051f0d2632cd50503f764cf9ff614073ccf68bbd5dacb37621c99c4b2b4fc001cb56a650333540b26 SHA512 965b002270ba1938a9dd81ca88a290658514a93f400105f158374950abe7e14342980a42829151316d955222e92de0232dae7ad0a7baad88a055cc52957a987e
 DIST github.com%2Fmiekg%2Fpkcs11%2F@v%2Fv1.0.2.mod 40 BLAKE2B 48753014b177fb672fb4b96c34fda82fd83e7cc16c40ccf8409628f3b41f24fcc34fb0601ac8cb7869558c7d7ee97f6f1b8e6f587d696222db2f482790a628b2 SHA512 571622dd3240dc43d9119a5cbf644cebbabf134314c46ed43438be1568c871617949d07c60b8af3d22f858f7504ab91effc9bf234de84da1fbf72a936aebdbff
 DIST github.com%2Fmitchellh%2Fcopystructure%2F@v%2Fv1.0.0.mod 91 BLAKE2B 22854387f9c0bc85c6f4b7b9c5ce8a774c10c6be0c43ec6d188b6ff2f2e394ffdedcdd1bc0b8ba0e31fa3c418cc9339a78a798beeb355032a0724b284573c38a SHA512 8858ec62f3bcef65224ee7d66bbc16c080b2ed16609c46c5c6b6d983b9f7eef9e020a2ae78a16d0226c0f02c609ec5da92565861c02a81494cd6060dd56d005b
 DIST github.com%2Fmitchellh%2Fcopystructure%2F@v%2Fv1.0.0.zip 11210 BLAKE2B a469026ecf6a1ee2f2d56091fd90f00857cf5e57164ead9e53c15af03d10a8b737a1d2b2fc336e3e972af014dacf8f1321ee1fa1cc9dab93790fb6d03ae195ed SHA512 30b1a531823403a911d9f877352218890bbea15d82390b4561ebaa4bab09f493d49181ea5c34078c18df31b1896165e80c4862b450ef5858ed8af55b2a0c42eb
@@ -551,6 +628,8 @@ DIST github.com%2Fnrdcg%2Fgoinwx%2F@v%2Fv0.6.1.mod 225 BLAKE2B 65a25ecc18c30b5eb
 DIST github.com%2Fnrdcg%2Fgoinwx%2F@v%2Fv0.6.1.zip 11694 BLAKE2B cec339683519f4d033e42aa603cda9acc3982aafa5231896fce4b1e00a5b83d01de390002c63a265e1f77bff628ba6b2e8c5d1f942f8ff0c879507cbc7a86be2 SHA512 e47b0b240e461c55f4ddc60c3fcc8deed2225174bfd552918f88449b5303fd68c2496d43e1ff6b403af17f054610eccd08beed2a0ebc532af86f933f1e47ae6e
 DIST github.com%2Fnrdcg%2Fnamesilo%2F@v%2Fv0.2.1.mod 132 BLAKE2B 7360cf115d224b501dd475b2836cf7e1ae7796771b6c5c2289b5b07bc40b1501ba17cfd545854c60b96596312a3c1f803a8e87ab0e655ce29ff9eb940fefe597 SHA512 63de1d6d8cfbd3cf6e2b2f3365c6ee400475f3f47c451e182043861bc278a95374390ea2908c8189671f009a18db9b70bcc18b9fd65da0c38a4d5f3fae4bae29
 DIST github.com%2Fnrdcg%2Fnamesilo%2F@v%2Fv0.2.1.zip 48006 BLAKE2B de663f4ed27419ba6ff621de2f93790beb007d7b78097118b536906e493bbd64c94eeea6c8decb2599e1dde4584577fd563c175b0a53604b0297d38897df1acb SHA512 efd22840d13e6a11ab29b1df2fd48b655e86f130ad62c434d205d04708efb27b1ce6e7c3f58201b9363b48449f2f57752a5a3b5fb425d936115ee115a3d52547
+DIST github.com%2Fnxadm%2Ftail%2F@v%2Fv1.4.4.mod 206 BLAKE2B 67500c3221887c3dd9f65540736ad077a412eb394a302c2dca06abe3a9313ef8fa1d42a24f5df385bab8146a2e291728bd0fc4da0069af9e6919588c630abe5c SHA512 b8aff850aff011830e02c0ad21b0c4bd70bcd09dae13d720262691299a180fa1039365a6695bf0329ad1a9dfdbd71ddf28ce51a7d3289248eef51cf472cb3a00
+DIST github.com%2Fnxadm%2Ftail%2F@v%2Fv1.4.4.zip 25231 BLAKE2B 507e1c3dcd006ed29aba002827bad1ad129a97f58fd1e5847d0cc41022716965401c5c3d4027900bdd3197caa4c0e797805a146b841bed1a80b3779fd74e3e24 SHA512 64e6ba58de56e5b305c7ce64285cef1375360e87a7fc506be637ea347b63a2a89a1b56b8db3687d16b0dd631f8faf9c107c2b473b630e450aec92cfed1040695
 DIST github.com%2Foklog%2Fulid%2F@v%2Fv1.3.1.mod 29 BLAKE2B f74d75a495f683f4e9047201721611229ecddc37ed01b5d4b5d81a06220a6385f06d0f99e514bf19cc2030fbdba6de3a08fd38b750e6651a822b10bf69c45327 SHA512 b426d975637bd2b4dddc10d7c88b70f8b946201f311859f22520d53ae0a2d9911ab358460c089771f7900d7a8740bbc0c6d3814ab8f955108fc31b7b602ab5cf
 DIST github.com%2Folekukonko%2Ftablewriter%2F@v%2Fv0.0.1.mod 41 BLAKE2B a8e979ec93d507fe82beeb327f4747a7dc9ef7068b14afe9d08ac1e8241c5681d53bd5c1751781948e07d41831eb133ee850e30ce651728686a75fdb66b6e1a5 SHA512 446f9405f9004b40cfa355b9d93f279e2f74fe9157a868e5d8253b7c563fd58c0c2f7b393960eb1693e5be2ee6e9cfd7f5213adb0bc7f85559928ee9dda6da02
 DIST github.com%2Folekukonko%2Ftablewriter%2F@v%2Fv0.0.4.mod 96 BLAKE2B f192300c52fbe1d75a3a9c89e3d808d25f13944940475b8f2654b3e3a1205721f6a9aa553ab6293f7ea4c9e8be3d695bf7fd5fb55c35e3179cef924fd1334273 SHA512 29bf0aa6ae9cc8d66b0e1bf852534dda3a3e0e16c918be357cc8f6fec14f2d2537a94cafa1ca9cd06b64363a8f0f0d3c00dabcb5137699aced8d16af767f6ce8
@@ -558,14 +637,20 @@ DIST github.com%2Fonsi%2Fginkgo%2F@v%2Fv0.0.0-20170829012221-11459a886d9c.mod 30
 DIST github.com%2Fonsi%2Fginkgo%2F@v%2Fv1.10.1.mod 30 BLAKE2B 54980427295e87f99bc189c9ec00c2167e9aa771cd8777d61cec8127a3eb19f718843e2e736a6d4c08877d23528bc6da810da0c61a1dc07620422fb1b5434684 SHA512 1b8b7ce4a8f0092f0b2a2395fbcafa8cfd6830183bc36fdd58e740dc9ec4fc5201f5eec2daa6e2effeb59f9e1c0ce986ceef838d16876c9fbf0fffad4b7660ba
 DIST github.com%2Fonsi%2Fginkgo%2F@v%2Fv1.11.0.mod 30 BLAKE2B 54980427295e87f99bc189c9ec00c2167e9aa771cd8777d61cec8127a3eb19f718843e2e736a6d4c08877d23528bc6da810da0c61a1dc07620422fb1b5434684 SHA512 1b8b7ce4a8f0092f0b2a2395fbcafa8cfd6830183bc36fdd58e740dc9ec4fc5201f5eec2daa6e2effeb59f9e1c0ce986ceef838d16876c9fbf0fffad4b7660ba
 DIST github.com%2Fonsi%2Fginkgo%2F@v%2Fv1.11.0.zip 245650 BLAKE2B f917c3c8b6076add4a4cb59fcb1561b21785e9c7cd910c96f7decaeaf4f2c988566ef656925cf91842cb4218142d13f0487721c23dfd85bbdce1f847e12f1551 SHA512 bad04a31aa648777f437f3a7516549992962ef1c660694c02aee62508540c553a2ea36370b917d29a8e4510cc171d94590721c447e8878b562f55a7b0ca78f23
+DIST github.com%2Fonsi%2Fginkgo%2F@v%2Fv1.12.1.mod 166 BLAKE2B 8fad24303bf57553db631ffbce484b05ac3e7db117503b7ce555c55053a0550770ba6d7c6b831e3daea69a9733d98592e98f90b2e9f5b5f3020024b55c3d5cb2 SHA512 06e7e8754384929043159942b2d873ea872b974d9fae1971465592e44eeb26b072539de290adbd79402bad2a2c7fa38556a7597f5e8157e82d7576cad6b49692
+DIST github.com%2Fonsi%2Fginkgo%2F@v%2Fv1.14.0.mod 254 BLAKE2B 30062eca1c156d706683b2d2b88c70dee8e38da4d4bb8785c3894d7d496838f0628095fdbd020961bc619c8a653216f0efacbcceaf0909820f01d070fc1f9d9b SHA512 8a7b93a80585453b3795e1c536fa232511c6eb797125f3600ab8b1f613d9334559692425855a2ba95e329595bfdd38e8eb3588aad58aee8464f71aadc56f4fd9
+DIST github.com%2Fonsi%2Fginkgo%2F@v%2Fv1.14.0.zip 258725 BLAKE2B f40083a2965a442ea70d613f2fad5b4541cec4816b2ba6a28b92e6ac679d8e68a7f17a7c990b2db50583017668f355b1b242fd7019e26afc5160cd64dee96458 SHA512 42884272a9d723ca5d78c4fb5adfcba500eb4c6fc8fa22d11a2104fa36bbd4ce3c751b4a99f850c01efcacf3462fb855607bd26ece1f6182e1ddd68b29a734c4
 DIST github.com%2Fonsi%2Fginkgo%2F@v%2Fv1.6.0.mod 30 BLAKE2B 54980427295e87f99bc189c9ec00c2167e9aa771cd8777d61cec8127a3eb19f718843e2e736a6d4c08877d23528bc6da810da0c61a1dc07620422fb1b5434684 SHA512 1b8b7ce4a8f0092f0b2a2395fbcafa8cfd6830183bc36fdd58e740dc9ec4fc5201f5eec2daa6e2effeb59f9e1c0ce986ceef838d16876c9fbf0fffad4b7660ba
 DIST github.com%2Fonsi%2Fginkgo%2F@v%2Fv1.7.0.mod 30 BLAKE2B 54980427295e87f99bc189c9ec00c2167e9aa771cd8777d61cec8127a3eb19f718843e2e736a6d4c08877d23528bc6da810da0c61a1dc07620422fb1b5434684 SHA512 1b8b7ce4a8f0092f0b2a2395fbcafa8cfd6830183bc36fdd58e740dc9ec4fc5201f5eec2daa6e2effeb59f9e1c0ce986ceef838d16876c9fbf0fffad4b7660ba
 DIST github.com%2Fonsi%2Fginkgo%2F@v%2Fv1.7.0.zip 240603 BLAKE2B 7e8d8e71006ac015e66ccd29200ddd7a280029ef27516777a678bdd7f6b17e46d993e2f6e3e4e5b0d57e3ffa7e90622e199c3e60fbc49bf7338c64f009c0e57e SHA512 a7a5115d9cafa45cf44279dafc5e4e9a5922fea05e6e5cc3ca673130cc79fa711cb806d7c3994e81c37fe6c38c051c21939a5bfd83d7c9e6c7c5a6e25ee517c8
 DIST github.com%2Fonsi%2Fgomega%2F@v%2Fv0.0.0-20170829124025-dcabb60a477c.mod 30 BLAKE2B b8bfc20c2ecd93e4a49b1feb791a29d894d57325b04e5f36fde625431886515b2e1de0d11a384fb8138e28a131a027088c7173ffc7f8731f9f352ff521977ac0 SHA512 47de77b79abbc314a3e8c90f8d69f51fc9e99ff160a49cf6e87621183f7acdfa2dc5911877ec45111081426a4c0a6f0da55ce0491e95064a8bd416db33f25624
+DIST github.com%2Fonsi%2Fgomega%2F@v%2Fv1.10.1.mod 245 BLAKE2B 8ef01845f54a49336d1d911ec510a912ca5960eab195d6e193a4dd052d1e4158d2dc90a1c89749ab719e3d017decccb02a6af9e6d761016d871ea6498845f936 SHA512 2d89b68a9f4c3e3bf9d46d23d5b9f906d05a3c6ffdca50e83d2e07eb2f280707393828f8f12110cb64c28e96673b76fbc0235a6108d8ebe0064aa6fdf4d33f83
+DIST github.com%2Fonsi%2Fgomega%2F@v%2Fv1.10.1.zip 167538 BLAKE2B b6ab81d8dafa47bf212bd61697aadb4f969fe78b5c0022aafa855f864db4989e4a06ac2966e4cc27a6b595eca7f09c4a171a30f8c31787f9366e278e596fd3bb SHA512 028f09b7234ad1a7a2788c4d9741e140fd4ecfeb6a9650b941577c5605512336848c86a17b011ca2bb48ebd5d34e6164ef568da4e3ca92227d39cd489025d430
 DIST github.com%2Fonsi%2Fgomega%2F@v%2Fv1.4.2.mod 555 BLAKE2B b182f5a37e6169f7e40ea33bdda2790e7e1b01c1e61cc9d109ca6b8803ce9161cc0c2e2ee857ef5af582b1b9317c58734683ac3e8a8d11c620865b3b12c6baf6 SHA512 a7ef7e84c93e09b01b83de08580bec055f0164d3272a3e2571707d0b33f4b4616a379d440ab3835d455d8d573e357a6df1163fa8415684d5d55af8e22c68f7d8
 DIST github.com%2Fonsi%2Fgomega%2F@v%2Fv1.4.3.mod 555 BLAKE2B b182f5a37e6169f7e40ea33bdda2790e7e1b01c1e61cc9d109ca6b8803ce9161cc0c2e2ee857ef5af582b1b9317c58734683ac3e8a8d11c620865b3b12c6baf6 SHA512 a7ef7e84c93e09b01b83de08580bec055f0164d3272a3e2571707d0b33f4b4616a379d440ab3835d455d8d573e357a6df1163fa8415684d5d55af8e22c68f7d8
 DIST github.com%2Fonsi%2Fgomega%2F@v%2Fv1.4.3.zip 150535 BLAKE2B b9a2b9e5653d4e67b05242ea629d586206224c916e1a2a0e575d42645216e0b7d00da1288d75fadbd50cf49a65f5fcdb2ec98132710c1bb3b925356ac92a0ad0 SHA512 389a8ead0603ab417d1c471d773ab0ddb1668a7b952f990e7fcf26f9bdadf7937b8408a2976f74da10568a2726ab2ea15cd14ee4319f99c5c45b9ec4a1e5ee6e
 DIST github.com%2Fonsi%2Fgomega%2F@v%2Fv1.7.0.mod 555 BLAKE2B b182f5a37e6169f7e40ea33bdda2790e7e1b01c1e61cc9d109ca6b8803ce9161cc0c2e2ee857ef5af582b1b9317c58734683ac3e8a8d11c620865b3b12c6baf6 SHA512 a7ef7e84c93e09b01b83de08580bec055f0164d3272a3e2571707d0b33f4b4616a379d440ab3835d455d8d573e357a6df1163fa8415684d5d55af8e22c68f7d8
+DIST github.com%2Fonsi%2Fgomega%2F@v%2Fv1.7.1.mod 556 BLAKE2B 8e36edf565660234a9c939b93e99acfd61c30620cf45619158d5a87c102492333387de1bda35aa226695f913358a4385d1b8b768527d8a63d056ab8f13cdae61 SHA512 3c48b6f2cd9bc71efc218b11ae432776164936d4474df73510a785819c417fc894ca71f5783da77f323754ece56b681f8f1e9dacd5bf309f189997ba0b317dfb
 DIST github.com%2Fonsi%2Fgomega%2F@v%2Fv1.8.1.mod 613 BLAKE2B 5c582ba17d40173653cf739137d0bd6cb866c34fa1f76bf8f0b96c1d05304c5ea52247ef99d6d31d5c6f41bbebdf5ad9e0fb21e275b2cb888098e0ca3ac8f30e SHA512 1a7624cfc159a3444be19238a2aacd003e1b0c6f586d3f6862adec175578e0bf40fca303049a15ae3cd96a1c61395dfded8427f867e1aed4dcca180417fd80f5
 DIST github.com%2Fonsi%2Fgomega%2F@v%2Fv1.8.1.zip 158501 BLAKE2B 2abc3eda7c1e45ddd1bdfe3d4935b7aa39214a20364ca913deba33144fcc3797e594b47514be0b561ec6c1b65eca22e56ab9bf017b46ad0d514693e82ddfd806 SHA512 ac90da085fa75ccf739de3542f0a20e4fa737b266b5225e8abebb6ed47d26711550f4de9401ec82bb2f24d1d75c1268caadfa222dea75f444114f7957abe5308
 DIST github.com%2Fop%2Fgo-logging%2F@v%2Fv0.0.0-20160315200505-970db520ece7.mod 32 BLAKE2B 0037f79655226dae67faa11b27847001c422534de854283b8124640e72f9209ddda65f4fd601cd35399c0d6705b65131b94c8bf8dd8a15c2bdbaa0c4404b58fb SHA512 76f6ad85ef60c0972b9193af3395e586b8da352614049125ea6b39ebddaed94fe3b6a5deccb8a4d33890f292795d2c44a3563fc420106bf24589a1d838f35649
@@ -584,6 +669,8 @@ DIST github.com%2Fpierrec%2Flz4%2F@v%2Fv2.0.5+incompatible.mod 30 BLAKE2B 007bbb
 DIST github.com%2Fpkg%2Ferrors%2F@v%2Fv0.8.0.mod 29 BLAKE2B 7fb53b19bd1be0e783039647b42ecbe2070f51af102e473ec6d3544eea0ffa5863f1874ca1615348d5f8abbaa39c841b4fe18d43a8a615fa648cf22f35955e38 SHA512 0c156e21d35c45a89c1a1b69ff1976b4f7511b3870bf96126121f5a5effa3723eb45bf080e840d5c8b96898c65207dba83eb3e1a23668dd8a5e20ee6be775cc0
 DIST github.com%2Fpkg%2Ferrors%2F@v%2Fv0.8.1.mod 29 BLAKE2B 7fb53b19bd1be0e783039647b42ecbe2070f51af102e473ec6d3544eea0ffa5863f1874ca1615348d5f8abbaa39c841b4fe18d43a8a615fa648cf22f35955e38 SHA512 0c156e21d35c45a89c1a1b69ff1976b4f7511b3870bf96126121f5a5effa3723eb45bf080e840d5c8b96898c65207dba83eb3e1a23668dd8a5e20ee6be775cc0
 DIST github.com%2Fpkg%2Ferrors%2F@v%2Fv0.8.1.zip 14339 BLAKE2B 9332d9cac7dd3aa2f4d756f0d92c911cd0fb8e00232db3bb013a0ef12addae0aea2388ce3adf79407a81e13cfe9cd4b45aeb2bc9f8b84b4e3c5dfa63b59d46a1 SHA512 f97471d54c5e73b3f59326847cdd4dbbb142a9ae790df83493f11a851d716fb407e01a857152812caf731b8f3e0f37ae151ee83300feaa73152173f6cb5b8515
+DIST github.com%2Fpkg%2Ferrors%2F@v%2Fv0.9.1.mod 29 BLAKE2B 7fb53b19bd1be0e783039647b42ecbe2070f51af102e473ec6d3544eea0ffa5863f1874ca1615348d5f8abbaa39c841b4fe18d43a8a615fa648cf22f35955e38 SHA512 0c156e21d35c45a89c1a1b69ff1976b4f7511b3870bf96126121f5a5effa3723eb45bf080e840d5c8b96898c65207dba83eb3e1a23668dd8a5e20ee6be775cc0
+DIST github.com%2Fpkg%2Ferrors%2F@v%2Fv0.9.1.zip 17866 BLAKE2B bb8d50b9e736f5f1e129482bd50f720b7dbe80935fcb6cfbec6d5a5f5ba5d5434476d66a362f12bedc304e89c9886d4868d310710aa100c357900a742d4ee341 SHA512 82b0ed1ceadd44a2871b56e733a118003b1bae9e38fe95251e0aa06a0a4c9b4940c485336fa11335974e0df536dcd0491ec1b2e545ecdddc7f9ce59771f86321
 DIST github.com%2Fpmezard%2Fgo-difflib%2F@v%2Fv1.0.0.mod 37 BLAKE2B 94636062c94f8ff68cdcab7593a3acae7b9ffff616cad7b1d5c9cd147a4a1042d33666cbeed6fd816d6793113abfb595183097dcc46de7a3dfadc1423ed43e79 SHA512 c3d5c48cdb8ba6af7071a07cfede06e0ab67e3726d9de592a952fad40167dcbdd9621dc2c4df1bd3c28eb99d70b1b6d8d812441237c35bf492e5b7f07bd33902
 DIST github.com%2Fpmezard%2Fgo-difflib%2F@v%2Fv1.0.0.zip 12433 BLAKE2B 0c911c9d173080abd8edbbab1f47222343801d8eeae36b4add24773e3282fc2a39283fdf519a3d4483e39cdb7d9509b8570d151f46841ac1a616f312dc4cb0ba SHA512 3b85697185ba85cdef6202444ab6cabeabfad8a03d66b3839a852586b1f91ddae7897a57c8c138d5647022aa44906c7ef3c5339d520f90eeea0742a935da8cf2
 DIST github.com%2Fpquerna%2Fotp%2F@v%2Fv1.0.0.mod 30 BLAKE2B f2951f62c06f2c9c5c0042f82861f021166c353c644d0f0d8d0ea0664ff218ef315357558e901ee488c5d0eba2690649ac89cc6178eec6e6aa60a503ed4e9d0a SHA512 e5702cc3a1b0d84fbfdd11005a5f1735a378d709c2f60a737b32b81bd2498206cef3b3ce693b2bfde9ad11de8c6bf734527d2c8874348a97a724441325baa42b
@@ -595,13 +682,19 @@ DIST github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv0.9.4.mod 482 BLAKE2B 402a6
 DIST github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv1.0.0.mod 535 BLAKE2B a8d3fb22b519e88dcb6b6f305a80c94e8b40fba8bdc96941230b354cc6bd8ec4bfd121b8e5ee57e9883e0b01b6224ff22a55fa8434bee1623133cf59489e64d0 SHA512 1d3646f93821b2ff1a4d80074f773eca22ff3675caca9d267762a31c1ec719ab464ba7ade7c8e2aa79b16a4f35f5a64f779fd909060a0c3056f09af77cebd655
 DIST github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv1.1.0.mod 357 BLAKE2B ade628b5e576aac499156117606ac8b2458a5b481ee77be1df4b551133a3957dbce70e8674431420c181a67dfcf886d754b927ea06d588cc3df4e10a0ab8fbc5 SHA512 7bdbda1cfee6852064c8d4b15f1037a5153bfc66b59b3555416518a225b70c1db1daca32c0a7058e90d2b0f55da3d9cbb2f5b119107b5d96a874034158a69958
 DIST github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv1.3.0.mod 375 BLAKE2B fdacadbb6c23350ffa04e625324420df9b523d9fe5bccd8bd1d8f6d592d7ef5a2b4620c1d16c78bbbbbba2716f3edd015cc16ae5b0c3c31e5959ed12143ff3b2 SHA512 e98ebe9ff7f5f5c893ce7a54c12b3d5b86ae1f99a5117875bfb78aa2b59d9e9a95bd54e45e1a16e8bdfa79f38192626f49366a0ea4e36a25681e7448b544b144
+DIST github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv1.7.1.mod 569 BLAKE2B 0c975c1c48f40792b02fd8756be3b6bc044ca05725ae179445a858baed4861011ba76051aa25fb10be23c6cf14738cb9cab928418be49d8ad85211d398089ec8 SHA512 6fe81bf3c591058f2ff968b3c6656766d9d3fd74c8577b3e7cfac17e463392eed3268248237d252c98751b2f97bc7c48a8db15bfc3fbcd4afbbaca0e2970819b
+DIST github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv1.7.1.zip 226158 BLAKE2B 899457f410f559d70cac7131e9c6057bfd749964b8b133943635b0ee78a12485d933718569d085f51dd34f831114c2f74986818536cf21ad642dac793b00390a SHA512 5c4d5e70be8984c9eea4211e06e1f9478fea4ee4cc227167b9a99d87fa773e060e42aa4866eaed39e58a251821840643d5117b12006a6809902daa08cca14b2b
 DIST github.com%2Fprometheus%2Fclient_model%2F@v%2Fv0.0.0-20180712105110-5c3871d89910.mod 42 BLAKE2B 5519896b44b7bc3089a8965dc61aae63745c64ba1a390d3fff1202be7f8dd34f59862c04b49e377d6616a93a0341662becce65d431d445703a160ba49eda208b SHA512 c84dfe43954b19c1e4ac5ff8738e79db469f3bc1dc55e69b12503d0a5cf125cc74f4797ddbfe64b2a1bd1e2940575c32678671d51f67161c4f5b53b2a85ac46a
 DIST github.com%2Fprometheus%2Fclient_model%2F@v%2Fv0.0.0-20190115171406-56726106282f.mod 42 BLAKE2B 5519896b44b7bc3089a8965dc61aae63745c64ba1a390d3fff1202be7f8dd34f59862c04b49e377d6616a93a0341662becce65d431d445703a160ba49eda208b SHA512 c84dfe43954b19c1e4ac5ff8738e79db469f3bc1dc55e69b12503d0a5cf125cc74f4797ddbfe64b2a1bd1e2940575c32678671d51f67161c4f5b53b2a85ac46a
 DIST github.com%2Fprometheus%2Fclient_model%2F@v%2Fv0.0.0-20190129233127-fd36f4220a90.mod 164 BLAKE2B ed42e8dec25021e488793be8e008c34ab5bdd6b5b884762d69f40d6c8968bb539041920ac7108e685ae56f2ef71b7174245772d96cc8f20463eba71580afae29 SHA512 4e0e6941b43c17cdce0205e9ba3d9fb18937f426ea2ac9a9e53396c906101d6ec2eb501cd8a791ee3ba9a32185f86495e9189134b8a9858134c73238d98ce0f6
 DIST github.com%2Fprometheus%2Fclient_model%2F@v%2Fv0.0.0-20190812154241-14fe0d1b01d4.mod 164 BLAKE2B ed42e8dec25021e488793be8e008c34ab5bdd6b5b884762d69f40d6c8968bb539041920ac7108e685ae56f2ef71b7174245772d96cc8f20463eba71580afae29 SHA512 4e0e6941b43c17cdce0205e9ba3d9fb18937f426ea2ac9a9e53396c906101d6ec2eb501cd8a791ee3ba9a32185f86495e9189134b8a9858134c73238d98ce0f6
 DIST github.com%2Fprometheus%2Fclient_model%2F@v%2Fv0.1.0.mod 164 BLAKE2B ed42e8dec25021e488793be8e008c34ab5bdd6b5b884762d69f40d6c8968bb539041920ac7108e685ae56f2ef71b7174245772d96cc8f20463eba71580afae29 SHA512 4e0e6941b43c17cdce0205e9ba3d9fb18937f426ea2ac9a9e53396c906101d6ec2eb501cd8a791ee3ba9a32185f86495e9189134b8a9858134c73238d98ce0f6
+DIST github.com%2Fprometheus%2Fclient_model%2F@v%2Fv0.2.0.mod 164 BLAKE2B ed42e8dec25021e488793be8e008c34ab5bdd6b5b884762d69f40d6c8968bb539041920ac7108e685ae56f2ef71b7174245772d96cc8f20463eba71580afae29 SHA512 4e0e6941b43c17cdce0205e9ba3d9fb18937f426ea2ac9a9e53396c906101d6ec2eb501cd8a791ee3ba9a32185f86495e9189134b8a9858134c73238d98ce0f6
+DIST github.com%2Fprometheus%2Fclient_model%2F@v%2Fv0.2.0.zip 13785 BLAKE2B 2cd44410ea7af88683792807b0f2c31b0943d8664a4be050f2e422095ef3674e6d42f4b9b6a76083e13bc9f44be1578cb06a7389b4a4b201b5a88e756b40193c SHA512 db2396362357b6d5e99b21bd4aa8d8dc193dd2676a8f437c62eafae849a56a53875bce7411d58ad78e4fe36445b72ee1a34360b174a23ca84de911f5df189354
 DIST github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.0.0-20180801064454-c7de2306084e.mod 36 BLAKE2B 39120b6af83d45857c990115ff52d8828278a9ce158b01621d8dcc517c23ff139532a2c2e53ec97616f0c65a2e0db3ede7c5fe59eb33be277e2c60650362b232 SHA512 1b262da0100655c3a56c0e551866491b81d2b88fd5fed9cc43a57bce3634c88c82c798ed1a823237011f6be68b5f0e1fe8284526cd68204851de30a44fc34fbf
 DIST github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.0.0-20181113130724-41aa239b4cce.mod 36 BLAKE2B 39120b6af83d45857c990115ff52d8828278a9ce158b01621d8dcc517c23ff139532a2c2e53ec97616f0c65a2e0db3ede7c5fe59eb33be277e2c60650362b232 SHA512 1b262da0100655c3a56c0e551866491b81d2b88fd5fed9cc43a57bce3634c88c82c798ed1a823237011f6be68b5f0e1fe8284526cd68204851de30a44fc34fbf
+DIST github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.10.0.mod 817 BLAKE2B b4cabfb93633359c6ac6dcd400484e6162bc6b609bf0edfc4a82a2cc0137edef114d0d3e9c55bc47d1abd906d9ac00f9d84f07ee7072452c570ba9f98118f4b2 SHA512 7e1b17c424c8ec889d0efb0f5a171043ac0fffb48725144836d8ac635c036e877e65f34f75055359747142051afd00374cec9e39911175adddca2c50fde4c893
+DIST github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.10.0.zip 163523 BLAKE2B 6d31ee2f8495605c967a41b12da3e854dadf4666641fa8a324f9926d1e965cb2693e390065f34892876c2eae5c1909b5bae8c11e484dd948b7c80983c8adb551 SHA512 74273a10b05fc2e0ea263ba57a52783c147e1f0ee6a1156879c387d0823f90d2c0072b5eea4325116fa621de0af1d5c2ba19e5dc188315c60ecdf74ff8ddcc99
 DIST github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.2.0.mod 1223 BLAKE2B 969e069f2e210c2863b54504d62dec9ca606c485612ab1c42249e623a4bbde4e4ad0b41da30f83594b7efb4d4a44e0a68a5faa8c115263d73738773c35a98dab SHA512 02db8fa79cd8368060c72ba3925624c779bcc9e39817b6ed86ba143024959496db2c23c1aefe93a5d9f22b48e742072382e2ccaab430c1c9eae6254184e2358f
 DIST github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.4.0.mod 1223 BLAKE2B 969e069f2e210c2863b54504d62dec9ca606c485612ab1c42249e623a4bbde4e4ad0b41da30f83594b7efb4d4a44e0a68a5faa8c115263d73738773c35a98dab SHA512 02db8fa79cd8368060c72ba3925624c779bcc9e39817b6ed86ba143024959496db2c23c1aefe93a5d9f22b48e742072382e2ccaab430c1c9eae6254184e2358f
 DIST github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.4.1.mod 1223 BLAKE2B 969e069f2e210c2863b54504d62dec9ca606c485612ab1c42249e623a4bbde4e4ad0b41da30f83594b7efb4d4a44e0a68a5faa8c115263d73738773c35a98dab SHA512 02db8fa79cd8368060c72ba3925624c779bcc9e39817b6ed86ba143024959496db2c23c1aefe93a5d9f22b48e742072382e2ccaab430c1c9eae6254184e2358f
@@ -614,6 +707,8 @@ DIST github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.0-20190507164030-5867b95ac084.
 DIST github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.2.mod 98 BLAKE2B 23576c142554e5a22a11d704cbff1bbaf1029518ceec7f04e22aa849763a7aa5e26ad1405a8cbc0d87097264a5fa7cfa3d655cad18148f5de6209a06580722d3 SHA512 0897ba1b7b4a32f206763327e138d3b460194097d19bedb8ee1bb6889b9d188afae9439178d1c2151fbe17b7d18545cd6cfebd050bade93cd39b435b35b6acdb
 DIST github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.3.mod 136 BLAKE2B 49b2b47ca2cb64a1522a3719c1b46dc6f44d3122d3a05ea475dab88e89336aae3f396082f4de0f89400a0e8db85208446582a226238a701fb92c155a2e85fef8 SHA512 fbbbd57eff765585e67074e5c278d7d3077289c3d13c306147d6c3efb98232ff317ad92464ba768fc3d921b4a09cb3f3ff5c5480c89a01ec821bc86e5dca82f1
 DIST github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.8.mod 145 BLAKE2B 8c6ed8a28b2f2fa7e97cfcb545ff7604eeb5802bf301ecfd574c1bd5bbd59172479a55c9f42f42a13a85daeb77e730dcf5cdb78aa9b7c499f3ded0584163d75b SHA512 0d285b677b209f7973ddf036b2f2463aacd060e58db9a0721e85d40d513f8befe3605677dca1040fe9dce006e3d5d3246d876224f05c45757505696122a3153c
+DIST github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.1.3.mod 198 BLAKE2B 9b5c175c915db6a1fdf18f440acf348e395fd2059e1f44fb1fd556e7c2c6821cfa397f88d2123f681b41fe5c5689ebc58c7c75865ef63f7f1c61fd8d323d8117 SHA512 7a54bddb87350ba24423842fcf1cd8b031be427e9f689467503d8d6a876691b209a5d2ac33d848a977d2c3890284d816fe4f2fa9391642010c96c3c0d691efcb
+DIST github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.1.3.zip 262428 BLAKE2B 6334337329e564dfddb576464864b53d4da3cd7c0988cb6b0eeefd3ea9141f36429f09c1f75d11560dc12e23751fe5c52a4c7d46cec0ed3454fd3684562bad72 SHA512 8dc2a0f05fea67aa9a64d2e91807cd9fc111be3ad4fcde2b8f53757ed38a478467f5edf68f990d124e1019cdcfef133cbd0278600df8abdc1c0971808d729956
 DIST github.com%2Fprometheus%2Ftsdb%2F@v%2Fv0.7.1.mod 1346 BLAKE2B a46e52b7acf7ff0783cc3c18a1320f66e02ab9c6879434dccc9fe182b4c7fe4594a0be504c45ee5958e1a42c781870ae754648f5bb5ef4cd45c42d78ba189ca7 SHA512 7463ee6ed6735cf101502b6c0128c75960c55d6f9e42f37531e65afc02fb35b62d882a72f95c2fd76f3d0e253e9e70a9a2df2ddf782f53c4138135b370b69d0a
 DIST github.com%2Fquasilyte%2Fgo-consistent%2F@v%2Fv0.0.0-20190521200055-c6f3937de18c.mod 380 BLAKE2B d5e50ceb9388a268523bd969c58c4dcbb657248897a652fb1714f180bc5c6c84fded29702d68215f7984e4e100840c415985becd9856f6e1c4f3cf1d2be969be SHA512 a3bcbb78ac52866b5bb8ba27c58b93469ffde745ebabf78c91b06d33e9bfa4641d91afb189c75c10a66f10b8d080822fb8960719d588a1f4ed54650b3b97fa19
 DIST github.com%2Frainycape%2Fmemcache%2F@v%2Fv0.0.0-20150622160815-1031fa0ce2f2.mod 37 BLAKE2B 6f9f7bfabf21aade2c491a8aa4a57318e26aa0f5491fb449dad34390e4f3452b30ae634ed280b39a3acf66b647489ab3fd8e7c22176bc87e205b8538718e640a SHA512 08598c1c037738f47a8dc83f324d4adb81fff38c0e2f23ee7160d2452f965205a9995eb42ed4f503fc4eb67d3a9e483d30a2c00de50e274e0ea0b0b81e8ecc31
@@ -625,6 +720,7 @@ DIST github.com%2Frogpeppe%2Fgo-internal%2F@v%2Fv1.3.0.mod 73 BLAKE2B 21e3545a45
 DIST github.com%2Frogpeppe%2Fgo-internal%2F@v%2Fv1.3.2.mod 82 BLAKE2B 3b7ef0a383ee9e7e64ba74f92d717687cacdcb0e7a57f76872cfbe77ec1c526ab97a8695a2819cf986c51a4561794391e5d532cc591f6ddc2141b5559d3cec9c SHA512 d08f8ca2d93c0d97d5947ed3d221fff67e774e810d7fc9c93bd25bdc446190fc5590776a3e6b159fde2b97c3355921235fb6c8b8623b7f2090102a7f1ca1a6bc
 DIST github.com%2Frs%2Fcors%2F@v%2Fv1.6.0.mod 26 BLAKE2B 8b06c3629b4e4371ae833fd22ee446fb963e300c42e4a92fb215f10500a826df54285a3d9718546fceef0e47f949034d0de0bf8aa9ca49150cd2d58e8272b1e0 SHA512 306c53774adbaefecb2283f1d90c11b088d9a45a29215ea7c627ec6d97027192bf5fe99a3cb473415ab47764802859ce9878e83ef38fdc4a87b4c7b0c5226a71
 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%2F@v%2Fv1.5.2.mod 39 BLAKE2B 6d577028361a97eeb7070517fb59bc801499e5b93cb97da563e41b91ab1443583510a259283bd01777ebd435934f27212c15ed32cb5422d6d711697a7c714579 SHA512 d9e6796c9e0a1b870a32c313e22555a090e85919007d50ed4dcbcd3ccbfb90a3ab98e9f3e2d41bd32196e3d5fd57c62e6d47aa65e79efd3d05b7d73ae9bfda7a
 DIST github.com%2Frussross%2Fblackfriday%2F@v%2Fv1.5.2.zip 105716 BLAKE2B d8a15d43cda9d636577a114fa0cbe0c570146402a5e0bfe94bb4b49f1b5d42dc6f30d9f29682721c28c63d261f9bc6fcdd6094bbedd81ace7bd2ef657ed97405 SHA512 7cc5f41055137124a3d330e3686860b3294c668b514fe19b21edd6f571ee4f3d895dacad4ef6e333aabd3a872f2bb3ba50ffbf19636d7f1bb462d97026713322
 DIST github.com%2Frussross%2Fblackfriday%2Fv2%2F@v%2Fv2.0.1.mod 42 BLAKE2B 23dbba19737db7327590adaf3988abb9b5548cb3f959a9746a3b745c51f3c1397f071f2573a413a088f58e32959a2210c2b5354c47c263e90ad2ff1506872a5d SHA512 ac376a387fa39fe35dc4d073d8becd74e79f52e9d36b0a6628740dfe0e7c1f4fb6533fc262212663b105afcaa104082e055fa87d20cb3068359faae6dcba7738
@@ -676,16 +772,32 @@ DIST github.com%2Fskratchdot%2Fopen-golang%2F@v%2Fv0.0.0-20160302144031-75fb7ed4
 DIST github.com%2Fsmallstep%2Fassert%2F@v%2Fv0.0.0-20180720014142-de77670473b5.mod 35 BLAKE2B f411f099e83b64b58d94a4c7f7c73b5a9f6279c4c409c9d68029b58311f724de5f7826be0933bbcbcff2867da51cee0588fef9d2676195fd97de7154b852e413 SHA512 087930a63f8a2a49aee59fb30981c2bdb5701022d8f1d93f8b9611294e56825bd3dd7e8b72ab9be58c631edb05c4b4346bf65586fd6c935a8ea88a13bfca3b8d
 DIST github.com%2Fsmallstep%2Fassert%2F@v%2Fv0.0.0-20200103212524-b99dc1097b15.mod 44 BLAKE2B 318ba94a41e57bf13e65f55f5df649f48e027344ccc1edac32751cf9a274d5d6099089efd08ad4d15455d30d06a361e304d69b85d2de6ca1d325ad696ab29287 SHA512 6dd3d69b75b037bdd24be06b2027bb1b36d1a76f86eca0f2a5fbf07855ec9e0fe85a206e01305ee7ff35909c85b8a142294568ea300e978168e9b0f0155d018c
 DIST github.com%2Fsmallstep%2Fassert%2F@v%2Fv0.0.0-20200103212524-b99dc1097b15.zip 5270 BLAKE2B b13f2a70af821fdaaa631fc3c6f2cba471ced1db94a72fa042f1fee5618ac073a124daffe93dd1202c074014155448ae121c1c1698400e1a4e08ff89dca8ad52 SHA512 1f9e710327d845ef3e2718f64280fabb5be32bd4e78b615ddf7b62f382152adc1919a900b59b1b46429bae88bac1056d3fdcc1240ff9fca808ad786418d51037
+DIST github.com%2Fsmallstep%2Fassert%2F@v%2Fv0.0.0-20200723003110-82e2b9b3b262.mod 44 BLAKE2B 318ba94a41e57bf13e65f55f5df649f48e027344ccc1edac32751cf9a274d5d6099089efd08ad4d15455d30d06a361e304d69b85d2de6ca1d325ad696ab29287 SHA512 6dd3d69b75b037bdd24be06b2027bb1b36d1a76f86eca0f2a5fbf07855ec9e0fe85a206e01305ee7ff35909c85b8a142294568ea300e978168e9b0f0155d018c
+DIST github.com%2Fsmallstep%2Fassert%2F@v%2Fv0.0.0-20200723003110-82e2b9b3b262.zip 5313 BLAKE2B 92631d866313aa64d5eeb55ddd13bf136aaf4babdc245815b2b86b6f81250ff3a99da5269c80821888cb1b7615cb2f4cd217afc792c2b5ed1731b9030d7c2431 SHA512 fcf43f9eeddaf018cf05691793281bbe26122a880fef6bc852a310de66d6aee91d6526082d09ea25299406f7b63b77ef308754ae8f6f465421da0a4e0cdca9ac
 DIST github.com%2Fsmallstep%2Fcertificates%2F@v%2Fv0.14.2.mod 960 BLAKE2B 7dd4ba9ff690702899043af074571f1224091bd7f5b667354054e4a4c0a2356c2e4b43128fe2a529d09a6826da4d6f54e14ee021820b71ce074105ff80aae292 SHA512 0a84088b66373c9ece468b0d05406435751097321e44adea3b3f2659eae300f4f8e164ccbe3166f6a7efe24b1e1fddde8ed2a53e67ef0609c50434c589f704ab
 DIST github.com%2Fsmallstep%2Fcertificates%2F@v%2Fv0.14.2.zip 17715154 BLAKE2B 08250c8eeb175a974e2af029239bab2c0554baf74a67819ddae5e42ecf3962718902157cf17be3887378334cc0a425e24d33d6907b2ac58bf8938f180a4158a7 SHA512 ee2824d5a1164a3ababdd2fbceacf41da45b4a5ebdeb6fae5ea9f940e5040233d4249a81585bef35a5cc73d65a987c47df81b6935043292fbe861cd3ef1bd119
+DIST github.com%2Fsmallstep%2Fcertificates%2F@v%2Fv0.15.0.mod 1009 BLAKE2B 017ee0863745d4703a6ac10dbc6886584613de8ff6823f41797dfffd0452bd03b0748e17c9627fb300ef51578778d142da4f6229c9aac0636a6231828433134f SHA512 1f54f87ac12cb0386e03f89cca8e36b95bac0ecac8b1ca96b6bf25c9abc5e527d3f2d5c2090a9d04e6bc3c5a0f10530256a065775f8b04904fd789c537f6bf08
+DIST github.com%2Fsmallstep%2Fcertificates%2F@v%2Fv0.15.1.mod 1104 BLAKE2B 494b13c45efa3d6558528a5e0d2b3bed6c560483eca5a8e4b16e72bc479dce9f1508b1004e1587bc3f9c7118eaf67321c0c834ec650f533db943b6636110f42d SHA512 989809e75686d6371a8e9129d708681d02b515df15f41c5224dbbdfeefc97dbb9b7400746aec26c6a97ae8222a3c4279d609aa205721733630f9f8cbe4a3818f
+DIST github.com%2Fsmallstep%2Fcertificates%2F@v%2Fv0.15.1.zip 17771467 BLAKE2B 38599b009219095a95439c8ddc87dafc9234c925e8debe1ac1d2f7013859df008eb399d78b49dc1fbd39a7069a4f010b1276173dfed6d3974dbf7aa0dc1eb357 SHA512 de332bd1bb6a15f608dbaa54f75688b1c97d72c179608a8616916fd81f09fbdac4c7cd5dc0193baa4a0b06a169b4eca02c55bafe78787fdc604a0f29c3b51d06
+DIST github.com%2Fsmallstep%2Fcertificates%2F@v%2Fv0.15.4.mod 1148 BLAKE2B 809c2fc150780b877d5311804f63134ad1ba386eaba4d4be3429d21f81ff48a27f1964fbb2be453686dcf3cd808b952f5a123d590f385cc640ab0bad3ff7a264 SHA512 7970bda13817620719765ab8dabb14812abef407664509e6d418e82beb8f8749e37d048a100d2a34ec810ec24631e133acb0526a7da655dbe451c99a15fea7cd
+DIST github.com%2Fsmallstep%2Fcertificates%2F@v%2Fv0.15.4.zip 17777279 BLAKE2B c9278479f2518e63afd73231661c11d1da4dea18193c0c84d9d909ec8cffce16e1ffce0c8b65f16d7a374cd9f406c81e076e63765a32c73962d932a26dc49cc5 SHA512 d65385ae9233dd8f16d3c61c463a24613fe68a61bbc064118a2fe09b45e0c30942037a3cfb7cbaafec496f529cb13d8c1b2b42700db913c0c006cc34326f1da3
 DIST github.com%2Fsmallstep%2Fcertinfo%2F@v%2Fv1.2.0.mod 2453 BLAKE2B 9e59305f109b7db54dbdf367906843f8a863889f010542be11f2b0d8eb43d23e9a6856fd9ded68484efd8d7b7cb496f3c074d327832c068616d7cd531b3fdc47 SHA512 e5908f5ac6cb39b8d5a8843f8c6cf0c286d0861f1d0e12d982ce8e440d2b523507eab2b480bfc08d0f9018b3e2729ed2db93e7bec5ac076ef58392e5b7d03030
+DIST github.com%2Fsmallstep%2Fcertinfo%2F@v%2Fv1.3.0.mod 2453 BLAKE2B 9e59305f109b7db54dbdf367906843f8a863889f010542be11f2b0d8eb43d23e9a6856fd9ded68484efd8d7b7cb496f3c074d327832c068616d7cd531b3fdc47 SHA512 e5908f5ac6cb39b8d5a8843f8c6cf0c286d0861f1d0e12d982ce8e440d2b523507eab2b480bfc08d0f9018b3e2729ed2db93e7bec5ac076ef58392e5b7d03030
 DIST github.com%2Fsmallstep%2Fcli%2F@v%2Fv0.14.2.mod 1587 BLAKE2B d053dcb2e21810e9703be70cf9226c1c57ec7c889daecfba6b0b102f34aeebc5b83dc3a037f1f31c2d0db8b0144120fc0441ec35f0e0107f0a77a07a24efb71a SHA512 0c5337caf7f1b230ef2e057d10ac4ef24a2583dad52a2da49eac3f37107da07f25c457789a94aa19528e1de225774df732cb6639726b2e2c5a344103b74622ce
 DIST github.com%2Fsmallstep%2Fcli%2F@v%2Fv0.14.2.zip 651430 BLAKE2B ac405a2cf355e640f128a766244b8e6843a3e70cd179b95ebd36d64d218a240d2efa9c7fff642e1e30a52631265f13d454ef4a177bc0132aed9ab6670438a6ad SHA512 5fc1840beb07290b5d0f02e4f3fb2dfcd3b0b4c6fc41fb0ab2266b694c73af4bf5a20c6d1e26e715a17382e240b87b494dab9727efa2c380261b5fbec20b5256
+DIST github.com%2Fsmallstep%2Fcli%2F@v%2Fv0.15.0.mod 1291 BLAKE2B 23937424336c1ca742b08acd736679929f1a7e392ab92dabdae65279001c6a32897be0682a3b41fa09edc585cb738ec89d165df621fb924766fea2d47f2d8188 SHA512 738cc8888ce23e5a0b4dea9fd6a99e5d41857d1eba8577ec4d3828362360c215b5bc326a4fe9c4b8aeb817c18075b69cc21f8ffa4c030d1f1c992f043512376c
+DIST github.com%2Fsmallstep%2Fcli%2F@v%2Fv0.15.0.zip 690825 BLAKE2B 85ac11ae8018a253f0fc37ab5ca975f23629765c1acf9d7b5a5996529949a8e7d75ffb40ec158a58231c3692e9653e255059ad7364c85bd7f59cb393105f72f2 SHA512 dc0022e2c2a8dbb80fb624c4b554135e7376b2346ebdc7ab17e209c948e2671b031c49fe451e41fc160af739bbbc3ea6e933c3c0e1a96b470015721fb936c5fd
+DIST github.com%2Fsmallstep%2Fcli%2F@v%2Fv0.15.2.mod 1467 BLAKE2B 93d8bbba7926fd23bca5961c60a9337abb9539089832be1f334bd3837949803fa4e65f373379561e66123027ac63c0245f01fcf1de907e25ccbb6261ce3250b6 SHA512 0d8d92f415eeb36e03374dc05a06b0d1df8f8994cc5f7bd44b235bb6ae60236765ea32a3cc177d99de64664587f17bd65d9bfeae3f2b39799df591f85b55c237
+DIST github.com%2Fsmallstep%2Fcli%2F@v%2Fv0.15.2.zip 690579 BLAKE2B 63bdb0d4a624fa0de39b8f756132c0845868b552ca09b6b22976c9b91883336b7274205d6f60f8605b8cf7fec869732dbdf1655d6a4f2e10d390cb344b48cb94 SHA512 d16c452e7beb56afebc949fd1d92dfb4ec36ce6eaa37e3c49d5b523cf4e4f314cbd6c771617d7f212b90f0cbadc5a944a47a20e53df91a7b06d87df3c05a03c5
 DIST github.com%2Fsmallstep%2Fnosql%2F@v%2Fv0.2.0.mod 678 BLAKE2B 74ccc942161cf87fdcf8a7796bdbace444c914e758e9d297e7b72ccb57c0ad7e64dce3cccd711eca9c5af5932dc571318207b42841b41f078b97d65240b9e196 SHA512 c4c415d250ad4db0a0c39a7629e88b905dd89e3da8e08fb7f8814555e955e72841f99434fd77b614a3dc3de5520f2e2a797b83c6aab1a61a01d013cb5f5efe48
 DIST github.com%2Fsmallstep%2Fnosql%2F@v%2Fv0.2.0.zip 23652 BLAKE2B 776297d2f20b974ada5440951017d8b4fe17f01bc3605e5c654a2c156684509a5e490c5875e41b9b8f3fac9eb63dd43ab9649c3ffa7768bbc1b7d36b848206f6 SHA512 97f22dd85e23d7b0ee70f000568bd97ea89b6196eb44a2985ea2b5a88a598f93a8c7e3efd08a66d402b4c63b179d041e19aea40c74ae1a99d699e7b1ed4bdf6e
+DIST github.com%2Fsmallstep%2Fnosql%2F@v%2Fv0.3.0.mod 621 BLAKE2B 371577909b06bc1738e167ef0547ae6b15a2fe403272d3c5512b0134bcc1cd74e128e69cf68e0bda874b1ccd91681deb272b26e40817112b686555d37b7aeff4 SHA512 72a8edae7356080f5aeec0d0d7e3fb43cc7159e3058f27e5794a803cb3bbc6880c7faefafa7cc377db054910613ee616406ade952f44f2cbf8dca55669ce1ae9
+DIST github.com%2Fsmallstep%2Fnosql%2F@v%2Fv0.3.0.zip 31106 BLAKE2B d79e85c0cb023aa7ac63502baa090789ab52556313bd0786ce4fc6c6947d610a359ac8c9874053bfa8a341c1a9f8583fd3feac499eac725a661528dcf870a0e0 SHA512 5d1b0978c291290752413e3ba769e9deb1d52659f001cc741cd44fb6d1948668d26d478282e798ad22a74a980ebbcc6b88cc3aea5ccc11ced4220e119011673b
 DIST github.com%2Fsmallstep%2Ftruststore%2F@v%2Fv0.9.3.mod 39 BLAKE2B f9e77d71073eff0bad67ed0f5c03b1306cd76da54ef047a189e731bb3f06a14158d5cd6ee49d656752dfd904860e677d5a1f0a71696f280174fec6b58cae7fff SHA512 3ed6ee82f2913d430d2d0e66b6a5ed673657bf52a7871d64a4fc983942942ee8855c8d607a64b9c01d8190cdafee60564b2072476146844b8fb049453b0cb308
 DIST github.com%2Fsmallstep%2Ftruststore%2F@v%2Fv0.9.5.mod 109 BLAKE2B 05b481d29acb899b5917e051d5722d977a55611a52966eaefb736cb35bec7d696d2b192ce70fe42e3fa30cf6c07e741df7ce8923aee487f621a180cd9c05e3d8 SHA512 e01ff6eb4532c388e4f5102baef56cc47911c8ca6963543106117780716283fc96e644ec3a462d604e75965e59759e7af1c7b060cb4a2b168c011391215fdeb4
 DIST github.com%2Fsmallstep%2Ftruststore%2F@v%2Fv0.9.5.zip 17929 BLAKE2B 062ce2c31ccd7a0abce26bd0d31e883039771193a5b727998929274cfa9f9e47de3897f9b4cb653a4712112fd048fa4d77521a1fecac0c562463301a003f060e SHA512 85769d6d1afa3098313f634cb29087b9f719ab7ff433bd81764fb9aff65607b742025475b33d0bb0574afd9e15af506612e2bd94004bacbf981d07b17a2de17c
+DIST github.com%2Fsmallstep%2Ftruststore%2F@v%2Fv0.9.6.mod 109 BLAKE2B 05b481d29acb899b5917e051d5722d977a55611a52966eaefb736cb35bec7d696d2b192ce70fe42e3fa30cf6c07e741df7ce8923aee487f621a180cd9c05e3d8 SHA512 e01ff6eb4532c388e4f5102baef56cc47911c8ca6963543106117780716283fc96e644ec3a462d604e75965e59759e7af1c7b060cb4a2b168c011391215fdeb4
+DIST github.com%2Fsmallstep%2Ftruststore%2F@v%2Fv0.9.6.zip 17928 BLAKE2B a516fbbe6257b55e039560564094c447a3bd50d352a6c795b7a67cea474acef4e696bcabd00d1e64bec2356cfc37f9aa77f7f08934e035190f545f15c28ec20f SHA512 f5d107400718b4b1b56efa2d82c31c3e9b51b90884eb210b742522bb1f0739c9d875b137b15b48c328c9d145c58ee0a3bee86503fca1fe7bc6cb6029f400a4d7
 DIST github.com%2Fsmallstep%2Fzcrypto%2F@v%2Fv0.0.0-20200203191936-fbc32cf76bce.mod 658 BLAKE2B 6567d111b50b66232bef6885e2214bb4837716b11d914d4f9e256f07b341d96de8d74512c91338e63c0a6c75a4344f446c1663b86765bb53c1aeabba9e5c4e20 SHA512 2328744b34eb6f2a5983dc651c5f5f9cef1095d7c3f843d085a885ade6e730c3afeae546baae130bbbc83de1d97af5f7a2ac6783414ae479d1af732f20079033
 DIST github.com%2Fsmallstep%2Fzlint%2F@v%2Fv0.0.0-20180727184541-d84eaafe274f.mod 34 BLAKE2B 1d1e22d8a186a5e6047e60d939eddd154d8b92d8a06e7314abc1785e11c593dc8061846a80c47b0a216b7cba45d68b94b7911e10bc37940f91552d0b20721fca SHA512 2c3e518e2bf8c7b67a67240317b295c3f428e3ae36306849834ffc9f791c9468ec48adc19d168d0a64c471a8a2b7f4b4317834b43194ea6d79e1963ed6bc98b2
 DIST github.com%2Fsmartystreets%2Fassertions%2F@v%2Fv0.0.0-20180927180507-b2de0cb4f26d.mod 43 BLAKE2B ea265a40bcaaba6e4401504643cb9bc2f775a23792b1802d6c1b665121c49db7d4d850ba03c31087fbd6f344b08349ce00a106e430c8690b8016c95318cf3973 SHA512 222b0edcf745e14eb775eac28668dfa0c52051cbf302ec441b58d75846fc2570a0fc2e616cbec68f6312a1648fd7e6997b6597b160b1a7f84c1c500a42e93e6d
@@ -698,6 +810,8 @@ DIST github.com%2Fsourcegraph%2Fannotate%2F@v%2Fv0.0.0-20160123013949-f4cad6c632
 DIST github.com%2Fsourcegraph%2Fgo-diff%2F@v%2Fv0.5.1.mod 283 BLAKE2B 8d2ac0a93e8060c85b68a1c3b7f1a22572319c9a8c7f7d88857f8b04793cc55141d63e53728bd85ce4c2a2f3ac27bc7dd9c115b86f5f3ae9d27aed9ad4ebae1e SHA512 cf2637b8c82a9c67cbe323e6f6601e93c6d0840e053a4644b6e6170a4efb56d670007b15eda837e89abfd17b6c15f179c96cd92cc9cea4002f27125cad1049c9
 DIST github.com%2Fsourcegraph%2Fsyntaxhighlight%2F@v%2Fv0.0.0-20170531221838-bd320f5d308e.mod 46 BLAKE2B 44bc49585092c685651bf48824262b655c9bf38fcb810ab934c0318324cbe62af85137efc6066eb30e5c132c8a2c52851741dec0d76b28024548b122621e1ee8 SHA512 183674d9c991b53d241664459b81ef54f1c2bd4c1b841af62ddb7bd72aae76ee21514a178a0d7e17267d6a958d3eb231300969bbf3db2aa266fe2a72cb265eee
 DIST github.com%2Fspaolacci%2Fmurmur3%2F@v%2Fv0.0.0-20180118202830-f09979ecbc72.mod 36 BLAKE2B 1ba81fe6a6b84ed40868e0fff431dc8485b912700c192d90181c22588345e7250af63160673c297129add94a41281d7f0ddca5733c2b32e20f65ca7c27046306 SHA512 d14779867dcbbe24d451e82ac72c823f80551cec89758ecd39c9e72fd75560694a0b8261726020b738ad4f447ce1093f910c12797c58b8dede38f6bc737b9a25
+DIST github.com%2Fspaolacci%2Fmurmur3%2F@v%2Fv1.1.0.mod 36 BLAKE2B 1ba81fe6a6b84ed40868e0fff431dc8485b912700c192d90181c22588345e7250af63160673c297129add94a41281d7f0ddca5733c2b32e20f65ca7c27046306 SHA512 d14779867dcbbe24d451e82ac72c823f80551cec89758ecd39c9e72fd75560694a0b8261726020b738ad4f447ce1093f910c12797c58b8dede38f6bc737b9a25
+DIST github.com%2Fspaolacci%2Fmurmur3%2F@v%2Fv1.1.0.zip 9830 BLAKE2B c5d27e8b447082c0a1756354c0a414079fc3b03d0649cee8353490827ff50882a9321b89fdae4e341da1a4718f6db4c4a4c27e937c9bf31111085a449f56f282 SHA512 aff4d1c9bab0fd619496fd6948f05bc88e4147af2fb171c4ce4e44d81c114257abd55f92fee27c4b6d96fde21c6756735c32257de7b00bdb0356509cb4b97374
 DIST github.com%2Fspf13%2Fafero%2F@v%2Fv1.1.0.mod 30 BLAKE2B 9bf213acd16f9456f4a010a7c300a1fb7bf1ab248d1ac9eed7883deae7f9a6f6d0c761127b7b2c84e8dc46e7b0da2eecac9b334fd5a94d2995d56858d345edb9 SHA512 3166c898d741be502c0b733653cdca0e8ac4999fa6a5d67460b3962799287c9176b7f0243f0c0da394a4b7737ed1d1a6a2ee4f84a8917cf7076c774ba9a2a648
 DIST github.com%2Fspf13%2Fafero%2F@v%2Fv1.1.2.mod 30 BLAKE2B 9bf213acd16f9456f4a010a7c300a1fb7bf1ab248d1ac9eed7883deae7f9a6f6d0c761127b7b2c84e8dc46e7b0da2eecac9b334fd5a94d2995d56858d345edb9 SHA512 3166c898d741be502c0b733653cdca0e8ac4999fa6a5d67460b3962799287c9176b7f0243f0c0da394a4b7737ed1d1a6a2ee4f84a8917cf7076c774ba9a2a648
 DIST github.com%2Fspf13%2Fafero%2F@v%2Fv1.2.2.mod 64 BLAKE2B 51fb4de1e12106663228a747aa9e5fc135104573154f2a33f2a6cd2a927873efeb19bbb6d7a0a74fa1c7050683ba40d176d7c9e2c32b31e71aa43f9284b868b6 SHA512 e091de41de8e320e4eb47a082cc419a6d102791c888646a0482bf4d2b91a9f357455fe59ef0657e043dcd021441d6d78fe89440db3f11d4d516995903e0aa3b1
@@ -773,6 +887,8 @@ DIST github.com%2Fxordataexchange%2Fcrypt%2F@v%2Fv0.0.3-0.20170626215501-b2862e3
 DIST github.com%2Fyuin%2Fgoldmark%2F@v%2Fv1.1.22.mod 41 BLAKE2B 44917ea3a6fc533933ccd76d1594e19246c682d96311e030eeeeaeac3c126f6cd2c2de67ca410c89738918c5ab0594f1e9b2c2202c48f462c368ad31fb5feff6 SHA512 b7d81f5cbf1b55ebebcbb86ae89899ffec6fcd730144f1719947a76080f587d298d0e37a073a8768d7768ef64fc47b1673104335203a32a557f31e42a4e5a950
 DIST github.com%2Fyuin%2Fgoldmark%2F@v%2Fv1.1.28.mod 41 BLAKE2B 44917ea3a6fc533933ccd76d1594e19246c682d96311e030eeeeaeac3c126f6cd2c2de67ca410c89738918c5ab0594f1e9b2c2202c48f462c368ad31fb5feff6 SHA512 b7d81f5cbf1b55ebebcbb86ae89899ffec6fcd730144f1719947a76080f587d298d0e37a073a8768d7768ef64fc47b1673104335203a32a557f31e42a4e5a950
 DIST github.com%2Fyuin%2Fgoldmark%2F@v%2Fv1.1.28.zip 260158 BLAKE2B 474660bdf8b8c882edb465b0d04714949a9ded75a7467008bac781ee84260e4587366421467ab8823c1b8a1bd06687147b9b0e71b2eb743c8b29f26ef35fe81a SHA512 b44e24ba4b9917afe05fb3e2306f10e3542ff660bd3fc983dcdbcf1e80150459b9d5c8ac095f04f3aa27439fd6c38697814b286081d6b72d8afa3a39efdc1e32
+DIST github.com%2Fyuin%2Fgoldmark%2F@v%2Fv1.2.1.mod 41 BLAKE2B 44917ea3a6fc533933ccd76d1594e19246c682d96311e030eeeeaeac3c126f6cd2c2de67ca410c89738918c5ab0594f1e9b2c2202c48f462c368ad31fb5feff6 SHA512 b7d81f5cbf1b55ebebcbb86ae89899ffec6fcd730144f1719947a76080f587d298d0e37a073a8768d7768ef64fc47b1673104335203a32a557f31e42a4e5a950
+DIST github.com%2Fyuin%2Fgoldmark%2F@v%2Fv1.2.1.zip 263657 BLAKE2B a7c0c2a837b83e2a5bbb0f21ada91ac4cdef986b55485a52d01b6c52ed18fbe886bee72e6b66cf707704eca08bfc9590c5e9ba8ed4298dd2b5a71434999fdad3 SHA512 145fc11ace7aee4026d69884d29c7c01ff2c975fdc4597ac01b03e97c5ac7185e5bc04b3de103539fbc28424144502c78fd1b3b0ebd820776f863a13d92b7931
 DIST github.com%2Fyuin%2Fgoldmark-highlighting%2F@v%2Fv0.0.0-20200307114337-60d527fdb691.mod 481 BLAKE2B 7f6b0f2bfcc73b9f02244e0310b0ee8f511ba654cbaf737dd896ba2090168795835635fa5f520c6584a47a156c7c1c71150a60e8d283f7cc5edd8b140f70ea2d SHA512 42b1f424182644a589d0add502d537fcc508077e5db59757f70b8c9bada92a71ec9345149cdcdf5c33f479c3beef0740d297f3b64f9897aa12e7a858dcb3e9b9
 DIST github.com%2Fyuin%2Fgoldmark-highlighting%2F@v%2Fv0.0.0-20200307114337-60d527fdb691.zip 12715 BLAKE2B f681c484ec877951d3c6f2bda0b6cff6ac109443637c887d9eeb74c70d37ceb8dbad999a8656f42175a8c91317a6a6c4e25ca829375137ec4fb7dd5957479b4a SHA512 b47bcfca1fd927ba733de1cae29328ad44293ea0b33cd498b878733ccf7faadb221c3f9f1d5913e00d8cbff3565bcb5ead52a03dfca3cbf5d098e7d8c96cb713
 DIST github.com%2Fzmap%2Frc2%2F@v%2Fv0.0.0-20131011165748-24b9757f5521.mod 27 BLAKE2B 7067d64da9c0d3a7c282f7689105a813f433a5be060a2433893b96c5d39c0a384abdf3680ead40ea20bf440c1f0efc43cdb5ee12f9f0a91df2a62b6a3424db71 SHA512 48b3a0e74776c014b332fea8082728dcf60ee4ebc6d7823e16909874b3956bb634dbb98a63a5f68cc7f2e377048492d194746acd1075bd6367676133be88f227
@@ -794,6 +910,12 @@ DIST go.opencensus.io%2F@v%2Fv0.22.2.mod 478 BLAKE2B 534d5c63341897b7213d30ae225
 DIST go.opencensus.io%2F@v%2Fv0.22.2.zip 296264 BLAKE2B 0b0e20eb2f10b81748d55b843f8489ffb8147a8b17c063cb21fe505fcdb46feb9cc0830f3b3a91ea7034b1e7ba78df27b0b235b8500b8c1ade19f6837366aaa1 SHA512 c98a43e1bfc9f4bd1e54847dfd6b07e9af14efdbcd8d61b70c9f9701541ee2405f800b1e33cf115615a43030accb735a1235e2b7d81f54efd127e2fe5c992326
 DIST go.opencensus.io%2F@v%2Fv0.22.3.mod 478 BLAKE2B 534d5c63341897b7213d30ae225708b5465b0bc5efd7b42ecfdd7fd67fe6e8fb5ec7a20345b734d07fc2793b41a115dde74a1f80510f3970aaee8f6d4effd7b8 SHA512 62820051cdf582849bd310ca77bba4b2caef82c9e6bb27e7c2de6c3bb1be0af90443770971e893d0eb466832857190a9908633d069880cb1980120c14ef391c0
 DIST go.opencensus.io%2F@v%2Fv0.22.3.zip 299798 BLAKE2B 6adc76c28569e177bf40cd2d4c7de912e92bb679c29ce669bda7e001d33f8e758d3f2a413857b2b74efc676d4d0cf239e9c7acefd2cb7cc502121f07b31d640a SHA512 99fe389fbe5fed1db31068ce5c4ebf597ac5b39203e3c5f13b0f92c3e66ed0b1ee9f6f3ec0d953a7f5d02d2db46969b8d3cb642703acf43cc0df5cda61c3e355
+DIST go.step.sm%2Fcrypto%2F@v%2Fv0.0.0-20200805202904-ec18b6df3cf0.mod 117 BLAKE2B 414f2649386957b2889d0ceb9a26f2ecddba9997e0e698790bd5eea94d85b5b6e443df2ed01b2d522ae8b87b15132c0499225689504e023252972e27ff84490a SHA512 bceb2c901c47bb06edf8978e8db3d631e1fe6f160e0538a47c5ba1b4c4caa97080287ce8c6148525eecab0033c0fed728fce878d146b58be045e6f4960b3ef31
+DIST go.step.sm%2Fcrypto%2F@v%2Fv0.1.1.mod 237 BLAKE2B b50dbe5755300051504dd1ab510108803d528ffbc0b59bd23b89dff4fea4daf4a6d48586a952dd012497125684d7c5ab3d1fa6af3a0e68201cfa437a2ee04ade SHA512 4fab62ad1a41641792562708e42263f28f8b06b552631a726cfe656b9096fe51cee64757e8f9967b77962811f6bc5184b7721bc75b3bc7ca011cad67ddb3c5ed
+DIST go.step.sm%2Fcrypto%2F@v%2Fv0.2.0.mod 446 BLAKE2B e4c92ddbceb48b81cf7d1c93b784915b4774512a7b49a0e30b3725a8c6e798d5879cd08f2474481f7621e6ba57916b18a2581509c906c253f24a63719e2db918 SHA512 956c1d0683f5f26407b4c4a4be17de4751aabdb7de032271ce5ce2a6102c913f652ba22b28fcbb082223c138195f3a61cde21eb5f955ca3a2d5794fc33be0a09
+DIST go.step.sm%2Fcrypto%2F@v%2Fv0.2.0.zip 142746 BLAKE2B 0d05d438eb248c458796bf00b4a8c342f43352c5015bc5221d5b7e3bf1764acb2ab3afaae39ef851f2119a5b0838e895195d49ae5e133fa44038b961d0d4d0a9 SHA512 28d8d6f831393aa2f2a96e60a828af1df9d5f6a3fd22b2df492c25c8382231fc1bf16fae79109dc9851b59c11747d3f8bf4e0affa03064545f0ffa155471a6c4
+DIST go.step.sm%2Fcrypto%2F@v%2Fv0.6.0.mod 272 BLAKE2B ec3dc9ac04aac0f907674a1b3e5e90af4ab61b0be10e1584a537d8f9ac128acf007c7261259a58e7471566e38d739c915c18f74515ea6d73fcd0171af6663eaa SHA512 878c6701fa641f31f2afa734f59be7ce749cdd3cbd042518c391bae57a6ce6e68237204ddb14bd972f3dab2d3607fbc4d92de3f15a13e13c4e11674779d2f896
+DIST go.step.sm%2Fcrypto%2F@v%2Fv0.6.0.zip 187463 BLAKE2B f60e787fa2cf570a93500cf07ef04037d7ce9bb07c01c9fb685121f106bd1e6b6f82ee6203b0392a420d02698e336ff73818d55ec3fd8525b89c437969a11c60 SHA512 8cf74b03c1a33e4de2281c60cd850f841a876f01e2aaf68460c0a5672562e34694f0bd6a97970dcf8d51949aab258006beeb3c81172fccf742686a68e126adb2
 DIST go.uber.org%2Fatomic%2F@v%2Fv1.3.2.mod 26 BLAKE2B 00521092f85fc8940d69a5885423e84d8e6987a29749d886be3f40c230e563b55d96779ccd2efb99e939167c93067e8d37117750cf2567fc49e70bce9e847d07 SHA512 4c66fd56c35d6d25a3091f83a2d3872ba395092c10519e052aaccf3edca281fb874a46e86e7a7294b4f42a5d5a51d3cc0f066081e5ab945288a48ac223bc19e6
 DIST go.uber.org%2Fatomic%2F@v%2Fv1.3.2.zip 15027 BLAKE2B 06a2451071b8cb0de9b4e664d007584998c91acf4bcca04be7f6c4e97c2579a9cc174e4db220347a00b252392cd6f3aa3e08e27ef3a231d422512a419a199c2a SHA512 be6b2545811ac8a869fd0365c1126be58531a6c0b51690feb17d7e88a2b79dfec6a466ac317df15e4d038c02df0f72993ae3e50a218c9f7f6659787c7f8e9333
 DIST go.uber.org%2Fatomic%2F@v%2Fv1.4.0.mod 26 BLAKE2B 00521092f85fc8940d69a5885423e84d8e6987a29749d886be3f40c230e563b55d96779ccd2efb99e939167c93067e8d37117750cf2567fc49e70bce9e847d07 SHA512 4c66fd56c35d6d25a3091f83a2d3872ba395092c10519e052aaccf3edca281fb874a46e86e7a7294b4f42a5d5a51d3cc0f066081e5ab945288a48ac223bc19e6
@@ -818,6 +940,8 @@ DIST go.uber.org%2Fzap%2F@v%2Fv1.13.0.mod 221 BLAKE2B 586c82887d6cf6582837fb495a
 DIST go.uber.org%2Fzap%2F@v%2Fv1.13.0.zip 217908 BLAKE2B 76cba015e6e09b9953c442c0080e7f0df0b47ccb57a1b7fba756dd3f32549c64dd2c71db9e00401c93c694d1cb1ce6336825e8a2b1221a199cb7b9a964370261 SHA512 e148cb9592231bcb86846dd43d8306f66618ea005cf397ef35efe2d63ba9fa08d3ff600419fa6392ce826ce585c4ee2ba44b548d3a23fed6ddf0ec8f62dd1052
 DIST go.uber.org%2Fzap%2F@v%2Fv1.14.1.mod 257 BLAKE2B 2e5fab0b1a188fb7fffa1c9ca0799fa286f74732ceb0f45a904a3620f636af45d8b30d199cbb54ca46114aaffeeaf66bfa04715abe02711d6af46bbdba9bd6dd SHA512 4922fb6e20d2f5d2fa00888b8d644c51e1b558edb69b9f7d70a883314c3e971b6f8fc707b072aa0602d4c451ca0f20983796b65edcb737e5090dda1ffed0c757
 DIST go.uber.org%2Fzap%2F@v%2Fv1.14.1.zip 223907 BLAKE2B 753367cf4cb824f280cdadb38d53e80fe64909f167e443941d573ea57791f9608a47bcf0cc9d4f24cf83fd78d9ba9ddd1ae99ea3074950e29de260998d01484c SHA512 94a725d0169b78ce842b6a9f69e178fc651ce8d10a3eb54e905ce13131420cf1d6af79e32ecbcefda166ea7a50ce51fe02c929ed8c008fc33c04b1088759f7d2
+DIST go.uber.org%2Fzap%2F@v%2Fv1.15.0.mod 257 BLAKE2B 2e5fab0b1a188fb7fffa1c9ca0799fa286f74732ceb0f45a904a3620f636af45d8b30d199cbb54ca46114aaffeeaf66bfa04715abe02711d6af46bbdba9bd6dd SHA512 4922fb6e20d2f5d2fa00888b8d644c51e1b558edb69b9f7d70a883314c3e971b6f8fc707b072aa0602d4c451ca0f20983796b65edcb737e5090dda1ffed0c757
+DIST go.uber.org%2Fzap%2F@v%2Fv1.15.0.zip 226617 BLAKE2B 8f21641500327ea1bed28c3820f7103773d8955367dde6eee133b92e18631c5b5adb09a3d9f3c441f32e0ed8dd45acdccd211417a51be3be87e3b874f90897af SHA512 3fa001713fe2b81add9e841bac8ea606373d3c7d58941cfcff3f6535f252fdf608a573d614aa19981a2241fc4b7393427c1ba3c37ba4c617aa409b71ed9aa8e6
 DIST go.uber.org%2Fzap%2F@v%2Fv1.9.1.mod 23 BLAKE2B c60cbd3c1e15e71a99909c113b100de3909740d9e0f939da800209ed1ccde49f77be7a8c22e045b9edc663859995859bc7ccd60bb6953846829ca3164115f3fa SHA512 263e322e5615c91e810fb9ba30a601508e1e3e418f87c7c74de962c341f207e703930f2ad41ae1bf7b2ad106831dc37b0b96637b816d130bddc7225d41911946
 DIST go4.org%2F@v%2Fv0.0.0-20180809161055-417644f6feb5.mod 15 BLAKE2B 00f2fbcebe2e9f068ba7e7dc4da2bf2e66f09203415957a1dcf8d5ca6aee422579cbaf2efdb4383985742c6e71d41029a8c68c20a074819666d2db732cf1ed13 SHA512 5bccd8605a1e1d8381adc2f52e27c600732590e7dfe261521b149fb6519693e1124e471c61bb7e6bad8f683d684c7a652f5f11ecc766c84286a51e3837cea6af
 DIST golang.org%2Fx%2Fbuild%2F@v%2Fv0.0.0-20190111050920-041ab4dc3f9d.mod 4407 BLAKE2B 01f20c6ca234f03f65fb5bca568f3f86c4fe49308030dbd045434025ceebeb168508b7d104143fa38c8476c4a926cba29bdbdabcc7d8a1f8bbb1fa7d4bcadda3 SHA512 a207bc1fff631a38a2ce1e1c041548860885b201919aa2d729af31b9538f7616b61f695c3cbed18146ce5bb79c72823425914050b5b75115f9889fc94d29d1c6
@@ -841,8 +965,13 @@ DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20200302210943-78000ba7a073.mod 155 B
 DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20200302210943-78000ba7a073.zip 1871198 BLAKE2B 952b683ea0441db01cdea99ef57634d79e30a112dc649e31dede9232c1975c1156f8e875b1203457d30c113d0dca49f01771b8549c18a2d7ca2b5dc135bfbea7 SHA512 41f3d3c47c1784e991e2b971189432fd4f9d693414e6340289b2debeb291d4972d6fc63b3ea06b84dac5dd369752134463a4275ba36f3db94cdbfed6ba3c9c8d
 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-20200323165209-0ec3e9974c59.zip 1872460 BLAKE2B bcf70beb075025ed54a129e7e5851328cffb872f4885a388ff0a765793b657078ed9ed89ad6ce63a84ea0fd958731d549f6457c20a8f752c2d5a25a86f3d7195 SHA512 aa3d172a5c0d759ef698bf10ee48c231d3dc981c5f22f5e4755a2dc36596bdd2cd78891bb45c91aecb44380560e11c318d1de2c26e72650947449b335ae4b177
+DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20200414173820-0848c9571904.mod 155 BLAKE2B 8bba3353db8ceb3b9fe40b8fd59aacde169776a4a553a069a04836bbf15e5a9a8d7a2d39feed98dac6cb890198180fda39f26b528ff95f24c5b2bbf6601b45c3 SHA512 7c5a755a03063d47d259fda0a6c2faa63c2f30b98dbac583e106aaa817d6cde3e07551e0b5e08f3a25db4c4ca45a23cebe993ae6f3d39c88deeaf2c7d8086a06
 DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20200427165652-729f1e841bcc.mod 155 BLAKE2B 8bba3353db8ceb3b9fe40b8fd59aacde169776a4a553a069a04836bbf15e5a9a8d7a2d39feed98dac6cb890198180fda39f26b528ff95f24c5b2bbf6601b45c3 SHA512 7c5a755a03063d47d259fda0a6c2faa63c2f30b98dbac583e106aaa817d6cde3e07551e0b5e08f3a25db4c4ca45a23cebe993ae6f3d39c88deeaf2c7d8086a06
 DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20200427165652-729f1e841bcc.zip 1874182 BLAKE2B d28b6e5b2f897fdb9024bd9c06905e8c40719f9ee6ef78863128e907b48fa0ba55abb75b77d414aae16b78c39b023adaf4236ec1c43d67034443f2798e8a1218 SHA512 f4c8840968cf21d2a8fdb3351eac654c85ca3a1342391f445305befe696e66c7ab726bd0c19024a4c490321c90b5d5d4e14890c84080e27dfb61a576868798df
+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-20200728195943-123391ffb6de.mod 155 BLAKE2B 8bba3353db8ceb3b9fe40b8fd59aacde169776a4a553a069a04836bbf15e5a9a8d7a2d39feed98dac6cb890198180fda39f26b528ff95f24c5b2bbf6601b45c3 SHA512 7c5a755a03063d47d259fda0a6c2faa63c2f30b98dbac583e106aaa817d6cde3e07551e0b5e08f3a25db4c4ca45a23cebe993ae6f3d39c88deeaf2c7d8086a06
+DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20200728195943-123391ffb6de.zip 1876304 BLAKE2B fa57b9b35fbd6fc1e9c64a15e5f3545be4affa2bf773e375dc3658b4384a501de6e480e0b268d1f2c4eaebdd8f0cda71d42e7642472b4b89106bee11e58138d0 SHA512 cbffe21e7836f45412e5c7b2d07fb820b1c2f79e4708d1a3974eab3840460231083069fff4850499f2305326c4c5097b6b16754ba7ab3c39655ccf2218bad259
 DIST golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20190121172915-509febef88a4.mod 24 BLAKE2B 9615629f1bf7d58419f5b73842e19f6be3a8c8cefb217364917f1aaf68aec00de41d96700378b048d6cc385e154ed6d3db59256b4a00e9165bac7951cd0bcbab SHA512 9131017b8ab0c2362b74e0c010daeb849689025aa31cb464dc379b0e34d0fcdb66749329b111041127997440bac052249dab522ab27239858405c056e3ac5dbf
 DIST golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20190306152737-a1d7652674e8.mod 24 BLAKE2B 9615629f1bf7d58419f5b73842e19f6be3a8c8cefb217364917f1aaf68aec00de41d96700378b048d6cc385e154ed6d3db59256b4a00e9165bac7951cd0bcbab SHA512 9131017b8ab0c2362b74e0c010daeb849689025aa31cb464dc379b0e34d0fcdb66749329b111041127997440bac052249dab522ab27239858405c056e3ac5dbf
 DIST golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20190510132918-efd6b22b2522.mod 327 BLAKE2B 209bd1491b6099491fca7ccfd2fabb500b56112557b4b359819b5f9d18e1587b8b1551acab53ac6c222b66b825c4058ecd6adb1d886f1868b7b96ebbd5865eea SHA512 e16919da8b2302c45f8fab5f0d200f41c2c978ad31eab2b4db18310bfbe09079d738f682920ef6530f1d5f53359ddc3d4bf33fe5cefbcefd440212b31e72ef28
@@ -916,6 +1045,9 @@ DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200301022130-244492dfa37a.mod 181 BLAK
 DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200301022130-244492dfa37a.zip 1500173 BLAKE2B 6b2b9d94b3d6dd87fe74caceeb75254930831b14e03a54c4774374c96e74ee05917bc2e92aa38ccaa2ec41a02134b6303b668947ac336e3635aa43b7e97d2272 SHA512 63daa5add6fb2c5d315b507208a42a08a65d122b7ee1ce5772087453940b25c2c59e404ba283fc543b4814df9f1bd900e18c5c3cc4e2acd9c70fb26e46949ae8
 DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200425230154-ff2c4b7c35a0.mod 181 BLAKE2B b45bdd8d5412dfa50e483e0e3431a133435aa68b1225e66fce0f2ef80f2e9d40a9f56a47d5f2faede1624fe05c80fe97c7cd56dd9a6b56ad91315cfbcf9638db SHA512 0c6baecc550358cbc908d994f81f786e62f619b197d4ba0ca5af19eb2ddf243d7f36c6174634b65e205fa5ed3b9c3393d1677c0a57c2b99ddcb252b935a2dc70
 DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200425230154-ff2c4b7c35a0.zip 1500495 BLAKE2B 29da4ab15ccf128967369fd5c3c881d94af2d8820d52de95b7ac99b221ed1e912b49a1318d9665fe9aa2431c3c267ad88bfecc87e4fd4ae50852de3de8bb6006 SHA512 c376001cee1c89fdc414adeeb9a277e81b8b69e243ba597efe07e3cf70c62c38196dc78e6eb1e2da01fd84b6d154e7636fd6043fedee14e65400757c67f77848
+DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200520004742-59133d7f0dd7.mod 181 BLAKE2B b45bdd8d5412dfa50e483e0e3431a133435aa68b1225e66fce0f2ef80f2e9d40a9f56a47d5f2faede1624fe05c80fe97c7cd56dd9a6b56ad91315cfbcf9638db SHA512 0c6baecc550358cbc908d994f81f786e62f619b197d4ba0ca5af19eb2ddf243d7f36c6174634b65e205fa5ed3b9c3393d1677c0a57c2b99ddcb252b935a2dc70
+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-20200707034311-ab3426394381.zip 1503811 BLAKE2B c8cfe6b14a455a6ad71c42ce03235c650b7efe842131874cf99570716907e02c9fbe42df586e69332189518cbdcf6e2e417caebec84ce928e7ba959b66ab869c SHA512 bc3772a7ae7cd2b50f61ec8d07e7f7e1af9f24e0b737131da375a525be44dc993ee740ce0a11e0baaf0cbd81e819e3ecad889c0c7ece95086cb428e52b10a785
 DIST golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20180821212333-d2e6202438be.mod 27 BLAKE2B 078fc99b981406f4ee3f8da94c83954e80619e76ea63cf6323f27614bbcb870bb650eb5ffaac865a374f3ed0ef0619d97e11f05924c92e395e72cb73f28630e6 SHA512 53431e560b5d6a9b50f44997ef6755f71741ccca155767dd954da41f11f53a3e8d01d7e01a2bb9de1fdd551dd2e734cb65e5641cf5de5c9a8a6a25a4894336f5
 DIST golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20181017192945-9dcd33a902f4.mod 27 BLAKE2B 078fc99b981406f4ee3f8da94c83954e80619e76ea63cf6323f27614bbcb870bb650eb5ffaac865a374f3ed0ef0619d97e11f05924c92e395e72cb73f28630e6 SHA512 53431e560b5d6a9b50f44997ef6755f71741ccca155767dd954da41f11f53a3e8d01d7e01a2bb9de1fdd551dd2e734cb65e5641cf5de5c9a8a6a25a4894336f5
 DIST golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20181203162652-d668ce993890.mod 27 BLAKE2B 078fc99b981406f4ee3f8da94c83954e80619e76ea63cf6323f27614bbcb870bb650eb5ffaac865a374f3ed0ef0619d97e11f05924c92e395e72cb73f28630e6 SHA512 53431e560b5d6a9b50f44997ef6755f71741ccca155767dd954da41f11f53a3e8d01d7e01a2bb9de1fdd551dd2e734cb65e5641cf5de5c9a8a6a25a4894336f5
@@ -960,19 +1092,24 @@ DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190502145724-3ef323f4f1fd.mod 33 BLAKE
 DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190507160741-ecd444e8653b.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
 DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190606165138-5da285871e9c.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
 DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190624142023-c5567b49c5d0.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190626221950-04f50cda93cb.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
 DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190726091711-fc99dfbffb4e.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
 DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190801041406-cbf593c0f2f3.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
 DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190801041406-cbf593c0f2f3.zip 1817722 BLAKE2B dd684f551ee111f95610aef4b36c702ba7aae8ac4efde35f9300b89d1d84f9a954a9d274c87cc3f942f3cd8eaa922531e13a1bf7b3fda93f8b64853d3909c339 SHA512 62bb25a98a47333b5886b05edce3290d9de4f6ed6d0e67d4847f8d5170db8741dc610d4c9c7a98e522c38eac8020147993b75eeeb52b0a1d298090abb7a574e6
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190904154756-749cb33beabd.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
 DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190922100055-0a153f010e69.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
 DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190924154521-2837fb4f24fe.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
 DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191001151750-bb3f8db39f24.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191005200804-aed5e4c7ecf9.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
 DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191026070338-33540a1f6037.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191120155948-bd437916bb0e.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
 DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191204072324-ce4227a45e2e.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
 DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191220142924-d4481acd189f.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
 DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191228213918-04cbcbbfeed8.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
 DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200106162015-b016eb3dc98e.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
 DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200106162015-b016eb3dc98e.zip 1913169 BLAKE2B c50435879fb1df50f91b1f37dd92f6504047944d41797350f0871a581d5bf17cf474845d3b422fb219c56f7627f2fdb302059d68657bd7860ebc604861cfae72 SHA512 b732d79f0828b9a900595b8dc98377436dcdcc24e2d3d9fe0472a8170d477c0e2487bb4b8e2da4eb7ca9b19251e29ea3b38a9de777d03c069425897ac47e325e
 DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200113162924-86b910548bc1.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200116001909-b77594299b42.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
 DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200122134326-e047566fdf82.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
 DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200202164722-d101bd2416d5.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
 DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200212091648-12a6c2dcc1e4.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
@@ -982,6 +1119,10 @@ DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200302150141-5c8b2ff67527.mod 33 BLAKE
 DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200302150141-5c8b2ff67527.zip 1462438 BLAKE2B b3781ba8026ce86feeeda8f46f3ab17b1c19968c13de5aac924f9110a828eed6e93f5fd3be901e74a70a98480070e7b990913a27dea21afe50bea9c745ff983a SHA512 930afe0d09f5e4e08c716e83a0d4072181519400a92c08004ddc29cfed716e5c8fbe7bd4e6d53a1baec73d9c5f578ff01029163571508bd3c04b34ba157d0f25
 DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200323222414-85ca7c5b95cd.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
 DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200323222414-85ca7c5b95cd.zip 1470272 BLAKE2B 9a8bbb988370bedc24428e6c78f42a9ba44dbb852ce91c3d7fc54e83678b72b9177e67c955c49dc8ef7a1e2e214475a2e55c53254469e3426ec271e90ec9e2d5 SHA512 e46ef76fe4a1628def4c6a291003b64cf11185c0214427af9c49b9ff3af99f258488d49e887206a9c8652784228d822665c5841ce87d6ff993e95ea3d0494129
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200413165638-669c56c373c4.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200519105757-fe76b779f299.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200615200032-f1bc736245b1.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200615200032-f1bc736245b1.zip 1478946 BLAKE2B 798d7aa002eaa8b42880345aa5c09b0577e29e4bcca817b184c0fccca25a1def1b50cd815df20b3368ab117f831d56e33177baefdebafa018da052454330728c SHA512 9a5a239ed5e708b41be86984343c66e8e8f11e8386bcd8db9ba91a110e7390206790fb8e6099bfd2b51ba59e49f81324eac9b870f884f67aae05015b20da1531
 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.0.0-20170915090833-1cbadb444a80.mod 25 BLAKE2B 31009af0fdcd0f8730c9985287e6e364ec4e5183e57e92560dbc80a2010eced51b8a90f01a82b49384268c8a0adbf69d179c205d3f68e0eb459169d2ea9528f0 SHA512 ca081ef7cccd7bbedc6843fbe0c452352661a07e1298cd02ff338ed79d807c6401d613a3cf20011189d2f98a794ffa410547b3e352eb58a6f0a84822285d391d
 DIST golang.org%2Fx%2Ftext%2F@v%2Fv0.3.0.mod 25 BLAKE2B 31009af0fdcd0f8730c9985287e6e364ec4e5183e57e92560dbc80a2010eced51b8a90f01a82b49384268c8a0adbf69d179c205d3f68e0eb459169d2ea9528f0 SHA512 ca081ef7cccd7bbedc6843fbe0c452352661a07e1298cd02ff338ed79d807c6401d613a3cf20011189d2f98a794ffa410547b3e352eb58a6f0a84822285d391d
@@ -1111,6 +1252,9 @@ DIST google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200305110556-506484158171.mod
 DIST google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200305110556-506484158171.zip 10457859 BLAKE2B aed25a57258ded181f36b2e1bca75da26d256b4eaa2b3f116d1187395665671e125e3cbad33124045774de0522892849947998bbf01ed2f1c6bf0990a91263bc SHA512 f8cf43e02a8ec07998a36d24ace2fa29244136c055babc719ef92b04cefd51fa20814f7ac2d731fff2affd733bbe1a96df099127765dc5a9be109cfe622106bf
 DIST google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200413115906-b5235f65be36.mod 287 BLAKE2B ac895df309c4c2533900f7ff3aaecd59bf883fad6fde8fc7ffef9928fc8f18402fb2198bb3f0b75e876adb7d5d0e37073fc251d149245847ebdd95de1cdf6cd3 SHA512 44dc287d4a33c4225229768c59d1b9e61b51fdc27b1745a8161b17bdef4499cb08ebc565c56caa01673317cbef46cb228ac69b9ada7d4bac870b22eddf5a2977
 DIST google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200413115906-b5235f65be36.zip 10949147 BLAKE2B a636c26775c061bb2890c94ec2fce7ab3cffdecf50fbd266cdec1d558d4950e37d85be91f0bac5c228b475a5cfebc6a8ee2f63541e202e31156b3417820dcb08 SHA512 fd5e6fc11d6d6c687bf7c56393e530423b2bb0b6fa979d0d5e616d3c80551957025a973e667bfe38db5241ef7a30f83d733245d9c316d50a2c9270ca0fbd5203
+DIST google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200526211855-cb27e3aa2013.mod 353 BLAKE2B 7e159067adb934153bc2a45c1a091ea85083c9e52927db8aba3e7ef9e13f984dd738aaf3890e85f7daf86afdab8e5717775250715285c0edc05625a544664cd2 SHA512 17266a643d974e2fae18e7055986002b9705bd2a7fb1e3cd3664fe6dbefbc7a04aef6900146c1e1c3ed84bea8b4d1bda4d6c355af2cda013c01f19eed57568d5
+DIST google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200806141610-86f49bd18e98.mod 268 BLAKE2B 4ac4227310c12e7064866c6e3426900fe2e4befb661fd8dd11e47aa93df4a46e678e0dbf64d3df054da44446491c701a205a315e634752b57ccdcda3a9e7c12a SHA512 48f7000353b4c00c042daa550777df9a5031abfd49bc837d11ddd6a843fe05dd79063b423fda6d4ef1f5d42e9824349da341b35b49a9aa56249a6ef7d9d66200
+DIST google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20200806141610-86f49bd18e98.zip 17052528 BLAKE2B 14da90c420d97cc3d28c2a29bae6fa48ef0859c4d900e5ecdfe24029fbf0c0d8078c5626c97eca02cd23dc27e20a844f150ce809696472fb41b361dffc78f469 SHA512 d4c104140860930eb1c2b708d462fa6ab35a3e501fe15ec931908bafdc99f2cde6fd64898f4e15714c9b82b0dbcab5ecdfcbdf07e0c31f384cf9812d3a1bf832
 DIST google.golang.org%2Fgrpc%2F@v%2Fv1.14.0.mod 30 BLAKE2B 8ec04a655d1d0c3cfde5c051842d84f8a8615d7d56563ad57769905212e0e7cc821933d5adedcb210c724de9699b6b9cd5bcfd3a2c9555516354d3e19ffd3482 SHA512 10c6aa20da47c7923358430b63d5d5264d54f6a6cf70b008ed157807c07073cd0c64bef9db282b39fdb523515e1429125079cc29273ba186f7e4b42712d3d37a
 DIST google.golang.org%2Fgrpc%2F@v%2Fv1.16.0.mod 903 BLAKE2B dd9ff44489e2a944c07f3e58c3246534b472b407eb15780bfcf9a30370eea7353a8ec12601a6c3e0e39edad1de6651df1c959f86a528a0cb53ff7d2e8514d1e6 SHA512 1e7c2190023d06747cf81e4d6f25aa284a250912ac304e3d590e1b85f5ca3ad3d9963a0ff7106e5dc55f82f58eea953c72f131f4baa6618b46017a575669742b
 DIST google.golang.org%2Fgrpc%2F@v%2Fv1.17.0.mod 832 BLAKE2B 9de27394e05cf42e762a8b7ed42b6715244ea1086acd7c44f71b04bc0dc23c31ab236e6474fea423953eb3001dcaa357938daad1d54debfb5d52bdecc1de6bda SHA512 ac90f3fc374cc1ac7706146efaa8488a59634a209c30bf87453fa150bf8849870db2ec04e854438d59911ea35930a5dd8f40f5d5954786d0e0565907fc42f711
@@ -1126,6 +1270,16 @@ DIST google.golang.org%2Fgrpc%2F@v%2Fv1.26.0.zip 1101208 BLAKE2B bee7938f7e39bd6
 DIST google.golang.org%2Fgrpc%2F@v%2Fv1.27.0.mod 562 BLAKE2B 33a46aa2516aa10a1bfed0431c4f3d41554aa8ab5cff1f259323c47999696d0cdf9113f162eebf3bbc18cea163f1c6f8225777653191380cfccf06e5921db81e SHA512 6e06146c3ee73338a24698b08d0091dca5cc67d033e1a98ca28157dccd8e056a3a2624c798180eda5917f90e1e37aff31158cb8ab2cedeb8e4578324719605ef
 DIST google.golang.org%2Fgrpc%2F@v%2Fv1.27.1.mod 562 BLAKE2B 33a46aa2516aa10a1bfed0431c4f3d41554aa8ab5cff1f259323c47999696d0cdf9113f162eebf3bbc18cea163f1c6f8225777653191380cfccf06e5921db81e SHA512 6e06146c3ee73338a24698b08d0091dca5cc67d033e1a98ca28157dccd8e056a3a2624c798180eda5917f90e1e37aff31158cb8ab2cedeb8e4578324719605ef
 DIST google.golang.org%2Fgrpc%2F@v%2Fv1.27.1.zip 1142481 BLAKE2B 2b5b18292c24f142fafdffd7ca4416da8425f317e195b3c59fffa6881eaf42ee90722ec7d06f8dd39fff3b582fd5a08248d967d58204d5c55161900c01164d56 SHA512 0ba3e5799dc97e3cae5765bf607742bc3165ab02dcd774290b2a624518ab503c3110b9ea7bd889b9e898344aa679f0bb13f05fcd94514090f7d408fec81cd1ea
+DIST google.golang.org%2Fprotobuf%2F@v%2Fv0.0.0-20200109180630-ec00e32a8dfd.mod 83 BLAKE2B 4cef0579e4d6b156c1af532343070021171ead815734fe1210a0be6a8ba9bc5f3d11b97ee14cde810f2556bca76c206520f56363ee82af7409772d33301e413d SHA512 3cb3393e78f44d9de80074244756d5e309d19adca15e8313a392b925a687edad46e93c612da1539dc09d0c0072a063eede6f04fbd9e5671059e9857da0f7b1e6
+DIST google.golang.org%2Fprotobuf%2F@v%2Fv0.0.0-20200221191635-4d8936d0db64.mod 128 BLAKE2B 79cca062b7c73fedaa5357b7b43af16adc1ef83a86be48787887ec450e022d31e0700b7ca4cf5dca03bf2ad9db79727da0fbb89c73bdb006db6b68d75c3e1751 SHA512 bf45db2ba4ae10b447c471118551d337125d5432142f5aa4ba964054d09393730c23373e42eb34574ca93f9b1a12364669be13ba7faa7d9908cacb982984d414
+DIST google.golang.org%2Fprotobuf%2F@v%2Fv0.0.0-20200228230310-ab0ca4ff8a60.mod 158 BLAKE2B 8cafd0a40647244f2dd1d3d3da7ef8e376c6eb3823fca68d7aeb041d480e1147b70b70c49c65e47ff1e9b92eba026a109c67c7900da88cf8569ebd037912a35c SHA512 7d00ab108b35ba41ed8c6ad54533bbbd967e0cdf39e62cb8914c0c6e4a531c779a28ea3fb2a4a7f6f4af7f3c922246a8d8ec8eabb779758245cedbebfdd97378
+DIST google.golang.org%2Fprotobuf%2F@v%2Fv1.20.1-0.20200309200217-e05f789c0967.mod 128 BLAKE2B e36e105129abbd7729a6d509724246766c16df526ce22637e92ca8f29bf854b66622a0afc5afe8e4ad29c9efc498c488a87020fad5969e044757d49ed4bd6399 SHA512 802c0df5ed11f0bb2e221c01152c6339d3634068f89aac760654411884e6b936b031cbfabad57c5add340f9d504edfcd683c77cb0ba7d753e06bc604095257ce
+DIST google.golang.org%2Fprotobuf%2F@v%2Fv1.21.0.mod 158 BLAKE2B 46e19153fe487751cddafb86818a962b621b10c109e513ef22e7f5c93b44dd94c6a1636e6c03d0db6e5099536901821549859bcf84f06c00483637d5d4284c43 SHA512 4797f4305d5b0159aba0825c0432cc5678cb74e55cd95eb5c42e9879a62db5aefa76c6286a436aee9a31b096193e8a3bc2e67175f0296c9d5eca3d03e98ab2d9
+DIST google.golang.org%2Fprotobuf%2F@v%2Fv1.22.0.mod 123 BLAKE2B 1c4e918b0eba97f6cbf2766da4d81d59be965582a63fcb5d876194d0e57575bfc91ed40418bd435b7cb13f244c44acbe00821098b52b6d64111a4f812e4a5909 SHA512 dab1668079153e90bea3913c9aae022543d17d61e275e3d0e2ba7dfda3dd8f82642bcfd1e4d4add2b8f4fed342efd66ee6c7d7fe1e65e67e4e62f2d0ffd2387c
+DIST google.golang.org%2Fprotobuf%2F@v%2Fv1.23.0.mod 123 BLAKE2B 1c4e918b0eba97f6cbf2766da4d81d59be965582a63fcb5d876194d0e57575bfc91ed40418bd435b7cb13f244c44acbe00821098b52b6d64111a4f812e4a5909 SHA512 dab1668079153e90bea3913c9aae022543d17d61e275e3d0e2ba7dfda3dd8f82642bcfd1e4d4add2b8f4fed342efd66ee6c7d7fe1e65e67e4e62f2d0ffd2387c
+DIST google.golang.org%2Fprotobuf%2F@v%2Fv1.23.1-0.20200526195155-81db48ad09cc.mod 123 BLAKE2B 1c4e918b0eba97f6cbf2766da4d81d59be965582a63fcb5d876194d0e57575bfc91ed40418bd435b7cb13f244c44acbe00821098b52b6d64111a4f812e4a5909 SHA512 dab1668079153e90bea3913c9aae022543d17d61e275e3d0e2ba7dfda3dd8f82642bcfd1e4d4add2b8f4fed342efd66ee6c7d7fe1e65e67e4e62f2d0ffd2387c
+DIST google.golang.org%2Fprotobuf%2F@v%2Fv1.24.0.mod 186 BLAKE2B ac72ab4b58c29ea036b52ea6972dba93b3ff95ceea9b476355b14bc335bfb99ac350101e70ec678bfb6656157679f3dd42a200a1531b982ad9c995c5063ad541 SHA512 d9197910537264ba24d95110f470ce2b057b795e7244bcae423ea922a8eb4f2c89df3b6dceb58e71cc7ba1f68ccaa3dfa78d7c26d63f5949d4014b8df336512c
+DIST google.golang.org%2Fprotobuf%2F@v%2Fv1.24.0.zip 1510578 BLAKE2B 71a34f94325a05f830fb7fc951f43c7328fdcddbbdadf03f6e68baa84973be7dfaece317c77fb25bddbc3079f3960a5026ed81fc0ad7d83cdaf224080a2ffc17 SHA512 119be6e0aab9487c1340fdd4c73b57cab4fc74d2290430aac19f650c2a4f56ec34f8eb34c8a87fa267c979e5577cdac72deacfb6d2b9a68cd8f33e19841e0c9a
 DIST gopkg.in%2Fairbrake%2Fgobrake.v2%2F@v%2Fv2.0.9.mod 36 BLAKE2B 33002a8288351a233f5e8236743a91df1f630355380a4ae8df10c32abc03470955eac6c15c95655caec990eb17ef2661985570e49293cb146517828090d95635 SHA512 8482c3135335a3a69611529f0d50bd19257b0fe8a8de2d4f2d6441ccde5f1e7a57d487cedc375575c5fe16094e5fc1c7f7f1a6bf04acc8a9d4f92701db279002
 DIST gopkg.in%2Falecthomas%2Fkingpin.v2%2F@v%2Fv2.2.6.mod 38 BLAKE2B e7781691d8c15b764ef6c89fcdf20e69fc28d46e8df2703b6fdc342247595c10ed25e3cc5b30cd29b81c57837f5685e4122e1b2c218a51fffbb1567c85b0835a SHA512 585188d3a75067e6b7d8a8321959fe7df80c6a19f8668a87f0d1b8687c4d2cefc039167446f6d02f7eeeb147371bc7a673348213bcb07f4d90bebc0ccf9f2015
 DIST gopkg.in%2Fcheck.v1%2F@v%2Fv0.0.0-20161208181325-20d25e280405.mod 25 BLAKE2B 6470f3d94700c4d8b3176d692bdb91646750f2c6a866ff2ef4183aff1de01f024a8757f97b4626ec0355092e5f25e7ded91cd5be845f627d107c58b1daf400d7 SHA512 9ac0f80ef05881387cb2f48f81560f3207fe586ea16495383662e6d62e43d93fac01dfe72e1d0063d3ab065331dab3a8098d7da4f1830ba1aff6f27f8e1bc1b2
@@ -1157,6 +1311,8 @@ DIST gopkg.in%2Fsquare%2Fgo-jose.v2%2F@v%2Fv2.3.1.mod 34 BLAKE2B 618a69c0e95948b
 DIST gopkg.in%2Fsquare%2Fgo-jose.v2%2F@v%2Fv2.3.1.zip 343284 BLAKE2B a4f4f886636b920a987942524f504c0049ca3c9d9ca5be16101109235e77e9a8a14106fee9fb2d02d403a056dcf5f42b0a4e4f57d33dbc78a88e0df5682162f8 SHA512 0b212e847ef8972bbc9dc96685c9fafcef5552e96c622134cb1aac903aa3f6f5a1aa65a2f179e93396fcf32ea4139a34f46c4e6fb3558c9da8579282095d1baa
 DIST gopkg.in%2Fsquare%2Fgo-jose.v2%2F@v%2Fv2.4.0.mod 34 BLAKE2B 618a69c0e95948b23d494ad15cc5572b4d0cd35929ae65433b179b7482b70ae86167346300267b20c48814313278e1ff43e92935899d1405e7561d6c994e2f15 SHA512 a9022561a9dfe5056793fe3dc81625b8093eb32c67c5cba0ab5d82348aa72f1deeca161603773369c4f02ef4e753c0f751819199b292326277a149546ae54e62
 DIST gopkg.in%2Fsquare%2Fgo-jose.v2%2F@v%2Fv2.4.0.zip 347725 BLAKE2B 2af6055809b90346269333b5ffc1c44802ab613d3f37325385b6e36f74740f3ab701e756950252ca375d59af2f8b1ec19689b9237c2d24f81a8e1daa41cb80eb SHA512 cf0551e8b01220d1472d88e08a3e3646c8001dd4605d2c8cb6e665c08c96904c4cdcdf994f27088972300b3511f699ed4ef8b45e0b6d1d9258e5700fac2d75cc
+DIST gopkg.in%2Fsquare%2Fgo-jose.v2%2F@v%2Fv2.5.1.mod 34 BLAKE2B 618a69c0e95948b23d494ad15cc5572b4d0cd35929ae65433b179b7482b70ae86167346300267b20c48814313278e1ff43e92935899d1405e7561d6c994e2f15 SHA512 a9022561a9dfe5056793fe3dc81625b8093eb32c67c5cba0ab5d82348aa72f1deeca161603773369c4f02ef4e753c0f751819199b292326277a149546ae54e62
+DIST gopkg.in%2Fsquare%2Fgo-jose.v2%2F@v%2Fv2.5.1.zip 353844 BLAKE2B e4d24ee5a99951c19c32328d6eef3fd6c886338bc7189eec9e60c99fe89e5728b3f00824d0f321bbc921738a40900d8d90ab4d9879e8efee529ed4273df0c2a1 SHA512 7ec385824affaaa72aca2b5af052dc7e941a24b1712e0e1945fe6276df3b02ca9eaaf79fdc0888e398aaf10ce3b261f0d23b2c6485184e6a6587e1d04f1c8742
 DIST gopkg.in%2Ftomb.v1%2F@v%2Fv1.0.0-20141024135613-dd632973f1e7.mod 24 BLAKE2B 24a0c476e6590543f1b46175c4f0e036498afd9af616f6e204cac280e61cc10454e0c2a54fe10b9a7a306715ab966a5822ad78626c6cf20c2c78aac02598c922 SHA512 b147b03cabc4666519b94f4d9c7d9fefdea45810e3e35a9b3d303dba491d486fe03c0d5969a6186adbb9c75665e4f3e9811c7bf4ce72c46280b053611c198c41
 DIST gopkg.in%2Ftomb.v1%2F@v%2Fv1.0.0-20141024135613-dd632973f1e7.zip 5099 BLAKE2B 56a68e317ccf9e6b0912331e7006742c3bfffd087742293b3d48ca7069c707db57b3722179c76b8c724303c8d58ac9ebf847c4277ed38a59e1510c676ebc941c SHA512 658ebdf931b23afe9d9d5d33d6c910fba7cf37740efe7052ba7627199c1a5fa4f93f093796674e341109430ba1f1b5ea933ea4a32356f63eaf337f05a562004a
 DIST gopkg.in%2Fyaml.v2%2F@v%2Fv2.0.0-20170812160011-eb3733d160e7.mod 24 BLAKE2B 1cb17a1c6b1eb33cebd983f9e965f6db03f5095441d7cd72aff6df805501eef4dc249c22ecc85da360c27696a7c4ae613f0769a1f89e73f286281de89ffd3ef2 SHA512 89b481cc62ed7a486990ebfcf65cf7a344e5d189deef680e6ddd82dc93f31d166af05fc27b4a95ea27c33fd3ced1b87d4050d617d52008ca059c4a5d3b6c26a9
@@ -1170,6 +1326,8 @@ DIST gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.7.mod 95 BLAKE2B adb3684980f1d8e6c23444e9102
 DIST gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.7.zip 80579 BLAKE2B d5de9f0dbf72902ec2244971ef1d62790008d5686ec66b67ca5ded08503168e507d7afdbc38fbfe3b431432e32d2c79540e407a2916ea93de24d45040262366a SHA512 c4a38c485edfd1773be4d3b3dd97c475b1894603526f5d95b40a3ba34b148f3979f0983444009d716e106fea0a2362836a5277f49ea21f764a55279f343a3920
 DIST gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.8.mod 95 BLAKE2B adb3684980f1d8e6c23444e91028f8db55f1bc496114eb3508dbecf9917dbc8a0a4bed7c0d761123335a75b9ffe727e180f2d6aa5f84312edb05a798185c8362 SHA512 916ff67ddb6c2ba39905db4277ce42596d9ca5a42f8aa7f47f16335e78d91a1b30419fd1b7b6967b37e248363397ec527b38d2f500b3546edda5d2bce1944379
 DIST gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.8.zip 80666 BLAKE2B ff3645b71cedd41b9fef6e5d01f3d89a2db6930f406aded7889530b04689ea34b53fa2a7af352c264681ee40b1d192c86ca2f7dcc33dca825d355694527e4dbf SHA512 19f019e85b8c9a533c3cf2fd492b1813272f00cce06a56ffe43046935e49ccf6e191ce83f1d236f6355bae7126aa722016f05174687ff2faf54f121958266edf
+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 grpc.go4.org%2F@v%2Fv0.0.0-20170609214715-11d0a25b4919.mod 20 BLAKE2B e14762111ddcb60b4b0d52ea4ef58dd26501463483aebf674713b6cca9a2a7a000c77f212c0fc0764ae69891b0c307c97bcdbc3bfb1f3fa5032582689bcefb89 SHA512 2a842877eb3d9f5d1a51864053d1dcafc6f74cf834cf597d1c167da6040a3842d409f4bb8ceaec80049ec0f70c4b42603016bee64539616e2f988160c5409afd
 DIST honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.0-20180728063816-88497007e858.mod 26 BLAKE2B db6cc87a17bed88b955e6b36a17568930239c94a969211b02c2d5acc70386fbea63ac44365a0d3241e900125bd64644d698d8f1bdcabc3e6cf99c47259c63df5 SHA512 d00ae74b24e7fb3ff351ff68b88e59636153bbcf92b36e81e91556e3e75a7ccfb08ce471f757f92fd7612378944de3d7309c73923812e2df6a26b74e999ca9ce
 DIST honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.0-20190102054323-c2f93a96b099.mod 26 BLAKE2B db6cc87a17bed88b955e6b36a17568930239c94a969211b02c2d5acc70386fbea63ac44365a0d3241e900125bd64644d698d8f1bdcabc3e6cf99c47259c63df5 SHA512 d00ae74b24e7fb3ff351ff68b88e59636153bbcf92b36e81e91556e3e75a7ccfb08ce471f757f92fd7612378944de3d7309c73923812e2df6a26b74e999ca9ce
@@ -1197,4 +1355,5 @@ DIST sourcegraph.com%2Fsourcegraph%2Fgo-diff%2F@v%2Fv0.5.0.mod 288 BLAKE2B e8f36
 DIST sourcegraph.com%2Fsqs%2Fpbtypes%2F@v%2Fv0.0.0-20180604144634-d3ebe8f20ae4.mod 35 BLAKE2B ff9ae0413ef6833c8d2f6ea3938e675256d2c44e38b31cee5223b7a1bcd3ef38515337ef388a155b171bc18d2f5153bef2ad0b0cf06b7c3d01145e5a13338aa7 SHA512 4316ef9aa90178d1f45938d1c81e6e0ab0618eeae3337bdf1bb2509d05c7b0e22e42fc2f86cc5d2a6fb1fdefc50ac68acc030e1d2cce8277314bbc2cc101c262
 DIST sourcegraph.com%2Fsqs%2Fpbtypes%2F@v%2Fv1.0.0.mod 76 BLAKE2B 2b8d5265d8f690bdfe78bc571e24d3b5f51dd9dadbf87cd5a5019ddf5a54cd8a9f895e65ecf216bad03687115d404d8e8637a6b2b5aafb19c6988340a1da3574 SHA512 c8b52c1a238330c05e1baf979ab78726f8276944b1d9ab93334f9020c7ca2cd3fb39008e1e56c5399916a6da6a1ff896346c6616ea1fe2cbacc01202a2d56e06
 EBUILD caddy-2.0.0.ebuild 66030 BLAKE2B 6b32af19bfa3a76058d88fc019f16e1b03d07fb6e1e15cd8c8d455f6aded141270fa1726f1a6b816a5349025f88dfda20345eb8eae963d61632f94abd1f8e759 SHA512 453fefda0c13df71a2fec8f31ed21edb32e0d1b5ab1a9249b72f32cca901d993ccfbcdf0ce3092afe598783e55767906808720616098ce0464602e7140a3e1f8
+EBUILD caddy-2.2.1.ebuild 53306 BLAKE2B bf403bb629f50929b50543a2b6392176ff7b74ccfa55ba00717fa96a4bb232774290562c59029802e40989a2aaa823406225378de693fecc11511efebc27cf83 SHA512 c5233747f3202e5335fb1c9466f587a8ac42e30f82383a4d98d48b9660b5225294aac1b03ed42afd9ccb45eed8a7050737b6e7fd5d6b439899bb0ed30faa04c4
 MISC metadata.xml 243 BLAKE2B db1542294c2fef7bcf6f008542d87fc1661eeb5ba5caee9658a0b2f803f17c30b26523fe6d252f70d692b52e85ba7c7c16567316ce33a534cf250a169e2b0f36 SHA512 9f804a00b8c8d98d3c097b0487f8f528d3648a316214b0009292903d0930f6808fde06be5a3b2b938203ee124f9102e7f15a1446e468c26e057cba332f70c539
diff --git a/www-servers/caddy/caddy-2.2.1.ebuild b/www-servers/caddy/caddy-2.2.1.ebuild
new file mode 100644
index 000000000000..c9836590b062
--- /dev/null
+++ b/www-servers/caddy/caddy-2.2.1.ebuild
@@ -0,0 +1,991 @@
+# Copyright 2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit go-module
+
+DESCRIPTION="Fast, cross-platform HTTP/2 web server with automatic HTTPS"
+HOMEPAGE="https://caddyserver.com"
+
+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"
+	"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.51.0"
+	"cloud.google.com/go v0.51.0/go.mod"
+	"cloud.google.com/go/bigquery v1.0.1/go.mod"
+	"cloud.google.com/go/datastore v1.0.0/go.mod"
+	"cloud.google.com/go/pubsub v1.0.1/go.mod"
+	"cloud.google.com/go/storage v1.0.0/go.mod"
+	"contrib.go.opencensus.io/exporter/stackdriver v0.12.1/go.mod"
+	"contrib.go.opencensus.io/resource v0.1.1/go.mod"
+	"dmitri.shuralyov.com/app/changes v0.0.0-20180602232624-0a106ad413e3/go.mod"
+	"dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/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/AndreasBriese/bbloom v0.0.0-20190306092124-e2d15f34fcf9"
+	"github.com/AndreasBriese/bbloom v0.0.0-20190306092124-e2d15f34fcf9/go.mod"
+	"github.com/BurntSushi/toml v0.3.1"
+	"github.com/BurntSushi/toml v0.3.1/go.mod"
+	"github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod"
+	"github.com/DataDog/zstd v1.4.1"
+	"github.com/DataDog/zstd v1.4.1/go.mod"
+	"github.com/GeertJohan/go.incremental v1.0.0/go.mod"
+	"github.com/GeertJohan/go.rice v1.0.0/go.mod"
+	"github.com/Masterminds/glide v0.13.2/go.mod"
+	"github.com/Masterminds/goutils v1.1.0"
+	"github.com/Masterminds/goutils v1.1.0/go.mod"
+	"github.com/Masterminds/semver v1.4.2"
+	"github.com/Masterminds/semver v1.4.2/go.mod"
+	"github.com/Masterminds/semver/v3 v3.1.0"
+	"github.com/Masterminds/semver/v3 v3.1.0/go.mod"
+	"github.com/Masterminds/sprig/v3 v3.1.0"
+	"github.com/Masterminds/sprig/v3 v3.1.0/go.mod"
+	"github.com/Masterminds/vcs v1.13.0/go.mod"
+	"github.com/Microsoft/go-winio v0.4.14/go.mod"
+	"github.com/OneOfOne/xxhash v1.2.2"
+	"github.com/OneOfOne/xxhash v1.2.2/go.mod"
+	"github.com/OpenPeeDeeP/depguard v1.0.0/go.mod"
+	"github.com/OpenPeeDeeP/depguard v1.0.1/go.mod"
+	"github.com/StackExchange/wmi v0.0.0-20180116203802-5d049714c4a6/go.mod"
+	"github.com/ThomasRooney/gexpect v0.0.0-20161231170123-5482f0350944/go.mod"
+	"github.com/akavel/rsrc v0.8.0/go.mod"
+	"github.com/alecthomas/assert v0.0.0-20170929043011-405dbfeb8e38"
+	"github.com/alecthomas/assert v0.0.0-20170929043011-405dbfeb8e38/go.mod"
+	"github.com/alecthomas/chroma v0.7.2-0.20200305040604-4f3623dce67a/go.mod"
+	"github.com/alecthomas/chroma v0.8.0"
+	"github.com/alecthomas/chroma v0.8.0/go.mod"
+	"github.com/alecthomas/colour v0.0.0-20160524082231-60882d9e2721"
+	"github.com/alecthomas/colour v0.0.0-20160524082231-60882d9e2721/go.mod"
+	"github.com/alecthomas/kong v0.1.17-0.20190424132513-439c674f7ae0/go.mod"
+	"github.com/alecthomas/kong v0.2.1-0.20190708041108-0548c6b1afae/go.mod"
+	"github.com/alecthomas/kong v0.2.4/go.mod"
+	"github.com/alecthomas/kong-hcl v0.1.8-0.20190615233001-b21fea9723c8/go.mod"
+	"github.com/alecthomas/repr v0.0.0-20180818092828-117648cd9897"
+	"github.com/alecthomas/repr v0.0.0-20180818092828-117648cd9897/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/anmitsu/go-shlex v0.0.0-20161002113705-648efa622239/go.mod"
+	"github.com/antihax/optional v0.0.0-20180407024304-ca021399b1a6/go.mod"
+	"github.com/antlr/antlr4 v0.0.0-20200503195918-621b933c7a7f"
+	"github.com/antlr/antlr4 v0.0.0-20200503195918-621b933c7a7f/go.mod"
+	"github.com/armon/consul-api v0.0.0-20180202201655-eb2c6b5be1b6/go.mod"
+	"github.com/aryann/difflib v0.0.0-20170710044230-e206f873d14a"
+	"github.com/aryann/difflib v0.0.0-20170710044230-e206f873d14a/go.mod"
+	"github.com/asaskevich/govalidator v0.0.0-20180720115003-f9ffefc3facf/go.mod"
+	"github.com/aws/aws-sdk-go v1.19.18/go.mod"
+	"github.com/aws/aws-sdk-go v1.30.29"
+	"github.com/aws/aws-sdk-go v1.30.29/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/bombsimon/wsl/v2 v2.0.0/go.mod"
+	"github.com/boombuler/barcode v1.0.0/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/caddyserver/certmagic v0.12.0"
+	"github.com/caddyserver/certmagic v0.12.0/go.mod"
+	"github.com/census-instrumentation/opencensus-proto v0.2.0/go.mod"
+	"github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod"
+	"github.com/cespare/xxhash v1.1.0"
+	"github.com/cespare/xxhash v1.1.0/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/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/codegangsta/cli v1.20.0/go.mod"
+	"github.com/coreos/bbolt v1.3.2/go.mod"
+	"github.com/coreos/bbolt v1.3.3/go.mod"
+	"github.com/coreos/etcd v3.3.10+incompatible/go.mod"
+	"github.com/coreos/etcd v3.3.13+incompatible/go.mod"
+	"github.com/coreos/etcd v3.3.18+incompatible/go.mod"
+	"github.com/coreos/go-etcd v2.0.0+incompatible/go.mod"
+	"github.com/coreos/go-semver v0.2.0/go.mod"
+	"github.com/coreos/go-semver v0.3.0/go.mod"
+	"github.com/coreos/go-systemd v0.0.0-20181012123002-c6f51f82210d/go.mod"
+	"github.com/coreos/go-systemd v0.0.0-20190321100706-95778dfbb74e/go.mod"
+	"github.com/coreos/pkg v0.0.0-20180928190104-399ea9e2e55f/go.mod"
+	"github.com/corpix/uarand v0.1.1/go.mod"
+	"github.com/cpuguy83/go-md2man v1.0.10"
+	"github.com/cpuguy83/go-md2man v1.0.10/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/daaku/go.zipexe v1.0.0/go.mod"
+	"github.com/danwakefield/fnmatch v0.0.0-20160403171240-cbb64ac3d964"
+	"github.com/danwakefield/fnmatch v0.0.0-20160403171240-cbb64ac3d964/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/dgraph-io/badger v1.5.3"
+	"github.com/dgraph-io/badger v1.5.3/go.mod"
+	"github.com/dgraph-io/badger/v2 v2.0.1-rc1.0.20200413122845-09dd2e1a4195"
+	"github.com/dgraph-io/badger/v2 v2.0.1-rc1.0.20200413122845-09dd2e1a4195/go.mod"
+	"github.com/dgraph-io/ristretto v0.0.2-0.20200115201040-8f368f2f2ab3"
+	"github.com/dgraph-io/ristretto v0.0.2-0.20200115201040-8f368f2f2ab3/go.mod"
+	"github.com/dgrijalva/jwt-go v3.2.0+incompatible/go.mod"
+	"github.com/dgryski/go-farm v0.0.0-20190423205320-6a90982ecee2"
+	"github.com/dgryski/go-farm v0.0.0-20190423205320-6a90982ecee2/go.mod"
+	"github.com/dgryski/go-sip13 v0.0.0-20181026042036-e10d5fee7954/go.mod"
+	"github.com/dlclark/regexp2 v1.1.6/go.mod"
+	"github.com/dlclark/regexp2 v1.2.0"
+	"github.com/dlclark/regexp2 v1.2.0/go.mod"
+	"github.com/dustin/go-humanize v1.0.0/go.mod"
+	"github.com/dustin/go-humanize v1.0.1-0.20200219035652-afde56e7acac"
+	"github.com/dustin/go-humanize v1.0.1-0.20200219035652-afde56e7acac/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.6.0/go.mod"
+	"github.com/fatih/color v1.7.0/go.mod"
+	"github.com/fatih/color v1.8.0/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/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/ghodss/yaml v1.0.0/go.mod"
+	"github.com/gliderlabs/ssh v0.1.1/go.mod"
+	"github.com/go-chi/chi v4.0.2+incompatible/go.mod"
+	"github.com/go-chi/chi v4.1.2+incompatible"
+	"github.com/go-chi/chi v4.1.2+incompatible/go.mod"
+	"github.com/go-critic/go-critic v0.3.5-0.20190526074819-1df300866540/go.mod"
+	"github.com/go-critic/go-critic v0.4.0/go.mod"
+	"github.com/go-errors/errors v1.0.1/go.mod"
+	"github.com/go-gl/glfw/v3.3/glfw v0.0.0-20191125211704-12ad95a8df72/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-lintpack/lintpack v0.5.2/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-ole/go-ole v1.2.1/go.mod"
+	"github.com/go-piv/piv-go v1.5.0/go.mod"
+	"github.com/go-sql-driver/mysql v1.4.1/go.mod"
+	"github.com/go-sql-driver/mysql v1.5.0"
+	"github.com/go-sql-driver/mysql v1.5.0/go.mod"
+	"github.com/go-stack/stack v1.8.0/go.mod"
+	"github.com/go-toolsmith/astcast v1.0.0/go.mod"
+	"github.com/go-toolsmith/astcopy v1.0.0/go.mod"
+	"github.com/go-toolsmith/astequal v0.0.0-20180903214952-dcb477bfacd6/go.mod"
+	"github.com/go-toolsmith/astequal v1.0.0/go.mod"
+	"github.com/go-toolsmith/astfmt v0.0.0-20180903215011-8f8ee99c3086/go.mod"
+	"github.com/go-toolsmith/astfmt v1.0.0/go.mod"
+	"github.com/go-toolsmith/astinfo v0.0.0-20180906194353-9809ff7efb21/go.mod"
+	"github.com/go-toolsmith/astp v0.0.0-20180903215135-0af7e3c24f30/go.mod"
+	"github.com/go-toolsmith/astp v1.0.0/go.mod"
+	"github.com/go-toolsmith/pkgload v0.0.0-20181119091011-e9e65178eee8/go.mod"
+	"github.com/go-toolsmith/pkgload v1.0.0/go.mod"
+	"github.com/go-toolsmith/strparse v1.0.0/go.mod"
+	"github.com/go-toolsmith/typep v1.0.0/go.mod"
+	"github.com/gobwas/glob v0.2.3/go.mod"
+	"github.com/gofrs/flock v0.0.0-20190320160742-5135e617513b/go.mod"
+	"github.com/gogo/protobuf v1.1.1/go.mod"
+	"github.com/gogo/protobuf v1.2.1/go.mod"
+	"github.com/gogo/protobuf v1.3.1/go.mod"
+	"github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b"
+	"github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod"
+	"github.com/golang/groupcache v0.0.0-20190129154638-5b532d6fd5ef/go.mod"
+	"github.com/golang/groupcache v0.0.0-20190702054246-869f871628b6/go.mod"
+	"github.com/golang/groupcache v0.0.0-20191027212112-611e8accdfc9/go.mod"
+	"github.com/golang/groupcache v0.0.0-20191227052852-215e87163ea7"
+	"github.com/golang/groupcache v0.0.0-20191227052852-215e87163ea7/go.mod"
+	"github.com/golang/lint v0.0.0-20180702182130-06c8688daad7/go.mod"
+	"github.com/golang/mock v1.0.0/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.4"
+	"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.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"
+	"github.com/golang/protobuf v1.4.2/go.mod"
+	"github.com/golang/snappy v0.0.1"
+	"github.com/golang/snappy v0.0.1/go.mod"
+	"github.com/golangci/check v0.0.0-20180506172741-cfe4005ccda2/go.mod"
+	"github.com/golangci/dupl v0.0.0-20180902072040-3e9179ac440a/go.mod"
+	"github.com/golangci/errcheck v0.0.0-20181223084120-ef45e06d44b6/go.mod"
+	"github.com/golangci/go-misc v0.0.0-20180628070357-927a3d87b613/go.mod"
+	"github.com/golangci/go-tools v0.0.0-20190318055746-e32c54105b7c/go.mod"
+	"github.com/golangci/goconst v0.0.0-20180610141641-041c5f2b40f3/go.mod"
+	"github.com/golangci/gocyclo v0.0.0-20180528134321-2becd97e67ee/go.mod"
+	"github.com/golangci/gocyclo v0.0.0-20180528144436-0a533e8fa43d/go.mod"
+	"github.com/golangci/gofmt v0.0.0-20181222123516-0b8337e80d98/go.mod"
+	"github.com/golangci/gofmt v0.0.0-20190930125516-244bba706f1a/go.mod"
+	"github.com/golangci/golangci-lint v1.17.2-0.20190910081718-bad04bb7378f/go.mod"
+	"github.com/golangci/golangci-lint v1.22.2/go.mod"
+	"github.com/golangci/gosec v0.0.0-20190211064107-66fb7fc33547/go.mod"
+	"github.com/golangci/ineffassign v0.0.0-20190609212857-42439a7714cc/go.mod"
+	"github.com/golangci/lint-1 v0.0.0-20190420132249-ee948d087217/go.mod"
+	"github.com/golangci/lint-1 v0.0.0-20191013205115-297bf364a8e0/go.mod"
+	"github.com/golangci/maligned v0.0.0-20180506175553-b1d89398deca/go.mod"
+	"github.com/golangci/misspell v0.0.0-20180809174111-950f5d19e770/go.mod"
+	"github.com/golangci/prealloc v0.0.0-20180630174525-215b22d4de21/go.mod"
+	"github.com/golangci/revgrep v0.0.0-20180526074752-d9c87f5ffaf0/go.mod"
+	"github.com/golangci/revgrep v0.0.0-20180812185044-276a5c0a1039/go.mod"
+	"github.com/golangci/unconvert v0.0.0-20180507085042-28b1c447d1f4/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/cel-go v0.5.1"
+	"github.com/google/cel-go v0.5.1/go.mod"
+	"github.com/google/cel-spec v0.4.0/go.mod"
+	"github.com/google/certificate-transparency-go v1.1.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"
+	"github.com/google/go-cmp v0.4.0/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/monologue v0.0.0-20190606152607-4b11a32b5934/go.mod"
+	"github.com/google/monologue v0.0.0-20191220140058-35abc9683a6c/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/renameio v0.1.0/go.mod"
+	"github.com/google/trillian v1.2.2-0.20190612132142-05461f4df60a/go.mod"
+	"github.com/google/trillian-examples v0.0.0-20190603134952-4e75ba15216c/go.mod"
+	"github.com/google/uuid v1.0.0/go.mod"
+	"github.com/google/uuid v1.1.1"
+	"github.com/google/uuid v1.1.1/go.mod"
+	"github.com/googleapis/gax-go v2.0.0+incompatible"
+	"github.com/googleapis/gax-go v2.0.0+incompatible/go.mod"
+	"github.com/googleapis/gax-go/v2 v2.0.3/go.mod"
+	"github.com/googleapis/gax-go/v2 v2.0.4/go.mod"
+	"github.com/googleapis/gax-go/v2 v2.0.5"
+	"github.com/googleapis/gax-go/v2 v2.0.5/go.mod"
+	"github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1/go.mod"
+	"github.com/gorilla/csrf v1.6.0/go.mod"
+	"github.com/gorilla/handlers v1.4.1/go.mod"
+	"github.com/gorilla/mux v1.7.3/go.mod"
+	"github.com/gorilla/securecookie v1.1.1/go.mod"
+	"github.com/gorilla/websocket v1.4.0/go.mod"
+	"github.com/gorilla/websocket v1.4.1/go.mod"
+	"github.com/gostaticanalysis/analysisutil v0.0.0-20190318220348-4088753ea4d3/go.mod"
+	"github.com/gostaticanalysis/analysisutil v0.0.3/go.mod"
+	"github.com/gregjones/httpcache v0.0.0-20180305231024-9cad4c3443a7/go.mod"
+	"github.com/grpc-ecosystem/go-grpc-middleware v1.0.0/go.mod"
+	"github.com/grpc-ecosystem/go-grpc-middleware v1.1.0/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.0/go.mod"
+	"github.com/grpc-ecosystem/grpc-gateway v1.12.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/hcl v0.0.0-20180404174102-ef8a98b0bbce/go.mod"
+	"github.com/hashicorp/hcl v1.0.0/go.mod"
+	"github.com/hpcloud/tail v1.0.0/go.mod"
+	"github.com/huandu/xstrings v1.3.1"
+	"github.com/huandu/xstrings v1.3.1/go.mod"
+	"github.com/ianlancetaylor/demangle v0.0.0-20181102032728-5e5cf60278f6/go.mod"
+	"github.com/icrowley/fake v0.0.0-20180203215853-4178557ae428/go.mod"
+	"github.com/imdario/mergo v0.3.8"
+	"github.com/imdario/mergo v0.3.8/go.mod"
+	"github.com/inconshreveable/mousetrap v1.0.0/go.mod"
+	"github.com/jellevandenhooff/dkim v0.0.0-20150330215556-f50fe3d243e1/go.mod"
+	"github.com/jessevdk/go-flags v1.4.0/go.mod"
+	"github.com/jmespath/go-jmespath v0.0.0-20180206201540-c2b33e8439af/go.mod"
+	"github.com/jmespath/go-jmespath v0.3.0"
+	"github.com/jmespath/go-jmespath v0.3.0/go.mod"
+	"github.com/jonboulle/clockwork v0.1.0/go.mod"
+	"github.com/json-iterator/go v1.1.6/go.mod"
+	"github.com/json-iterator/go v1.1.8/go.mod"
+	"github.com/json-iterator/go v1.1.9/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/jstemmer/go-junit-report v0.9.1/go.mod"
+	"github.com/jsternberg/zap-logfmt v1.2.0"
+	"github.com/jsternberg/zap-logfmt v1.2.0/go.mod"
+	"github.com/jtolds/gls v4.20.0+incompatible/go.mod"
+	"github.com/juju/ansiterm v0.0.0-20180109212912-720a0952cc2a"
+	"github.com/juju/ansiterm v0.0.0-20180109212912-720a0952cc2a/go.mod"
+	"github.com/juju/ratelimit v1.0.1/go.mod"
+	"github.com/julienschmidt/httprouter v1.2.0/go.mod"
+	"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.2.0/go.mod"
+	"github.com/kisielk/gotool v0.0.0-20161130080628-0de1eaf82fa3/go.mod"
+	"github.com/kisielk/gotool v1.0.0/go.mod"
+	"github.com/klauspost/compress v1.4.0/go.mod"
+	"github.com/klauspost/compress v1.4.1/go.mod"
+	"github.com/klauspost/compress v1.11.0"
+	"github.com/klauspost/compress v1.11.0/go.mod"
+	"github.com/klauspost/cpuid v0.0.0-20180405133222-e7e905edc00e/go.mod"
+	"github.com/klauspost/cpuid v1.2.0/go.mod"
+	"github.com/klauspost/cpuid v1.2.5"
+	"github.com/klauspost/cpuid v1.2.5/go.mod"
+	"github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod"
+	"github.com/konsorten/go-windows-terminal-sequences v1.0.2"
+	"github.com/konsorten/go-windows-terminal-sequences v1.0.2/go.mod"
+	"github.com/kr/logfmt v0.0.0-20140226030751-b84e30acd515/go.mod"
+	"github.com/kr/pretty v0.1.0"
+	"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/pty v1.1.8/go.mod"
+	"github.com/kr/text v0.1.0"
+	"github.com/kr/text v0.1.0/go.mod"
+	"github.com/kylelemons/godebug v1.1.0"
+	"github.com/kylelemons/godebug v1.1.0/go.mod"
+	"github.com/letsencrypt/pkcs11key v2.0.1-0.20170608213348-396559074696+incompatible/go.mod"
+	"github.com/lib/pq v1.1.1/go.mod"
+	"github.com/lib/pq v1.2.0/go.mod"
+	"github.com/libdns/libdns v0.1.0"
+	"github.com/libdns/libdns v0.1.0/go.mod"
+	"github.com/logrusorgru/aurora v0.0.0-20181002194514-a7b3b318ed4e/go.mod"
+	"github.com/lucas-clemente/quic-go v0.18.0"
+	"github.com/lucas-clemente/quic-go v0.18.0/go.mod"
+	"github.com/lunixbochs/vtclean v1.0.0"
+	"github.com/lunixbochs/vtclean v1.0.0/go.mod"
+	"github.com/magiconair/properties v1.7.6/go.mod"
+	"github.com/magiconair/properties v1.8.0/go.mod"
+	"github.com/magiconair/properties v1.8.1/go.mod"
+	"github.com/mailru/easyjson v0.0.0-20190312143242-1de009706dbe/go.mod"
+	"github.com/manifoldco/promptui v0.3.1"
+	"github.com/manifoldco/promptui v0.3.1/go.mod"
+	"github.com/marten-seemann/qpack v0.2.0"
+	"github.com/marten-seemann/qpack v0.2.0/go.mod"
+	"github.com/marten-seemann/qtls v0.10.0"
+	"github.com/marten-seemann/qtls v0.10.0/go.mod"
+	"github.com/marten-seemann/qtls-go1-15 v0.1.0"
+	"github.com/marten-seemann/qtls-go1-15 v0.1.0/go.mod"
+	"github.com/matoous/godox v0.0.0-20190911065817-5d6d842e92eb/go.mod"
+	"github.com/mattn/go-colorable v0.0.9/go.mod"
+	"github.com/mattn/go-colorable v0.1.4/go.mod"
+	"github.com/mattn/go-colorable v0.1.6"
+	"github.com/mattn/go-colorable v0.1.6/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.8/go.mod"
+	"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/mattn/go-runewidth v0.0.7/go.mod"
+	"github.com/mattn/go-sqlite3 v1.10.0/go.mod"
+	"github.com/mattn/goveralls 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/mholt/acmez v0.1.1"
+	"github.com/mholt/acmez v0.1.1/go.mod"
+	"github.com/microcosm-cc/bluemonday v1.0.1/go.mod"
+	"github.com/miekg/dns v1.1.30"
+	"github.com/miekg/dns v1.1.30/go.mod"
+	"github.com/miekg/pkcs11 v1.0.2/go.mod"
+	"github.com/mitchellh/copystructure v1.0.0"
+	"github.com/mitchellh/copystructure v1.0.0/go.mod"
+	"github.com/mitchellh/go-homedir v1.0.0/go.mod"
+	"github.com/mitchellh/go-homedir v1.1.0/go.mod"
+	"github.com/mitchellh/go-ps v0.0.0-20170309133038-4fdf99ab2936/go.mod"
+	"github.com/mitchellh/go-ps v0.0.0-20190716172923-621e5597135b/go.mod"
+	"github.com/mitchellh/mapstructure v0.0.0-20180220230111-00c29f56e238/go.mod"
+	"github.com/mitchellh/mapstructure v1.1.2/go.mod"
+	"github.com/mitchellh/reflectwalk v1.0.0"
+	"github.com/mitchellh/reflectwalk v1.0.0/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/mohae/deepcopy v0.0.0-20170929034955-c48cc78d4826/go.mod"
+	"github.com/mozilla/tls-observatory v0.0.0-20180409132520-8791a200eb40/go.mod"
+	"github.com/mozilla/tls-observatory v0.0.0-20190404164649-a3c1b6cfecfd/go.mod"
+	"github.com/mreiferson/go-httpclient v0.0.0-20160630210159-31f0106b4474/go.mod"
+	"github.com/mwitkow/go-conntrack v0.0.0-20161129095857-cc309e4a2223/go.mod"
+	"github.com/naoina/go-stringutil v0.1.0"
+	"github.com/naoina/go-stringutil v0.1.0/go.mod"
+	"github.com/naoina/toml v0.1.1"
+	"github.com/naoina/toml v0.1.1/go.mod"
+	"github.com/nbutton23/zxcvbn-go v0.0.0-20160627004424-a22cb81b2ecd/go.mod"
+	"github.com/nbutton23/zxcvbn-go v0.0.0-20171102151520-eafdab6b0663/go.mod"
+	"github.com/nbutton23/zxcvbn-go v0.0.0-20180912185939-ae427f1e4c1d/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/newrelic/go-agent v2.15.0+incompatible/go.mod"
+	"github.com/ngdinhtoan/glide-cleanup v0.2.0/go.mod"
+	"github.com/nkovacs/streamquote v0.0.0-20170412213628-49af9bddb229/go.mod"
+	"github.com/nxadm/tail v1.4.4"
+	"github.com/nxadm/tail v1.4.4/go.mod"
+	"github.com/oklog/ulid v1.3.1/go.mod"
+	"github.com/olekukonko/tablewriter v0.0.1/go.mod"
+	"github.com/olekukonko/tablewriter v0.0.4/go.mod"
+	"github.com/onsi/ginkgo v0.0.0-20170829012221-11459a886d9c/go.mod"
+	"github.com/onsi/ginkgo v1.6.0/go.mod"
+	"github.com/onsi/ginkgo v1.10.1/go.mod"
+	"github.com/onsi/ginkgo v1.11.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/gomega v0.0.0-20170829124025-dcabb60a477c/go.mod"
+	"github.com/onsi/gomega v1.4.2/go.mod"
+	"github.com/onsi/gomega v1.7.0/go.mod"
+	"github.com/onsi/gomega v1.7.1/go.mod"
+	"github.com/onsi/gomega v1.8.1/go.mod"
+	"github.com/onsi/gomega v1.10.1"
+	"github.com/onsi/gomega v1.10.1/go.mod"
+	"github.com/op/go-logging v0.0.0-20160315200505-970db520ece7/go.mod"
+	"github.com/opentracing/opentracing-go v1.1.0/go.mod"
+	"github.com/openzipkin/zipkin-go v0.1.1/go.mod"
+	"github.com/pborman/uuid v1.2.0/go.mod"
+	"github.com/pelletier/go-toml v1.1.0/go.mod"
+	"github.com/pelletier/go-toml v1.2.0/go.mod"
+	"github.com/pelletier/go-toml v1.6.0/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/pmezard/go-difflib v1.0.0"
+	"github.com/pmezard/go-difflib v1.0.0/go.mod"
+	"github.com/pquerna/otp v1.0.0/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/go.mod"
+	"github.com/prometheus/client_golang v0.9.4/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"
+	"github.com/prometheus/client_golang v1.7.1/go.mod"
+	"github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910/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.0.0-20181113130724-41aa239b4cce/go.mod"
+	"github.com/prometheus/common v0.4.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"
+	"github.com/prometheus/common v0.10.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-20190507164030-5867b95ac084/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"
+	"github.com/prometheus/procfs v0.1.3/go.mod"
+	"github.com/prometheus/tsdb v0.7.1/go.mod"
+	"github.com/quasilyte/go-consistent v0.0.0-20190521200055-c6f3937de18c/go.mod"
+	"github.com/rogpeppe/fastuuid v0.0.0-20150106093220-6724a57986af/go.mod"
+	"github.com/rogpeppe/fastuuid v1.2.0/go.mod"
+	"github.com/rogpeppe/go-internal v1.1.0/go.mod"
+	"github.com/rogpeppe/go-internal v1.3.0/go.mod"
+	"github.com/rogpeppe/go-internal v1.3.2/go.mod"
+	"github.com/rs/cors v1.6.0/go.mod"
+	"github.com/rs/xid v1.2.1"
+	"github.com/rs/xid v1.2.1/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"
+	"github.com/russross/blackfriday/v2 v2.0.1/go.mod"
+	"github.com/ryanuber/go-glob v0.0.0-20170128012129-256dc444b735/go.mod"
+	"github.com/samfoo/ansi v0.0.0-20160124022901-b6bd2ded7189"
+	"github.com/samfoo/ansi v0.0.0-20160124022901-b6bd2ded7189/go.mod"
+	"github.com/securego/gosec v0.0.0-20191002120514-e680875ea14d/go.mod"
+	"github.com/securego/gosec v0.0.0-20200106085552-9cb83e10afad/go.mod"
+	"github.com/sergi/go-diff v1.0.0"
+	"github.com/sergi/go-diff v1.0.0/go.mod"
+	"github.com/shirou/gopsutil v0.0.0-20180427012116-c95755e4bcd7/go.mod"
+	"github.com/shirou/gopsutil v0.0.0-20190901111213-e4ec7b275ada/go.mod"
+	"github.com/shirou/w32 v0.0.0-20160930032740-bb4de0191aa4/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"
+	"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.0.5/go.mod"
+	"github.com/sirupsen/logrus v1.2.0/go.mod"
+	"github.com/sirupsen/logrus v1.3.0/go.mod"
+	"github.com/sirupsen/logrus v1.4.1/go.mod"
+	"github.com/sirupsen/logrus v1.4.2"
+	"github.com/sirupsen/logrus v1.4.2/go.mod"
+	"github.com/smallstep/assert v0.0.0-20180720014142-de77670473b5/go.mod"
+	"github.com/smallstep/assert v0.0.0-20200103212524-b99dc1097b15/go.mod"
+	"github.com/smallstep/assert v0.0.0-20200723003110-82e2b9b3b262"
+	"github.com/smallstep/assert v0.0.0-20200723003110-82e2b9b3b262/go.mod"
+	"github.com/smallstep/certificates v0.15.0/go.mod"
+	"github.com/smallstep/certificates v0.15.1"
+	"github.com/smallstep/certificates v0.15.1/go.mod"
+	"github.com/smallstep/certificates v0.15.4"
+	"github.com/smallstep/certificates v0.15.4/go.mod"
+	"github.com/smallstep/certinfo v1.3.0/go.mod"
+	"github.com/smallstep/cli v0.15.0"
+	"github.com/smallstep/cli v0.15.0/go.mod"
+	"github.com/smallstep/cli v0.15.2"
+	"github.com/smallstep/cli v0.15.2/go.mod"
+	"github.com/smallstep/nosql v0.3.0"
+	"github.com/smallstep/nosql v0.3.0/go.mod"
+	"github.com/smallstep/truststore v0.9.6"
+	"github.com/smallstep/truststore v0.9.6/go.mod"
+	"github.com/smallstep/zcrypto v0.0.0-20200203191936-fbc32cf76bce/go.mod"
+	"github.com/smallstep/zlint v0.0.0-20180727184541-d84eaafe274f/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/sourcegraph/annotate v0.0.0-20160123013949-f4cad6c6324d/go.mod"
+	"github.com/sourcegraph/go-diff v0.5.1/go.mod"
+	"github.com/sourcegraph/syntaxhighlight v0.0.0-20170531221838-bd320f5d308e/go.mod"
+	"github.com/spaolacci/murmur3 v0.0.0-20180118202830-f09979ecbc72/go.mod"
+	"github.com/spaolacci/murmur3 v1.1.0"
+	"github.com/spaolacci/murmur3 v1.1.0/go.mod"
+	"github.com/spf13/afero v1.1.0/go.mod"
+	"github.com/spf13/afero v1.1.2/go.mod"
+	"github.com/spf13/afero v1.2.2/go.mod"
+	"github.com/spf13/cast v1.2.0/go.mod"
+	"github.com/spf13/cast v1.3.0/go.mod"
+	"github.com/spf13/cast v1.3.1"
+	"github.com/spf13/cast v1.3.1/go.mod"
+	"github.com/spf13/cobra v0.0.2/go.mod"
+	"github.com/spf13/cobra v0.0.5/go.mod"
+	"github.com/spf13/jwalterweatherman v0.0.0-20180109140146-7c0cea34c8ec/go.mod"
+	"github.com/spf13/jwalterweatherman v1.0.0/go.mod"
+	"github.com/spf13/jwalterweatherman v1.1.0/go.mod"
+	"github.com/spf13/pflag v1.0.1/go.mod"
+	"github.com/spf13/pflag v1.0.3/go.mod"
+	"github.com/spf13/pflag v1.0.5/go.mod"
+	"github.com/spf13/viper v1.0.2/go.mod"
+	"github.com/spf13/viper v1.3.2/go.mod"
+	"github.com/spf13/viper v1.6.1/go.mod"
+	"github.com/stretchr/objx v0.1.0/go.mod"
+	"github.com/stretchr/objx v0.1.1/go.mod"
+	"github.com/stretchr/objx v0.2.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.5.1"
+	"github.com/stretchr/testify v1.5.1/go.mod"
+	"github.com/subosito/gotenv v1.2.0/go.mod"
+	"github.com/tarm/serial v0.0.0-20180830185346-98f6abe2eb07/go.mod"
+	"github.com/timakin/bodyclose v0.0.0-20190721030226-87058b9bfcec/go.mod"
+	"github.com/timakin/bodyclose v0.0.0-20190930140734-f7f2e9bca95e/go.mod"
+	"github.com/tmc/grpc-websocket-proxy v0.0.0-20190109142713-0ad062ec5ee5/go.mod"
+	"github.com/tomasen/realip v0.0.0-20180522021738-f0c99a92ddce/go.mod"
+	"github.com/tommy-muehle/go-mnd v1.1.1/go.mod"
+	"github.com/ugorji/go v1.1.4/go.mod"
+	"github.com/ugorji/go/codec v0.0.0-20181204163529-d75b2dcb6bc8/go.mod"
+	"github.com/ultraware/funlen v0.0.1/go.mod"
+	"github.com/ultraware/funlen v0.0.2/go.mod"
+	"github.com/ultraware/whitespace v0.0.4/go.mod"
+	"github.com/urfave/cli v1.20.0/go.mod"
+	"github.com/urfave/cli v1.22.2"
+	"github.com/urfave/cli v1.22.2/go.mod"
+	"github.com/uudashr/gocognit v1.0.1/go.mod"
+	"github.com/valyala/bytebufferpool v1.0.0/go.mod"
+	"github.com/valyala/fasthttp v1.2.0/go.mod"
+	"github.com/valyala/fasttemplate v1.0.1/go.mod"
+	"github.com/valyala/quicktemplate v1.1.1/go.mod"
+	"github.com/valyala/quicktemplate v1.2.0/go.mod"
+	"github.com/valyala/tcplisten v0.0.0-20161114210144-ceec8f93295a/go.mod"
+	"github.com/viant/assertly v0.4.8/go.mod"
+	"github.com/viant/toolbox v0.24.0/go.mod"
+	"github.com/weppos/publicsuffix-go v0.4.0/go.mod"
+	"github.com/xiang90/probing v0.0.0-20190116061207-43a291ad63a2/go.mod"
+	"github.com/xordataexchange/crypt v0.0.3-0.20170626215501-b2862e3d0a77/go.mod"
+	"github.com/yuin/goldmark v1.1.22/go.mod"
+	"github.com/yuin/goldmark v1.2.1"
+	"github.com/yuin/goldmark v1.2.1/go.mod"
+	"github.com/yuin/goldmark-highlighting v0.0.0-20200307114337-60d527fdb691"
+	"github.com/yuin/goldmark-highlighting v0.0.0-20200307114337-60d527fdb691/go.mod"
+	"github.com/zmap/rc2 v0.0.0-20131011165748-24b9757f5521/go.mod"
+	"github.com/zmap/rc2 v0.0.0-20190804163417-abaa70531248/go.mod"
+	"github.com/zmap/zcertificate v0.0.0-20180516150559-0e3d58b1bac4/go.mod"
+	"github.com/zmap/zcertificate v0.0.0-20190521191901-30e388164f71/go.mod"
+	"github.com/zmap/zcrypto v0.0.0-20190329181646-dff83107394d/go.mod"
+	"github.com/zmap/zlint v0.0.0-20190516161541-9047d02cf65a/go.mod"
+	"go.etcd.io/bbolt v1.3.2"
+	"go.etcd.io/bbolt v1.3.2/go.mod"
+	"go.etcd.io/etcd v3.3.13+incompatible/go.mod"
+	"go.etcd.io/etcd v3.3.18+incompatible/go.mod"
+	"go.opencensus.io v0.18.0/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.opencensus.io v0.22.2/go.mod"
+	"go.step.sm/crypto v0.0.0-20200805202904-ec18b6df3cf0/go.mod"
+	"go.step.sm/crypto v0.1.1/go.mod"
+	"go.step.sm/crypto v0.2.0"
+	"go.step.sm/crypto v0.2.0/go.mod"
+	"go.step.sm/crypto v0.6.0"
+	"go.step.sm/crypto v0.6.0/go.mod"
+	"go.uber.org/atomic v1.3.2/go.mod"
+	"go.uber.org/atomic v1.4.0/go.mod"
+	"go.uber.org/atomic v1.5.0/go.mod"
+	"go.uber.org/atomic v1.5.1/go.mod"
+	"go.uber.org/atomic v1.6.0"
+	"go.uber.org/atomic v1.6.0/go.mod"
+	"go.uber.org/multierr v1.1.0/go.mod"
+	"go.uber.org/multierr v1.3.0/go.mod"
+	"go.uber.org/multierr v1.4.0/go.mod"
+	"go.uber.org/multierr v1.5.0"
+	"go.uber.org/multierr v1.5.0/go.mod"
+	"go.uber.org/tools v0.0.0-20190618225709-2cfd321de3ee"
+	"go.uber.org/tools v0.0.0-20190618225709-2cfd321de3ee/go.mod"
+	"go.uber.org/zap v1.9.1/go.mod"
+	"go.uber.org/zap v1.10.0/go.mod"
+	"go.uber.org/zap v1.13.0/go.mod"
+	"go.uber.org/zap v1.15.0"
+	"go.uber.org/zap v1.15.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-20181030102418-4d3f4d9ffa16/go.mod"
+	"golang.org/x/crypto v0.0.0-20181203042331-505ab145d0a9/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-20190605123033-f99c8df09eb5/go.mod"
+	"golang.org/x/crypto v0.0.0-20190923035154-9ee001bba392/go.mod"
+	"golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod"
+	"golang.org/x/crypto v0.0.0-20191227163750-53104e6ec876/go.mod"
+	"golang.org/x/crypto v0.0.0-20200221231518-2aa609cf4a9d/go.mod"
+	"golang.org/x/crypto v0.0.0-20200414173820-0848c9571904/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-20200728195943-123391ffb6de"
+	"golang.org/x/crypto v0.0.0-20200728195943-123391ffb6de/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-20191227195350-da58074b4299/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-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-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"
+	"golang.org/x/lint v0.0.0-20191125180803-fdd1cda4f05f/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/net v0.0.0-20170915142106-8351a756f30f/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-20180911220305-26e67e76b6c3/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-20181220203305-927f97764cc3/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-20190301231341-16b79f2e4e95/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-20190501004415-9ce7a6920f09/go.mod"
+	"golang.org/x/net v0.0.0-20190503192946-f4e77d36d62c/go.mod"
+	"golang.org/x/net v0.0.0-20190522155817-f3200d17e092/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-20190923162816-aa69164e4478/go.mod"
+	"golang.org/x/net v0.0.0-20191002035440-2ec189313ef0/go.mod"
+	"golang.org/x/net v0.0.0-20191209160850-c0dbc17a3553/go.mod"
+	"golang.org/x/net v0.0.0-20200202094626-16171245cfb2/go.mod"
+	"golang.org/x/net v0.0.0-20200301022130-244492dfa37a/go.mod"
+	"golang.org/x/net v0.0.0-20200520004742-59133d7f0dd7/go.mod"
+	"golang.org/x/net v0.0.0-20200707034311-ab3426394381"
+	"golang.org/x/net v0.0.0-20200707034311-ab3426394381/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/oauth2 v0.0.0-20190402181905-9f3314589c9a/go.mod"
+	"golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod"
+	"golang.org/x/oauth2 v0.0.0-20191202225959-858c2ad4c8b6"
+	"golang.org/x/oauth2 v0.0.0-20191202225959-858c2ad4c8b6/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"
+	"golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod"
+	"golang.org/x/sys v0.0.0-20171026204733-164713f0dfce/go.mod"
+	"golang.org/x/sys v0.0.0-20180202135801-37707fdb30a5/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-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-20181128092732-4ed8d59d0b35/go.mod"
+	"golang.org/x/sys v0.0.0-20181205085412-a5c9d58dba9a/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-20190312061237-fead79001313/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-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-20190626221950-04f50cda93cb/go.mod"
+	"golang.org/x/sys v0.0.0-20190904154756-749cb33beabd/go.mod"
+	"golang.org/x/sys v0.0.0-20190922100055-0a153f010e69/go.mod"
+	"golang.org/x/sys v0.0.0-20190924154521-2837fb4f24fe/go.mod"
+	"golang.org/x/sys v0.0.0-20191005200804-aed5e4c7ecf9/go.mod"
+	"golang.org/x/sys v0.0.0-20191026070338-33540a1f6037/go.mod"
+	"golang.org/x/sys v0.0.0-20191120155948-bd437916bb0e/go.mod"
+	"golang.org/x/sys v0.0.0-20191204072324-ce4227a45e2e/go.mod"
+	"golang.org/x/sys v0.0.0-20191220142924-d4481acd189f/go.mod"
+	"golang.org/x/sys v0.0.0-20191228213918-04cbcbbfeed8/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-20200302150141-5c8b2ff67527/go.mod"
+	"golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd/go.mod"
+	"golang.org/x/sys v0.0.0-20200413165638-669c56c373c4/go.mod"
+	"golang.org/x/sys v0.0.0-20200519105757-fe76b779f299/go.mod"
+	"golang.org/x/sys v0.0.0-20200615200032-f1bc736245b1"
+	"golang.org/x/sys v0.0.0-20200615200032-f1bc736245b1/go.mod"
+	"golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod"
+	"golang.org/x/text v0.0.0-20170915090833-1cbadb444a80/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"
+	"golang.org/x/text v0.3.2/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-20190308202827-9d24e82272b4/go.mod"
+	"golang.org/x/time v0.0.0-20191024005414-555d28b269f0/go.mod"
+	"golang.org/x/tools v0.0.0-20170915040203-e531a2a1c15f/go.mod"
+	"golang.org/x/tools v0.0.0-20180221164845-07fd8470d635/go.mod"
+	"golang.org/x/tools v0.0.0-20180525024113-a5b4c53f6e8b/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-20181030221726-6c7e314b6563/go.mod"
+	"golang.org/x/tools v0.0.0-20181117154741-2ddaf7f79a09/go.mod"
+	"golang.org/x/tools v0.0.0-20190110163146-51295c7ec13a/go.mod"
+	"golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod"
+	"golang.org/x/tools v0.0.0-20190121143147-24cd39ecf745/go.mod"
+	"golang.org/x/tools v0.0.0-20190221204921-83362c3779f5/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-20190311215038-5c2858a9cfe5/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-20190322203728-c1a832b0ad89/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-20190506145303-2d16b83fe98c/go.mod"
+	"golang.org/x/tools v0.0.0-20190521203540-521d6ed310dd/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-20190628153133-6cdbf07be9d0/go.mod"
+	"golang.org/x/tools v0.0.0-20190719005602-e377ae9d6386/go.mod"
+	"golang.org/x/tools v0.0.0-20190816200558-6889da9d5479/go.mod"
+	"golang.org/x/tools v0.0.0-20190909030654-5b82db07426d/go.mod"
+	"golang.org/x/tools v0.0.0-20190910044552-dd2b5c81c578/go.mod"
+	"golang.org/x/tools v0.0.0-20190911151314-feee8acb394c/go.mod"
+	"golang.org/x/tools v0.0.0-20190911174233-4f2ddba30aff/go.mod"
+	"golang.org/x/tools v0.0.0-20190930201159-7c411dea38b0/go.mod"
+	"golang.org/x/tools v0.0.0-20191012152004-8de300cfc20a/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-20191113232020-e2727e816f5a/go.mod"
+	"golang.org/x/tools v0.0.0-20191125144606-a911d9008d1f/go.mod"
+	"golang.org/x/tools v0.0.0-20191216052735-49a3e744a425/go.mod"
+	"golang.org/x/tools v0.0.0-20191227053925-7b8e75db28f4/go.mod"
+	"golang.org/x/tools v0.0.0-20200103221440-774c71fcf114/go.mod"
+	"golang.org/x/tools v0.0.0-20200106190116-7be0a674c9fc"
+	"golang.org/x/tools v0.0.0-20200106190116-7be0a674c9fc/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"
+	"golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/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.4.0/go.mod"
+	"google.golang.org/api v0.5.0/go.mod"
+	"google.golang.org/api v0.6.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.15.0"
+	"google.golang.org/api v0.15.0/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/appengine v1.5.0/go.mod"
+	"google.golang.org/appengine v1.6.1/go.mod"
+	"google.golang.org/appengine v1.6.5"
+	"google.golang.org/appengine v1.6.5/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-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-20190605220351-eb0b1bdb6ae6/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-20190927181202-20e1ac93f88c/go.mod"
+	"google.golang.org/genproto v0.0.0-20191230161307-f3c370f40bfb/go.mod"
+	"google.golang.org/genproto v0.0.0-20200305110556-506484158171/go.mod"
+	"google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013/go.mod"
+	"google.golang.org/genproto v0.0.0-20200806141610-86f49bd18e98"
+	"google.golang.org/genproto v0.0.0-20200806141610-86f49bd18e98/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.1/go.mod"
+	"google.golang.org/grpc v1.21.0/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.24.0/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"
+	"google.golang.org/grpc v1.27.1/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"
+	"google.golang.org/protobuf v1.24.0/go.mod"
+	"gopkg.in/airbrake/gobrake.v2 v2.0.9/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"
+	"gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod"
+	"gopkg.in/cheggaaa/pb.v1 v1.0.28/go.mod"
+	"gopkg.in/errgo.v2 v2.1.0/go.mod"
+	"gopkg.in/fsnotify.v1 v1.4.7/go.mod"
+	"gopkg.in/gemnasium/logrus-airbrake-hook.v2 v2.1.2/go.mod"
+	"gopkg.in/inf.v0 v0.9.1/go.mod"
+	"gopkg.in/ini.v1 v1.51.0/go.mod"
+	"gopkg.in/ini.v1 v1.51.1/go.mod"
+	"gopkg.in/natefinch/lumberjack.v2 v2.0.0"
+	"gopkg.in/natefinch/lumberjack.v2 v2.0.0/go.mod"
+	"gopkg.in/resty.v1 v1.12.0/go.mod"
+	"gopkg.in/square/go-jose.v2 v2.4.0"
+	"gopkg.in/square/go-jose.v2 v2.4.0/go.mod"
+	"gopkg.in/square/go-jose.v2 v2.5.1"
+	"gopkg.in/square/go-jose.v2 v2.5.1/go.mod"
+	"gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7"
+	"gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7/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.3/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.2.7/go.mod"
+	"gopkg.in/yaml.v2 v2.3.0"
+	"gopkg.in/yaml.v2 v2.3.0/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-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"
+	"honnef.co/go/tools v0.0.1-2019.2.3/go.mod"
+	"howett.net/plist v0.0.0-20181124034731-591f970eefbb"
+	"howett.net/plist v0.0.0-20181124034731-591f970eefbb/go.mod"
+	"mvdan.cc/interfacer v0.0.0-20180901003855-c20040233aed/go.mod"
+	"mvdan.cc/lint v0.0.0-20170908181259-adc824a0674b/go.mod"
+	"mvdan.cc/unparam v0.0.0-20190209190245-fbb59629db34/go.mod"
+	"mvdan.cc/unparam v0.0.0-20190720180237-d51796306d8f/go.mod"
+	"mvdan.cc/unparam v0.0.0-20191111180625-960b1ec0f2c2/go.mod"
+	"rsc.io/binaryregexp v0.2.0/go.mod"
+	"rsc.io/quote/v3 v3.1.0/go.mod"
+	"rsc.io/sampler v1.3.0/go.mod"
+	"sigs.k8s.io/yaml v1.1.0/go.mod"
+	"sourcegraph.com/sourcegraph/go-diff v0.5.0/go.mod"
+	"sourcegraph.com/sqs/pbtypes v0.0.0-20180604144634-d3ebe8f20ae4/go.mod"
+	"sourcegraph.com/sqs/pbtypes v1.0.0/go.mod"
+	)
+go-module_set_globals
+SRC_URI="https://github.com/caddyserver/caddy/archive/v${PV}.tar.gz -> ${P}.tar.gz
+	${EGO_SUM_SRC_URI}"
+
+LICENSE="Apache-2.0 BSD ECL-2.0 MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+
+RESTRICT+=" test"
+
+src_compile() {
+	go build ./cmd/caddy || die
+}
+
+src_install() {
+	dobin caddy
+	dodoc README.md
+}
diff --git a/www-servers/cherokee/Manifest b/www-servers/cherokee/Manifest
deleted file mode 100644
index 187cc4a26f46..000000000000
--- a/www-servers/cherokee/Manifest
+++ /dev/null
@@ -1,8 +0,0 @@
-AUX cherokee-1.2.99-gentoo.patch 1763 BLAKE2B d4ab785332c60fcac0c22b1b0aefabe44db710a7a0973114e8ddbe0423dd1331c64493b4e862ce944f5afa6da30b307cbd27eead278ea9a080309d4bf1d08cc9 SHA512 2f2b1aa03cd7656ceb90f9a94d24704b4a411b3ab99e084444d1f60ce0270bad650b597b1edbdcb4fb0dda750215f42c3f5de3e9f6253825f3742dfbe871be4b
-AUX cherokee-confd-1.2.98 144 BLAKE2B 9462724ac4500ed501a005e2b001eefa53f2e71e48181a39f497c492cf69cdce1d5d325227535bfdb465b5bb6940cb89aedafb6420a7c14074b15f36b93866e1 SHA512 e010ec9e6d6bd6862c486c494e968cf93ff5f7eeaa523f1bc1fb9db72dc878c17fbc04443e74aef0bbfef1e2ba64ba00a7dc8bbd1b58f6759d2e000c76e88f84
-AUX cherokee-initd-1.2.99 1186 BLAKE2B 3c4d0bbc378940e425bcc8ae4f451e44ded8bc4d4f9d9375c26f6af04c120bccc49c6259aaf33749b071c151b80a096766cc98dee44bfc65af10208b9a43c936 SHA512 595e37b6cf70d4fbd466be918db6c17c37766f5e39a9ee4384a21025f1ce04367aeca495217b1e2c74ed2bce9ff8cfd9a58523b59d1181ce9f470eca97445641
-AUX cherokee.logrotate-r1 255 BLAKE2B 33d6c7dca525e424d1a88c0248595d011215cebae749a5d6aacc9eecd2b6e8d447d67655570baf62b23db96c5f5611d4a98b99bfcb6be9e194b52794264fcf49 SHA512 73be4a46f217302b3e7969f0a5acf7f83357a831331f85c89c17320c594eb9e6fd87da111b7d8eb06840e0b1bb094106a5bb6f7dbf7923e834164a367f85d5ad
-AUX cherokee.service 184 BLAKE2B 76a55b38f5a7d78df80fd57f9461f68dc360b5efafe19338cc242c71f625b6900c5872283c32a97b6234f58621b89616e123983dec027d3bb1f797d388cf743b SHA512 e05cfe0805bcd7f133fc0bf485fbf781b9cc5e6f9e222b8ea89bdc4e9d4531caa6049100670b67d12bdb73c1e93ed5d949cc1828241213cfcd60a39b7424d8ec
-DIST cherokee-1.2.104.zip 6200164 BLAKE2B 55ff5b5475c478078727ec072da4f1205209701b972efa420fbee4133cb83cf2ebd4a0f49165e4653c4a6b6f9e0f6ef633258e6ee4732d998b19863e99e6e2f2 SHA512 9c9f44643d0d2636f2e3e61ef8e2918d91d9bb6099be761826c8ffad01d339739ed40984d01151044c2e536d4754b5157d6d20c37627ce49eecdb404a716cd9d
-EBUILD cherokee-1.2.104-r2.ebuild 4961 BLAKE2B ee1c0dfb98e9415edc6ab190c9c3883add22ee1f1c2a1ba17dcf3dbe4dcfab7c8c099cdde380b585079ba37186cbfb8e23e656f977e57f6ad019d72346044f32 SHA512 bafe857b2591c00df5adfe4ae7e90f2bf1806effa949675867e8e9e27ede7af7ce0adf87be323c9e0ad6d661580b8963a5ccfb4eea3d051ea6e2f0b5159db04d
-MISC metadata.xml 468 BLAKE2B cbf0b56c17065b7281b4a762cd2390deb3af8c4388c46488d07c0ba39eee46224ee6420075e587345fbaba4a0cfa160daac8fd59b0343dd7cf25d313bee8aac7 SHA512 bfd1c8c432210025dd9b29ec89b383d3211ee9d1aabec4d59c2ec5801feccebcee3c55f7b6ed4e02daab9e72f42ab12517f957f396d0fd410ad3eee4fd05520d
diff --git a/www-servers/cherokee/cherokee-1.2.104-r2.ebuild b/www-servers/cherokee/cherokee-1.2.104-r2.ebuild
deleted file mode 100644
index 431f42db0e99..000000000000
--- a/www-servers/cherokee/cherokee-1.2.104-r2.ebuild
+++ /dev/null
@@ -1,197 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-WANT_AUTOMAKE="1.11"
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit autotools python-r1 pam systemd user
-
-DESCRIPTION="An extremely fast and tiny web server"
-SRC_URI="https://github.com/cherokee/webserver/archive/v${PV}.zip -> ${P}.zip"
-HOMEPAGE="https://www.cherokee-project.com/"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~mips ~ppc ~ppc64 ~x86"
-IUSE="admin ffmpeg debug geoip ipv6 kernel_linux ldap libressl mysql nls pam php rrdtool ssl static static-libs"
-RDEPEND=""
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-COMMON_DEPEND="
-	${PYTHON_DEPS}
-	dev-libs/libpcre
-	>=sys-libs/zlib-1.1.4-r1
-	ffmpeg? ( media-video/ffmpeg )
-	geoip? ( dev-libs/geoip )
-	ldap? ( net-nds/openldap )
-	mysql? ( dev-db/mysql-connector-c:0= )
-	nls? ( virtual/libintl )
-	pam? ( sys-libs/pam )
-	php? ( || (
-		dev-lang/php:*[fpm]
-		dev-lang/php:*[cgi]
-	) )
-	ssl? (
-		!libressl? ( <dev-libs/openssl-1.1.0:0= )
-		libressl? ( dev-libs/libressl:0= )
-	)
-	"
-DEPEND="${COMMON_DEPEND}
-	nls? ( sys-devel/gettext )"
-RDEPEND="${COMMON_DEPEND}
-	rrdtool? ( net-analyzer/rrdtool )"
-BDEPEND="app-arch/unzip"
-
-RESTRICT="test"
-
-WEBROOT="/var/www/localhost"
-
-PATCHES=( "${FILESDIR}/${PN}-1.2.99-gentoo.patch" )
-S="${WORKDIR}/webserver-${PV}"
-
-pkg_setup() {
-	enewgroup cherokee
-	enewuser cherokee -1 -1 /var/www cherokee
-}
-
-src_prepare() {
-	python_setup
-	default
-
-	"${S}/po/admin/generate_POTFILESin.py" > po/admin/POTFILES.in
-	eautoreconf
-}
-
-src_configure() {
-	local myconf
-
-	if use admin ; then
-		myconf="${myconf} --enable-admin --with-python=/usr/bin/python"
-	else
-		myconf="${myconf} --disable-admin"
-	fi
-
-	# Uses autodetect because --with-php requires path to php-{fpm,cgi}.
-	if ! use php ; then
-		myconf="${myconf} --without-php"
-	fi
-
-	if use static ; then
-		myconf="${myconf} --enable-static-module=all"
-	fi
-
-	local os="Unknown"
-	case "${CHOST}" in
-		*-freebsd*)
-			os="FreeBSD" ;;
-		*-netbsd*)
-			os="NetBSD" ;;
-		*-openbsd*)
-			os="OpenBSD" ;;
-		*)
-			os="Linux" ;;
-	esac
-
-	econf \
-		$(use_enable debug trace) \
-		$(use_enable debug backtraces) \
-		$(use_enable ipv6) \
-		$(use_enable kernel_linux epoll) \
-		$(use_enable nls) \
-		$(use_enable pam) \
-		$(use_enable static-libs static) \
-		$(use_with ffmpeg) \
-		$(use_with geoip) \
-		$(use_with ldap) \
-		$(use_with mysql) \
-		$(use_with ssl libssl) \
-		--docdir="${EPREFIX}/usr/share/doc/${PF}/html" \
-		--enable-os-string="Gentoo ${os}" \
-		--enable-tmpdir="${EPREFIX}/var/tmp" \
-		--localstatedir="${EPREFIX}/var" \
-		--with-wwwroot="${EPREFIX}${WEBROOT}/htdocs" \
-		--with-cgiroot="${EPREFIX}${WEBROOT}/cgi-bin" \
-		--with-wwwuser=cherokee \
-		--with-wwwgroup=cherokee \
-		${myconf}
-}
-
-src_install() {
-	default
-
-	if ! use static-libs ; then
-		find "${ED}" -name '*.la' -delete || die
-	elif ! use static ; then
-		find "${ED}/usr/$(get_libdir)/cherokee" '(' -name '*.la' -o -name '*.a' ')' -delete || die
-	fi
-
-	dodoc AUTHORS NEWS README.rst
-
-	if use pam ; then
-		pamd_mimic system-auth cherokee auth account session || die
-	fi
-
-	newinitd "${FILESDIR}/${PN}-initd-1.2.99" ${PN}
-	newconfd "${FILESDIR}/${PN}-confd-1.2.98" ${PN}
-
-	if ! use admin ; then
-		rm -r \
-			"${ED}"/usr/bin/cherokee-admin-launcher \
-			"${ED}"/usr/bin/CTK-run \
-			"${ED}"/usr/sbin/cherokee-admin \
-			"${ED}"/usr/share/cherokee/admin || die
-	fi
-
-	exeinto /usr/share/doc/${PF}/contrib
-	doexe contrib/{bin2buffer.py,make-cert.sh,make-dh_params.sh,tracelor.py}
-
-	#move the htdocs to docdir, bug #429632
-	docompress -x /usr/share/doc/"${PF}"/htdocs.dist
-	mv "${ED}"${WEBROOT}/htdocs \
-		"${ED}"/usr/share/doc/"${PF}"/htdocs.dist
-	mkdir "${ED}"${WEBROOT}/htdocs
-
-	keepdir \
-		"${WEBROOT}"/htdocs \
-		/var/log/cherokee \
-		/var/lib/cherokee/graphs/images
-	fowners cherokee:cherokee \
-		/var/log/cherokee \
-		/var/lib/cherokee/graphs \
-		/var/lib/cherokee/graphs/images
-
-	# logrotate
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}"/${PN}.logrotate-r1 ${PN}
-
-	systemd_dounit "${FILESDIR}"/cherokee.service
-
-	# Fix QA error - not important if it fails
-	rmdir "${ED}"/var/run
-}
-
-pkg_postinst() {
-	elog
-	if use admin ; then
-		elog "Just run '/usr/sbin/cherokee-admin' and go to: http://localhost:9090"
-		elog
-		elog "Cherokee currently supports configuration versioning, so from now on,"
-		elog "whenever a change is made to the configuration file format,"
-		elog "Cherokee-Admin will be able to automatically convert yours to the new"
-		elog "release. You simply have to load Cherokee-Admin and it will be converted"
-		elog "once you proceed to saving it."
-		elog
-		elog "There is also a command line utility that you can use to do the exact"
-		elog "same thing. Config format can change in different versions. It is"
-		elog "provided under:"
-		elog "	${EPREFIX}/usr/share/cherokee/admin/upgrade_config.py"
-	else
-		elog "Try USE=admin if you want an easy way to configure cherokee."
-	fi
-	elog
-	elog "emerge www-servers/spawn-fcgi if you use Ruby on Rails with ${PN}."
-	elog
-}
diff --git a/www-servers/cherokee/files/cherokee-1.2.99-gentoo.patch b/www-servers/cherokee/files/cherokee-1.2.99-gentoo.patch
deleted file mode 100644
index d55a5a2a82cf..000000000000
--- a/www-servers/cherokee/files/cherokee-1.2.99-gentoo.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-diff -Naur cherokee-1.2.99.orig/admin/configured.py.pre cherokee-1.2.99/admin/configured.py.pre
---- cherokee-1.2.99.orig/admin/configured.py.pre	2011-03-31 17:30:04.000000000 +0900
-+++ cherokee-1.2.99/admin/configured.py.pre	2011-09-16 19:37:15.893487362 +0900
-@@ -22,7 +22,7 @@
- CHEROKEE_DATADIR      = join (DATADIR, "cherokee")
- CHEROKEE_DEPSDIR      = join (DATADIR, "cherokee/deps")
- CHEROKEE_CONFDIR      = join (SYSCONFDIR, "cherokee")
--CHEROKEE_VAR_LOG      = join (LOCALSTATE, "log")
-+CHEROKEE_VAR_LOG      = join (LOCALSTATE, "log/cherokee")
- CHEROKEE_VAR_RUN      = join (LOCALSTATE, "run")
- CHEROKEE_VAR_LIB      = join (LOCALSTATE, "lib/cherokee")
- CHEROKEE_RRD_DIR      = join (LOCALSTATE, "lib/cherokee/graphs")
-diff -Naur cherokee-1.2.99.orig/cherokee.conf.sample.pre cherokee-1.2.99/cherokee.conf.sample.pre
---- cherokee-1.2.99.orig/cherokee.conf.sample.pre	2011-05-03 18:01:42.000000000 +0900
-+++ cherokee-1.2.99/cherokee.conf.sample.pre	2011-09-16 19:37:15.894487368 +0900
-@@ -18,6 +18,8 @@
- server!server_tokens = full
- server!panic_action = %prefix%/bin/cherokee-panic
- server!pid_file = %localstatedir%/run/cherokee.pid
-+server!user = cherokee
-+server!group = cherokee
- 
- # Default virtual server
- #
-@@ -27,11 +29,11 @@
- 
- vserver!1!logger = combined
- vserver!1!logger!access!type = file
--vserver!1!logger!access!filename = %localstatedir%/log/cherokee.access
-+vserver!1!logger!access!filename = %localstatedir%/log/cherokee/cherokee.access
- vserver!1!logger!access!buffsize = 16384
- 
- vserver!1!error_writer!type = file
--vserver!1!error_writer!filename = %localstatedir%/log/cherokee.error
-+vserver!1!error_writer!filename = %localstatedir%/log/cherokee/cherokee.error
- 
- vserver!1!rule!1!match = default
- vserver!1!rule!1!handler = common
diff --git a/www-servers/cherokee/files/cherokee-confd-1.2.98 b/www-servers/cherokee/files/cherokee-confd-1.2.98
deleted file mode 100644
index 62e7fd64f787..000000000000
--- a/www-servers/cherokee/files/cherokee-confd-1.2.98
+++ /dev/null
@@ -1,4 +0,0 @@
-# /etc/conf.d/cherokee: config file for /etc/init.d/cherokee
-
-#CHEROKEE_OPTS="--config=/etc/cherokee/cherokee.conf --valgrind"
-CHEROKEE_OPTS=""
diff --git a/www-servers/cherokee/files/cherokee-initd-1.2.99 b/www-servers/cherokee/files/cherokee-initd-1.2.99
deleted file mode 100644
index 488cc819d0df..000000000000
--- a/www-servers/cherokee/files/cherokee-initd-1.2.99
+++ /dev/null
@@ -1,67 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-command="/usr/sbin/cherokee"
-extra_commands="configtest"
-extra_started_commands="graceful reload"
-
-
-depend() {
-	need net
-	use dns ldap logger mysql netmount
-}
-
-checkconfig() {
-	${command} -t 1>/dev/null 2>&1
-	ret=$?
-	if [ $ret -ne 0 ]; then
-		eerror "${SVCNAME} has detected an error in your config:"
-		${command} -t ${CHEROKEE_OPTS}
-	fi
-	return $?
-}
-
-configtest() {
-	ebegin "Checking ${SVCNAME} configuration"
-	checkconfig
-	eend $?
-}
-
-start() {
-	checkconfig || return 1
-
-	ebegin "Starting ${SVCNAME}"
-	start-stop-daemon --start --quiet \
-		--exec ${command} -- -d ${CHEROKEE_OPTS}
-	eend $?
-}
-
-stop() {
-	checkconfig || return 1
-
-	ebegin "Stopping ${SVCNAME}"
-	start-stop-daemon --stop --quiet \
-		--exec ${command}
-	eend $?
-}
-
-graceful() {
-	checkconfig || return 1
-
-	ebegin "Restarting ${SVCNAME} and closing all the opened connections"
-	start-stop-daemon \
-		--exec ${command} \
-		--signal USR1
-	eend $?
-}
-
-reload() {
-	checkconfig || return 1
-
-	ebegin "Reloading ${SVCNAME} configuration"
-	start-stop-daemon \
-		--exec ${command} \
-		--signal HUP
-	eend $?
-}
diff --git a/www-servers/cherokee/files/cherokee.logrotate-r1 b/www-servers/cherokee/files/cherokee.logrotate-r1
deleted file mode 100644
index 49b68364bc24..000000000000
--- a/www-servers/cherokee/files/cherokee.logrotate-r1
+++ /dev/null
@@ -1,10 +0,0 @@
-# lighttpd logrotate script for Gentoo
-
-/var/log/cherokee/cherokee.access /var/log/cherokee/cherokee.error {
-  missingok
-  notifempty
-  sharedscripts
-  postrotate
-  [ -f /var/run/cherokee.pid ] && /bin/kill -USR2 `cat /var/run/cherokee.pid`
-  endscript
-}
diff --git a/www-servers/cherokee/files/cherokee.service b/www-servers/cherokee/files/cherokee.service
deleted file mode 100644
index a2d703185d37..000000000000
--- a/www-servers/cherokee/files/cherokee.service
+++ /dev/null
@@ -1,10 +0,0 @@
-[Unit]
-Description=Cherokee web server
-After=syslog.target
-
-[Service]
-Type=forking
-ExecStart=/usr/sbin/cherokee -d -C /etc/cherokee/cherokee.conf
-
-[Install]
-WantedBy=multi-user.target
diff --git a/www-servers/cherokee/metadata.xml b/www-servers/cherokee/metadata.xml
deleted file mode 100644
index bb0494e0acc6..000000000000
--- a/www-servers/cherokee/metadata.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>blueness@gentoo.org</email>
-		<name>Anthony G. Basile</name>
-	</maintainer>
-	<use>
-		<flag name="admin">Install web based cherokee conf tool</flag>
-		<flag name="rrdtool">Enable rrdtool support</flag>
-	</use>
-	<upstream>
-		<remote-id type="github">cherokee/webserver</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/www-servers/gunicorn/Manifest b/www-servers/gunicorn/Manifest
index a65014f21521..e7edc2617aa1 100644
--- a/www-servers/gunicorn/Manifest
+++ b/www-servers/gunicorn/Manifest
@@ -3,5 +3,5 @@ DIST gunicorn-19.9.0.tar.gz 415774 BLAKE2B 1ac920e3a02aff434d2458cbcacd821df428e
 DIST gunicorn-20.0.4.tar.gz 373841 BLAKE2B d6f0b5b901697ebc6ee987af5766174a845de8bfad03ce95638ed087b92175e9b2f0e9a49fda70f8f9c6fdc15e1ef1a431c069270af068fb29780abcedf63fc3 SHA512 706620f165e36c178a6d3e65f51a9bb7746abd40dfc7c0f1b3b523771be953dd03b36111f192407aef474ad44afdffd11b6502e51376d11465ffac2255822d5e
 EBUILD gunicorn-19.8.1.ebuild 1171 BLAKE2B a8c6b1dcbb749db4dcf60b8c26111045be976f28559b2cb4a7f7ef1536dae320a0f7060bd572bdc2998dab0003230ad1688ca4c28130c70757702504222998e6 SHA512 ab4761df1c5e57b7aa87095de97915126007055a87cac29866a603604c47ef4f25886cdef723de8b36eccdbfd7b2ed835832b54b827ed3f27c97cee0c30a90f5
 EBUILD gunicorn-19.9.0.ebuild 923 BLAKE2B d6a784321f92ca5b2cc04f077a7d18bc24a1371867607b3813820e5089ce36f2f41ac38fae36b00fb1c8c2fbee9a36398624bc3823072c2eba50e3e8848f18c7 SHA512 f14c034ae4d0fa97483b80df04e5bba6ca4219b8944d38cbd43a21c91daafe001331985f1bda79fb9be81bac55db6fce2a64be489a91db37c723af452d563a7a
-EBUILD gunicorn-20.0.4.ebuild 893 BLAKE2B 1c3f090cdea064e54c76759f944f211026880a59a5a4ea42fd507fb30408c0b66cb2cd7f685bab2456ada793dd5a501eb85f872d70db211372e2cac36f5fc3de SHA512 674bea17e96a2cf7725d8e18c86f1998ed8eeeb99e28dba31bcd999680d77abe9a07025ffa80274555e780f052b2b0ce0cbb87834b1c01b5140283021d7f87b9
+EBUILD gunicorn-20.0.4.ebuild 898 BLAKE2B 34b8bc36d14f0a132ccfcf712a3d523559ab56fb51cd774c04a38146f1d8927499b7cfd7b510d3226bd61f428e1ea588b467725d84fd440b0560aef81cf1f593 SHA512 70782a0118d59b7bb084c5ca908b1917ea21f608745a7e6ea91c8fb0b634ca80cf4e0a4c20061dc546a40d98aeb87fb44f1279f9a34de142d827de8a6d5e9ed2
 MISC metadata.xml 808 BLAKE2B d23e87c5659aed0bcb8a8719d3eb3a862ddff635b231ae01b3928cd6f33cd073b5b054742ed806a9dc408528c3a843a06e5db4c6a252beaaace6873d798468f7 SHA512 c420223f8e7f0b3ec1fb82091e38a85087ca814b16051dfd783e54d8af5fdb811086887a5f1e7177f8bcd37e098ab6244e3e8ecf38c6a3fa9941c2933b38e1c0
diff --git a/www-servers/gunicorn/gunicorn-20.0.4.ebuild b/www-servers/gunicorn/gunicorn-20.0.4.ebuild
index 33ec9b4178f8..fbda8f9214ff 100644
--- a/www-servers/gunicorn/gunicorn-20.0.4.ebuild
+++ b/www-servers/gunicorn/gunicorn-20.0.4.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT PSF-2 doc? ( BSD )"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~ppc ~ppc64 sparc x86"
 
 RDEPEND="dev-python/setproctitle[${PYTHON_USEDEP}]"
 
diff --git a/www-servers/lighttpd/Manifest b/www-servers/lighttpd/Manifest
index 73396fc61236..f7b0987cfd7b 100644
--- a/www-servers/lighttpd/Manifest
+++ b/www-servers/lighttpd/Manifest
@@ -8,5 +8,6 @@ AUX lighttpd.logrotate-r1 385 BLAKE2B c41e4b7892d3cb8cd7306eb7fa93b4a03452786acc
 AUX lighttpd.service 257 BLAKE2B 7e60ad2f87ece8547cd3e39fc2121ea4664d9015722469ab074469ba0b670f56b147c8088ad9211f97a4f314fe4eaebac89cd9cddee34edbf3652b7ea0712c94 SHA512 fbcd7dbf9c6b97284465af133a7cd1f711978ef4318a749ff7d366b053265fac94a1d76f074f56722c382179631d38ed8a07ac2c2fc4b712a93acab2f3609c0f
 AUX lighttpd.tmpfiles.conf 41 BLAKE2B a159ae17094377d927bcf51078d40c322e5213d62064a271a7a0cf5b32423b349ac13d2ebc38a8de5c6478823ac022e46eef60a830e6ae9598e848b8c220bc2f SHA512 3fda360423a7a406a2981de647dac6b4419fe60c649bf3cc21fad566e8513293f6e81d4f5b777eaf06a056beedbf44360a39894ca3a2d05d3fc3a2d26c339efe
 DIST lighttpd-1.4.55.tar.xz 765660 BLAKE2B 7b972de86e7d1a51438718e4d5bd49188c107b0f2e656ead597085ae84f3d41cdb662a7774c6655155d390c26f3e4f0b0dc4243c85cb0255a91d8ca57742f402 SHA512 023d5a54079e710a89a59e259c0b5798103ef6fce4544c36110dc4c5281ef429ef99369923d74123fcf8be37afe622d44cd7149078d21971ff26f3f4ee37c439
-EBUILD lighttpd-1.4.55.ebuild 6351 BLAKE2B 57bda84f469073ea76254352aeb667a7a2e83f582e4064033fd35730e6e7718a1244e032c946df2117bf86830938b4e81999c59d32d290f4d21b67a38b2332b2 SHA512 6f81a1515662abc1eb2599f5a5f8675a56824c46efc43b665fd27ccd12fa3451b37af560faa30819f4538ba53546722bf1b356c283a24d5faca3e7846edbb859
+EBUILD lighttpd-1.4.55-r1.ebuild 6353 BLAKE2B ac6e0edd3a9a090c549f6d5b278dbc15ebd20366c0155fe5ec118cec1152ef031d014694e0de5bf9a3679a3c7b41220652738770c34f455505b79ec56e8115c7 SHA512 ca646537ae256796069160a6ed2f8f3a74c01c063507423d742c941ce33cb49cd939eecc3fadfbd37e5f48e4e6243bdb646db70e2784ff39538f8c7d42e2cce6
+EBUILD lighttpd-1.4.55-r100.ebuild 6984 BLAKE2B c7a18143c3fd598451e888deeef3c1511104e549ef9e67279e21aa9744c9f216513e201cf904424c896e63b3e691fd1290838274b3763b0f4714acc8273a069f SHA512 cc1d071763c8926f71bb92554575ae89de85380f1e7622a6051dbd7c065abba69638a319980f2dd628c094e4643720fda82424ab51a8af26d857ece0e8c09ed7
 MISC metadata.xml 974 BLAKE2B 7a5285106e385d5c25cb50ee286b865beae369610602ecdcf921ed5f7b2e041c282a12d208e4ef19e9d2b0d957bda713e09eee793d4242de85ac07ec04b51d83 SHA512 272ae929e52031f040bb702a4e9f4e824fce15e9520843e48ab19f119ff16c36565523f18f0465856ad030d3717a134e55fa816b6cf855cf0b8108a22aed5ce8
diff --git a/www-servers/lighttpd/lighttpd-1.4.55.ebuild b/www-servers/lighttpd/lighttpd-1.4.55-r1.ebuild
index a2bba42a2ca4..f45c8c53d89a 100644
--- a/www-servers/lighttpd/lighttpd-1.4.55.ebuild
+++ b/www-servers/lighttpd/lighttpd-1.4.55-r1.ebuild
@@ -24,7 +24,7 @@ COMMON_DEPEND="
 	bzip2?    ( app-arch/bzip2 )
 	dbi?	( dev-db/libdbi )
 	fam?    ( virtual/fam )
-	gdbm?   ( sys-libs/gdbm )
+	gdbm?   ( sys-libs/gdbm:= )
 	geoip?	( dev-libs/geoip )
 	ldap?   ( >=net-nds/openldap-2.1.26 )
 	libev?  ( >=dev-libs/libev-4.01 )
diff --git a/www-servers/lighttpd/lighttpd-1.4.55-r100.ebuild b/www-servers/lighttpd/lighttpd-1.4.55-r100.ebuild
new file mode 100644
index 000000000000..61fcd8723eb0
--- /dev/null
+++ b/www-servers/lighttpd/lighttpd-1.4.55-r100.ebuild
@@ -0,0 +1,245 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+LUA_COMPAT=( lua5-{1..3} )
+
+inherit autotools flag-o-matic lua-single readme.gentoo-r1 systemd toolchain-funcs
+
+DESCRIPTION="Lightweight high-performance web server"
+HOMEPAGE="https://www.lighttpd.net https://github.com/lighttpd"
+SRC_URI="https://download.lighttpd.net/lighttpd/releases-1.4.x/${P}.tar.xz"
+
+LICENSE="BSD GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+IUSE="bzip2 dbi doc fam gdbm geoip ipv6 kerberos ldap libev libressl lua minimal mmap memcached mysql pcre php postgres rrdtool sasl selinux ssl sqlite test webdav xattr zlib"
+RESTRICT="!test? ( test )"
+
+REQUIRED_USE="kerberos? ( ssl !libressl )
+	lua? ( ${LUA_REQUIRED_USE} )
+	webdav? ( sqlite )"
+
+BDEPEND="dev-libs/libgamin
+	virtual/pkgconfig"
+
+COMMON_DEPEND="
+	bzip2?    ( app-arch/bzip2 )
+	dbi?	( dev-db/libdbi )
+	fam?    ( virtual/fam )
+	gdbm?   ( sys-libs/gdbm:= )
+	geoip?	( dev-libs/geoip )
+	ldap?   ( >=net-nds/openldap-2.1.26 )
+	libev?  ( >=dev-libs/libev-4.01 )
+	lua?    ( ${LUA_DEPS} )
+	memcached? ( dev-libs/libmemcached )
+	mysql?  ( dev-db/mysql-connector-c:= )
+	pcre?   ( >=dev-libs/libpcre-3.1 )
+	php?      ( dev-lang/php:*[cgi] )
+	postgres? ( dev-db/postgresql:* )
+	rrdtool?  ( net-analyzer/rrdtool )
+	sasl?     ( dev-libs/cyrus-sasl )
+	ssl? (
+		!libressl? ( >=dev-libs/openssl-0.9.7:0= )
+		libressl? ( dev-libs/libressl:= )
+	)
+	sqlite?	( dev-db/sqlite:3 )
+	webdav? (
+		dev-libs/libxml2
+		sys-fs/e2fsprogs
+	)
+	xattr? ( kernel_linux? ( sys-apps/attr ) )
+	zlib? ( >=sys-libs/zlib-1.1 )
+	acct-group/lighttpd
+	acct-user/lighttpd"
+
+DEPEND="${COMMON_DEPEND}
+	doc?  ( dev-python/docutils )
+	test? (
+		virtual/perl-Test-Harness
+		dev-libs/fcgi
+	)"
+
+RDEPEND="${COMMON_DEPEND}
+	selinux? ( sec-policy/selinux-apache )
+"
+
+# update certain parts of lighttpd.conf based on conditionals
+update_config() {
+	local config="${D}/etc/lighttpd/lighttpd.conf"
+
+	# enable php/mod_fastcgi settings
+	use php && { sed -i -e 's|#.*\(include.*fastcgi.*$\)|\1|' ${config} || die; }
+
+	# enable stat() caching
+	use fam && { sed -i -e 's|#\(.*stat-cache.*$\)|\1|' ${config} || die; }
+
+	# automatically listen on IPv6 if built with USE=ipv6. Bug #234987
+	use ipv6 && { sed -i -e 's|# server.use-ipv6|server.use-ipv6|' ${config} || die; }
+}
+
+# remove non-essential stuff (for USE=minimal)
+remove_non_essential() {
+	local libdir="${D}/usr/$(get_libdir)/${PN}"
+
+	# text docs
+	use doc || rm -fr "${D}"/usr/share/doc/${PF}/txt
+
+	# non-essential modules
+	rm -f \
+		${libdir}/mod_{compress,evhost,expire,proxy,scgi,secdownload,simple_vhost,status,setenv,trigger*,usertrack}.* || die
+
+	# allow users to keep some based on USE flags
+	use pcre    || rm -f ${libdir}/mod_{ssi,re{direct,write}}.*
+	use webdav  || rm -f ${libdir}/mod_webdav.*
+	use mysql   || rm -f ${libdir}/mod_mysql_vhost.*
+	use lua     || rm -f ${libdir}/mod_{cml,magnet}.*
+	use rrdtool || rm -f ${libdir}/mod_rrdtool.*
+	use zlib    || rm -f ${libdir}/mod_compress.*
+}
+
+pkg_setup() {
+	if use lua; then
+		lua-single_pkg_setup
+	fi
+
+	if ! use pcre ; then
+		ewarn "It is highly recommended that you build ${PN}"
+		ewarn "with perl regular expressions support via USE=pcre."
+		ewarn "Otherwise you lose support for some core options such"
+		ewarn "as conditionals and modules such as mod_re{write,direct}"
+		ewarn "and mod_ssi."
+	fi
+
+	DOC_CONTENTS="IPv6 migration guide:\n
+		http://redmine.lighttpd.net/projects/lighttpd/wiki/IPv6-Config"
+}
+
+src_prepare() {
+	default
+	use memcached && append-ldflags -pthread
+	#dev-python/docutils installs rst2html.py not rst2html
+	sed -i -e 's|\(rst2html\)|\1.py|g' doc/outdated/Makefile.am || \
+		die "sed doc/Makefile.am failed"
+	eautoreconf
+}
+
+src_configure() {
+	# The lua bit requires a bit of explanation. The lighttpd autoconf script
+	# handles the value passed to --with-lua as follows:
+	#  - "no" - do nothing
+	#  - "yes" - query pkgconfig for VERSIONED lua packages, starting with 5.3
+	#    and going down; only if lua5.1 cannot be found plain "lua" is tried
+	#  - any other value is passed to pkgconfig as the exact package name to use.
+	# We want a specific implementation to be used even if a newer one is present
+	# in the system so we use the latter mode.
+	econf \
+		CC_FOR_BUILD=$(tc-getBUILD_CC) \
+		--libdir=/usr/$(get_libdir)/${PN} \
+		--enable-lfs \
+		$(use_enable ipv6) \
+		$(use_enable mmap) \
+		$(use_with bzip2) \
+		$(use_with dbi) \
+		$(use_with fam) \
+		$(use_with gdbm) \
+		$(use_with geoip ) \
+		$(use_with kerberos krb5) \
+		$(use_with ldap) \
+		$(use_with libev) \
+		$(use_with lua lua ${ELUA}) \
+		$(use_with memcached) \
+		$(use_with mysql) \
+		$(use_with pcre) \
+		$(use_with postgres pgsql) \
+		$(use_with sasl) \
+		$(use_with ssl openssl) \
+		$(use_with sqlite) \
+		$(use_with webdav webdav-props) \
+		$(use_with webdav webdav-locks) \
+		$(use_with xattr attr) \
+		$(use_with zlib)
+}
+
+src_compile() {
+	emake
+
+	if use doc ; then
+		einfo "Building HTML documentation"
+		cd doc || die
+		emake html
+	fi
+}
+
+src_test() {
+	if [[ ${EUID} -eq 0 ]]; then
+		default_src_test
+	else
+		ewarn "test skipped, please re-run as root if you wish to test ${PN}"
+	fi
+}
+
+src_install() {
+	default
+
+	find "${D}" -name '*.la' -delete || die
+
+	# init script stuff
+	newinitd "${FILESDIR}"/lighttpd.initd lighttpd
+	newconfd "${FILESDIR}"/lighttpd.confd lighttpd
+	use fam && has_version app-admin/fam && \
+		{ sed -i 's/after famd/need famd/g' "${D}"/etc/init.d/lighttpd || die; }
+
+	# configs
+	insinto /etc/lighttpd
+	doins "${FILESDIR}"/conf/lighttpd.conf
+	doins "${FILESDIR}"/conf/mime-types.conf
+	doins "${FILESDIR}"/conf/mod_cgi.conf
+	doins "${FILESDIR}"/conf/mod_fastcgi.conf
+
+	# update lighttpd.conf directives based on conditionals
+	update_config
+
+	# docs
+	dodoc AUTHORS README NEWS doc/scripts/*.sh
+	newdoc doc/config//lighttpd.conf lighttpd.conf.distrib
+	use ipv6 && readme.gentoo_create_doc
+
+	use doc && dodoc -r doc
+
+	docinto txt
+	dodoc doc/outdated/*.txt
+
+	# logrotate
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}"/lighttpd.logrotate-r1 lighttpd
+
+	keepdir /var/l{ib,og}/lighttpd /var/www/localhost/htdocs
+	fowners lighttpd:lighttpd /var/l{ib,og}/lighttpd
+	fperms 0750 /var/l{ib,og}/lighttpd
+
+	#spawn-fcgi may optionally be installed via www-servers/spawn-fcgi
+	rm -f "${D}"/usr/bin/spawn-fcgi "${D}"/usr/share/man/man1/spawn-fcgi.* || die
+
+	use minimal && remove_non_essential
+
+	systemd_dounit "${FILESDIR}/${PN}.service"
+	systemd_dotmpfilesd "${FILESDIR}/${PN}.tmpfiles.conf"
+}
+
+pkg_postinst() {
+	use ipv6 && readme.gentoo_print_elog
+
+	if [[ -f ${ROOT}/etc/conf.d/spawn-fcgi.conf ]] ; then
+		einfo "spawn-fcgi is now provided by www-servers/spawn-fcgi."
+		einfo "spawn-fcgi's init script configuration is now located"
+		einfo "at /etc/conf.d/spawn-fcgi."
+	fi
+
+	if [[ -f ${ROOT}/etc/lighttpd.conf ]] ; then
+		elog "Gentoo has a customized configuration,"
+		elog "which is now located in /etc/lighttpd.  Please migrate your"
+		elog "existing configuration."
+	fi
+}
diff --git a/www-servers/nginx-unit/Manifest b/www-servers/nginx-unit/Manifest
index a0b953ef0a54..b7afe2ad9315 100644
--- a/www-servers/nginx-unit/Manifest
+++ b/www-servers/nginx-unit/Manifest
@@ -1,6 +1,6 @@
 AUX nginx-unit.initd 288 BLAKE2B 94caaeee62d93cdb3b9240bc6563fabe9b273b2125f9ec0c1ae0a2b079bef89b94f7e3a748d649a0840595f46047cee7ea388bd9514d1da88bb4a041a4a2c8ef SHA512 52a788e21a9aaa90a470a7861cd9856e3c2d2c52e3b4a23276c8b43e2a22f6f5aaec78caaf5f449463f1b856e0ffd83515e583f0ced00eada2d0afc00949ca77
-DIST nginx-unit-1.17.0.tar.gz 726928 BLAKE2B d171f2f818302cb0f491ccc3ca93596ee52817647cf1f2f176ebed075cb1dd5772f133d9e925075fe72d826a63b4c4debddace8784612196ebe6b6655d70571b SHA512 4175fc6dd84ad8a3bbdc117d3ce0c7a11c708a7a204ade0bb40f5606f6923e351bb1a8f1f8394c09cdf12fdc20bc927920412dc4b41d3141f76482db047c4bed
-DIST nginx-unit-1.18.0.tar.gz 742273 BLAKE2B d856aadb07286acb944a7bd486fc8c548db0412f8e4e2bec0382aa719d743ee22208c20ccf50466e3d592e29690abfacbfd6d4c44b1369bdc5a61ca2765bd3d2 SHA512 2beac69caeb09278a6c2cdafe20a8040e589f9ad6e302c896cd396ae7d576f563dd6a480f815b4a26d22e15592b5abcd927a8ba436517bd9b9bbb78bff3176ff
-EBUILD nginx-unit-1.17.0.ebuild 1953 BLAKE2B 8942de82799f70fae7997d63d34a9fe2f5ea056d288c3b07ca83e1dc36b68604959fd847bb291838a8bcffbd0bef0e084ec097c70e6c9368859437f79dcda3a7 SHA512 27ca570d72ebabaa53584dfcb66757692aa49b13133dde98a60dda1ec67b9cfb0d3ce78e3ea884e7355d3f55510179d5bb509d73ad793a03a6939aed4d14ffe4
-EBUILD nginx-unit-1.18.0.ebuild 1954 BLAKE2B a889f8b1f34ea66df35e682bf26f7e22462076efad22cc6f6cb41c182ee80bd4c7687c8742b5364ecfac3dd5a04d148fedbef3b6ad70ba123aa7697060603f87 SHA512 21ec634694b9761493395d4ca72193840e152e16888f777ca382e96a6e3743583a0368854081373b6730e0ceea212a6100ab7c5c8938285afc617a206788cd67
+DIST nginx-unit-1.20.0.tar.gz 787607 BLAKE2B 7ef0ea98b0fa2b5af591763ed67c1a92c7309c8ea91b29bfb3d3e309149f9d563ff8a3cb0f19f52d9d53f05a56c2a6f0e3c07e7b8315106911a87bc01f9d3af3 SHA512 dd68103795acbdcd87a951c92c72f3cb74b5e622eca4e687194508b55a592ac4312de3a8ff7ddb9a5df9750363b24dca9e1b48c7ef42c78aca3a18aca6a51f42
+DIST nginx-unit-1.21.0.tar.gz 802826 BLAKE2B 9d0af079b84cd769b90d4735825765571a384d69fb8c6201d6ab2f943778a7ca19b408359e12a433d192aeefad9f7e8f760cde0568101858dabadfbb9b598784 SHA512 12e9e8b221ffe8014931fe46c7faa9398de6ad08bbc07e5f8e50f086e4a22419960522d33bece493e17ae544b499acb4ba29cb6cb731c0bb7fbdc6cdc44bf210
+EBUILD nginx-unit-1.20.0.ebuild 1953 BLAKE2B 8942de82799f70fae7997d63d34a9fe2f5ea056d288c3b07ca83e1dc36b68604959fd847bb291838a8bcffbd0bef0e084ec097c70e6c9368859437f79dcda3a7 SHA512 27ca570d72ebabaa53584dfcb66757692aa49b13133dde98a60dda1ec67b9cfb0d3ce78e3ea884e7355d3f55510179d5bb509d73ad793a03a6939aed4d14ffe4
+EBUILD nginx-unit-1.21.0.ebuild 1981 BLAKE2B 6e820e7fd492b6a249aa2572ae142296207fd7d29228b7a334ee2c8d02d64f00137448820e6e46c99a6459e0981287d4b8261b5505b49b46ca2d01d33dee58cb SHA512 c6d88def58af32377f6ce5bb79308d4f0cfb993cf94be4206f09efdaca8113a4ebc3c39b6292e9c6e200af624a6daed04ed9fe3a1db80f7b2ed34a0baa58d35e
 MISC metadata.xml 949 BLAKE2B 47faacf65d957c617419ef5183d99b77421bd45dd4499263eda7097fecc73633a085c05833e5b375e70865c4b12e6e02e224fdded5fed0e9eee19d44eb525e26 SHA512 c8073b3eea6233733ac01329aab48e51dd43fc6deb9c8ca8b482dbcb3df781069d750d0002f203309cebf64890d517b1ed900a9cda62e4a028fd2fd721a7f5c7
diff --git a/www-servers/nginx-unit/nginx-unit-1.17.0.ebuild b/www-servers/nginx-unit/nginx-unit-1.20.0.ebuild
index 49c2f106174a..49c2f106174a 100644
--- a/www-servers/nginx-unit/nginx-unit-1.17.0.ebuild
+++ b/www-servers/nginx-unit/nginx-unit-1.20.0.ebuild
diff --git a/www-servers/nginx-unit/nginx-unit-1.18.0.ebuild b/www-servers/nginx-unit/nginx-unit-1.21.0.ebuild
index ac0c6c8fc956..989cac450fa5 100644
--- a/www-servers/nginx-unit/nginx-unit-1.18.0.ebuild
+++ b/www-servers/nginx-unit/nginx-unit-1.21.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=(python3_{6,7,8})
+PYTHON_COMPAT=(python3_{6,7,8,9})
 
 inherit flag-o-matic python-single-r1 toolchain-funcs
 
@@ -26,7 +26,10 @@ DEPEND="perl? ( dev-lang/perl:= )
 	php7-3? ( dev-lang/php:7.3[embed] )
 	php7-4? ( dev-lang/php:7.4[embed] )
 	python? ( ${PYTHON_DEPS} )
-	ruby? ( dev-lang/ruby:* )
+	ruby? (
+		dev-lang/ruby:*
+		dev-ruby/rubygems:*
+	)
 	ssl? ( dev-libs/openssl:0 )"
 RDEPEND="${DEPEND}"
 S="${WORKDIR}/${MY_P}"
diff --git a/www-servers/nginx/Manifest b/www-servers/nginx/Manifest
index 45c0be87d97d..2d7a0ffc2922 100644
--- a/www-servers/nginx/Manifest
+++ b/www-servers/nginx/Manifest
@@ -13,6 +13,8 @@ DIST modsecurity-2.9.3.tar.gz 4307670 BLAKE2B 337ea15cc8805af7ab43aed8aecf4c72cc
 DIST nginx-1.18.0.tar.gz 1039530 BLAKE2B a8962a6af96acb043ff0c3dc4ad5192083773c449950aff53b01f6f7c46a2a540eb061a43432acccd753fa71067b1451d75f440ba5526575b78608be9d40a50b SHA512 8c21eeb62ab6e32e436932500f700bd2fb99fd2d29e43c08a5bfed4714c189c29c7141db551fcd5d2437303b7439f71758f7407dfd3e801e704e45e7daa78ddb
 DIST nginx-1.19.2.tar.gz 1048727 BLAKE2B db00b5945ed82fe90059269ba987931642981a2b8fa1cb24e0d842b97d89857993f99443c644d9217af29430b868ee8efd90dbc5daefd719d0f98c0766601554 SHA512 f6232d58a91db486cf36cc027ab84f04ad25aeafe586051043f0f3295dad5f475094f7cedad142ef0f56ff15a0971d700d6ec34b68697c462364650c49be8fcc
 DIST nginx-1.19.3.tar.gz 1052581 BLAKE2B 96cbbb4224ca8fcddc67b8fd025acdb31b1a07ba20a0f8b665c29c02b53568bbb0b79a7e583f3a7e7b23ff51cb01b1694eee9a178f7f26ce70f96312655a2b59 SHA512 337fbbb562d1577a2a219bd132c82098a06a49f1ce40ced905fdf255238c4f70dd1f889ec8ae971a4fe5e753f98a356cadc9c766bc089f817d711b12143efcc8
+DIST nginx-1.19.4.tar.gz 1054974 BLAKE2B 7f6cff700fe4816d724abef427775525956f1be666705e6c5e0034fcf5e43bb0832f036d5230c5b0e8cd4fdbbf80466a9539ed42a84fc7bc9b4a43cb3a5aa60c SHA512 081fdf691d4c4d59391a668f36b4d8b030087c70d4d5e0bc568d41bd7f473b9c1ebbc09ec52d4e7cc68aa9545737e3dac6e653b00dfb1366a063f6463cc30f3f
+DIST nginx-1.19.5.tar.gz 1055590 BLAKE2B dc838848829553205886f1d538009ecccfd4b0d45bae3268e40eaad6ff1cfd4c4b8f4f93bfcd241e1e17d81c3276298dc047e08f1edabe0a8c941752689c1bb9 SHA512 169bdbbea82127b83c51e818df3dc9056070f0cc56d10257aa7fa7bd6aedc7b70fdfe236ac06bd6442ff4990b36132b054d2654de51a9fe86a19e7cb63edf05c
 DIST nginx-auth-ldap-42d195d7a7575ebab1c369ad3fc5d78dc2c2669c.tar.gz 18457 BLAKE2B 22225ca9e5299b20ab5a93a001cac48e446bd86b3a24ac49e716bc975b128890bdb4b0dbbf5730fbaaeadfd958160093c7a6af798dd0e6de27062f149a760333 SHA512 ec59637fda5acac053e815cb1d04b545fc6b765e5ec63d8c2c9c301abad87afaa2698145acac08e9e14c91e1423ebff7aff0cca2b940b19ccccbf4cf53973269
 DIST nginx_http_sticky_module_ng-1.2.6-10-g08a395c66e42.tar.bz2 124047 BLAKE2B d37ef9a15c91abe3c6258e420d1f99fa452f9d9966a0e13102174973314a3bac5413957a5fe632a9dcb1163b3be5df8116e05cc053ee061e19319ec25f341570 SHA512 6c1bfdcf89884b2855d51ae7da0f6e53a4ca3629e1aaf58433b70c07dcb2af797ba6e87d9b3eb4fe2fb6d4d697e862f2b4c2f8d8b3fdaea201740c97ec936529
 DIST ngx_brotli-1.0.0rc.tar.gz 16207 BLAKE2B 450d0ea693bd98d4a1b615f2cdcaad41ccd28266f6d80beec7fe77fe750ab8c5d1bb55aabe15161b9b6d819d2b4d99a7774f2706f2f6fd084b52a7c7dddbc00c SHA512 05a880d5e48ac83be84498ed41fb4750211b827a9d7541acfd6ef494e5205a6e853d5594bfec3ab4ae668ea3f803e4f4b0ba550c76811971c8e266e42663c56d
@@ -41,4 +43,6 @@ DIST njs-0.4.4.tar.gz 486870 BLAKE2B 9390bfe35249ea34b9edd4b7c2360a25c9ecb232e10
 EBUILD nginx-1.18.0-r2.ebuild 40458 BLAKE2B bab6ebfd5a4ef14026cf3149757dcf207dad0245b48a31bcb93a61709bb6a9a656ebb0d8ebcc0f502daab9b7b9a0a7a4dc5d00cb2ececc4606f508d87e8e23f2 SHA512 54651ac56efa4ed927189dbbc2165af8d916097c0e623fcd7427096be4605d093772913511372dd5040ff2c7c9d305d0686ccf713205eff3c3cf41e3fa12a241
 EBUILD nginx-1.19.2-r1.ebuild 40460 BLAKE2B 620254271c03d328f5377c23307af52838a8f2eaa8e60a91eed785fdf2c02c8cf3ae349e2b7b04a29024ee14247c001253e234c1551ac2fcb665ab98ca1674a8 SHA512 0a9c9d53cf47520c5f2f04a72b6f64d5399571ce371b31a09d1d81f160ffa88e461b6e335d0ea05428d62612e014f682bfeefeb25d6b05eaf1690c31f822e134
 EBUILD nginx-1.19.3.ebuild 40431 BLAKE2B f78ec32446bf5017b58fda56370b72d1b2fc7176f2b4fcec70e4b22a00b124b96eb4d2d28182ecbf13ccd1c6ce43ee7324b36608ae13fdc1fd6d3ca947e0b52b SHA512 6445a587721d55fd09505970db538cbd2cdb9d72820526869a2d910a049b479f01ea968434eb7f2f1c4889f03fcf6921025530a686693a380f381017e40b34fb
+EBUILD nginx-1.19.4.ebuild 40431 BLAKE2B f78ec32446bf5017b58fda56370b72d1b2fc7176f2b4fcec70e4b22a00b124b96eb4d2d28182ecbf13ccd1c6ce43ee7324b36608ae13fdc1fd6d3ca947e0b52b SHA512 6445a587721d55fd09505970db538cbd2cdb9d72820526869a2d910a049b479f01ea968434eb7f2f1c4889f03fcf6921025530a686693a380f381017e40b34fb
+EBUILD nginx-1.19.5.ebuild 40431 BLAKE2B f78ec32446bf5017b58fda56370b72d1b2fc7176f2b4fcec70e4b22a00b124b96eb4d2d28182ecbf13ccd1c6ce43ee7324b36608ae13fdc1fd6d3ca947e0b52b SHA512 6445a587721d55fd09505970db538cbd2cdb9d72820526869a2d910a049b479f01ea968434eb7f2f1c4889f03fcf6921025530a686693a380f381017e40b34fb
 MISC metadata.xml 1193 BLAKE2B aeb293cf75ed650c946910222d6396f726dc5ed49f1213e6a5664613d78e3b27616399bc1c9f0a360f5303b16931da7016cdf540b24601afafc3ada4428b33a9 SHA512 a96002bc9845bc465542c753c738899b77ad7a32fac7f5f9a7049336868bc41199e926422e3dc23e47f34656c9aaea255511d2ef91e9d59f48c9cd0b4a3c4903
diff --git a/www-servers/nginx/nginx-1.19.4.ebuild b/www-servers/nginx/nginx-1.19.4.ebuild
new file mode 100644
index 000000000000..2f271e65ba7a
--- /dev/null
+++ b/www-servers/nginx/nginx-1.19.4.ebuild
@@ -0,0 +1,1087 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+# Maintainer notes:
+# - http_rewrite-independent pcre-support makes sense for matching locations without an actual rewrite
+# - any http-module activates the main http-functionality and overrides USE=-http
+# - keep the following requirements in mind before adding external modules:
+#	* alive upstream
+#	* sane packaging
+#	* builds cleanly
+#	* does not need a patch for nginx core
+# - TODO: test the google-perftools module (included in vanilla tarball)
+
+# prevent perl-module from adding automagic perl DEPENDs
+GENTOO_DEPEND_ON_PERL="no"
+
+# devel_kit (https://github.com/simpl/ngx_devel_kit, BSD license)
+DEVEL_KIT_MODULE_PV="0.3.1"
+DEVEL_KIT_MODULE_P="ngx_devel_kit-${DEVEL_KIT_MODULE_PV}"
+DEVEL_KIT_MODULE_URI="https://github.com/simpl/ngx_devel_kit/archive/v${DEVEL_KIT_MODULE_PV}.tar.gz"
+DEVEL_KIT_MODULE_WD="${WORKDIR}/ngx_devel_kit-${DEVEL_KIT_MODULE_PV}"
+
+# ngx_brotli (https://github.com/google/ngx_brotli, BSD-2)
+HTTP_BROTLI_MODULE_PV="1.0.0rc"
+HTTP_BROTLI_MODULE_P="ngx_brotli-${HTTP_BROTLI_MODULE_PV}"
+HTTP_BROTLI_MODULE_URI="https://github.com/google/ngx_brotli/archive/v${HTTP_BROTLI_MODULE_PV}.tar.gz"
+HTTP_BROTLI_MODULE_WD="${WORKDIR}/ngx_brotli-${HTTP_BROTLI_MODULE_PV}"
+
+# http_uploadprogress (https://github.com/masterzen/nginx-upload-progress-module, BSD-2 license)
+HTTP_UPLOAD_PROGRESS_MODULE_PV="0.9.2"
+HTTP_UPLOAD_PROGRESS_MODULE_P="ngx_http_upload_progress-${HTTP_UPLOAD_PROGRESS_MODULE_PV}-r1"
+HTTP_UPLOAD_PROGRESS_MODULE_URI="https://github.com/masterzen/nginx-upload-progress-module/archive/v${HTTP_UPLOAD_PROGRESS_MODULE_PV}.tar.gz"
+HTTP_UPLOAD_PROGRESS_MODULE_WD="${WORKDIR}/nginx-upload-progress-module-${HTTP_UPLOAD_PROGRESS_MODULE_PV}"
+
+# http_headers_more (https://github.com/agentzh/headers-more-nginx-module, BSD license)
+HTTP_HEADERS_MORE_MODULE_PV="0.33"
+HTTP_HEADERS_MORE_MODULE_P="ngx_http_headers_more-${HTTP_HEADERS_MORE_MODULE_PV}"
+HTTP_HEADERS_MORE_MODULE_URI="https://github.com/agentzh/headers-more-nginx-module/archive/v${HTTP_HEADERS_MORE_MODULE_PV}.tar.gz"
+HTTP_HEADERS_MORE_MODULE_WD="${WORKDIR}/headers-more-nginx-module-${HTTP_HEADERS_MORE_MODULE_PV}"
+
+# http_cache_purge (http://labs.frickle.com/nginx_ngx_cache_purge/, https://github.com/FRiCKLE/ngx_cache_purge, BSD-2 license)
+HTTP_CACHE_PURGE_MODULE_PV="2.3"
+HTTP_CACHE_PURGE_MODULE_P="ngx_http_cache_purge-${HTTP_CACHE_PURGE_MODULE_PV}"
+HTTP_CACHE_PURGE_MODULE_URI="http://labs.frickle.com/files/ngx_cache_purge-${HTTP_CACHE_PURGE_MODULE_PV}.tar.gz"
+HTTP_CACHE_PURGE_MODULE_WD="${WORKDIR}/ngx_cache_purge-${HTTP_CACHE_PURGE_MODULE_PV}"
+
+# http_slowfs_cache (http://labs.frickle.com/nginx_ngx_slowfs_cache/, BSD-2 license)
+HTTP_SLOWFS_CACHE_MODULE_PV="1.10"
+HTTP_SLOWFS_CACHE_MODULE_P="ngx_http_slowfs_cache-${HTTP_SLOWFS_CACHE_MODULE_PV}"
+HTTP_SLOWFS_CACHE_MODULE_URI="http://labs.frickle.com/files/ngx_slowfs_cache-${HTTP_SLOWFS_CACHE_MODULE_PV}.tar.gz"
+HTTP_SLOWFS_CACHE_MODULE_WD="${WORKDIR}/ngx_slowfs_cache-${HTTP_SLOWFS_CACHE_MODULE_PV}"
+
+# http_fancyindex (https://github.com/aperezdc/ngx-fancyindex, BSD license)
+HTTP_FANCYINDEX_MODULE_PV="0.4.4"
+HTTP_FANCYINDEX_MODULE_P="ngx_http_fancyindex-${HTTP_FANCYINDEX_MODULE_PV}"
+HTTP_FANCYINDEX_MODULE_URI="https://github.com/aperezdc/ngx-fancyindex/archive/v${HTTP_FANCYINDEX_MODULE_PV}.tar.gz"
+HTTP_FANCYINDEX_MODULE_WD="${WORKDIR}/ngx-fancyindex-${HTTP_FANCYINDEX_MODULE_PV}"
+
+# http_lua (https://github.com/openresty/lua-nginx-module, BSD license)
+HTTP_LUA_MODULE_PV="0.10.15"
+HTTP_LUA_MODULE_P="ngx_http_lua-${HTTP_LUA_MODULE_PV}"
+HTTP_LUA_MODULE_URI="https://github.com/openresty/lua-nginx-module/archive/v${HTTP_LUA_MODULE_PV}.tar.gz"
+HTTP_LUA_MODULE_WD="${WORKDIR}/lua-nginx-module-${HTTP_LUA_MODULE_PV}"
+
+# http_auth_pam (https://github.com/stogh/ngx_http_auth_pam_module/, http://web.iti.upv.es/~sto/nginx/, BSD-2 license)
+HTTP_AUTH_PAM_MODULE_PV="1.5.2"
+HTTP_AUTH_PAM_MODULE_P="ngx_http_auth_pam-${HTTP_AUTH_PAM_MODULE_PV}"
+HTTP_AUTH_PAM_MODULE_URI="https://github.com/stogh/ngx_http_auth_pam_module/archive/v${HTTP_AUTH_PAM_MODULE_PV}.tar.gz"
+HTTP_AUTH_PAM_MODULE_WD="${WORKDIR}/ngx_http_auth_pam_module-${HTTP_AUTH_PAM_MODULE_PV}"
+
+# http_upstream_check (https://github.com/yaoweibin/nginx_upstream_check_module, BSD license)
+HTTP_UPSTREAM_CHECK_MODULE_PV="9aecf15ec379fe98f62355c57b60c0bc83296f04"
+HTTP_UPSTREAM_CHECK_MODULE_P="ngx_http_upstream_check-${HTTP_UPSTREAM_CHECK_MODULE_PV}"
+HTTP_UPSTREAM_CHECK_MODULE_URI="https://github.com/yaoweibin/nginx_upstream_check_module/archive/${HTTP_UPSTREAM_CHECK_MODULE_PV}.tar.gz"
+HTTP_UPSTREAM_CHECK_MODULE_WD="${WORKDIR}/nginx_upstream_check_module-${HTTP_UPSTREAM_CHECK_MODULE_PV}"
+
+# http_metrics (https://github.com/zenops/ngx_metrics, BSD license)
+HTTP_METRICS_MODULE_PV="0.1.1"
+HTTP_METRICS_MODULE_P="ngx_metrics-${HTTP_METRICS_MODULE_PV}"
+HTTP_METRICS_MODULE_URI="https://github.com/madvertise/ngx_metrics/archive/v${HTTP_METRICS_MODULE_PV}.tar.gz"
+HTTP_METRICS_MODULE_WD="${WORKDIR}/ngx_metrics-${HTTP_METRICS_MODULE_PV}"
+
+# http_vhost_traffic_status (https://github.com/vozlt/nginx-module-vts, BSD license)
+HTTP_VHOST_TRAFFIC_STATUS_MODULE_PV="46d85558e344dfe2b078ce757fd36c69a1ec2dd3"
+HTTP_VHOST_TRAFFIC_STATUS_MODULE_P="ngx_http_vhost_traffic_status-${HTTP_VHOST_TRAFFIC_STATUS_MODULE_PV}"
+HTTP_VHOST_TRAFFIC_STATUS_MODULE_URI="https://github.com/vozlt/nginx-module-vts/archive/${HTTP_VHOST_TRAFFIC_STATUS_MODULE_PV}.tar.gz"
+HTTP_VHOST_TRAFFIC_STATUS_MODULE_WD="${WORKDIR}/nginx-module-vts-${HTTP_VHOST_TRAFFIC_STATUS_MODULE_PV}"
+
+# naxsi-core (https://github.com/nbs-system/naxsi, GPLv2+)
+HTTP_NAXSI_MODULE_PV="0.56"
+HTTP_NAXSI_MODULE_P="ngx_http_naxsi-${HTTP_NAXSI_MODULE_PV}"
+HTTP_NAXSI_MODULE_URI="https://github.com/nbs-system/naxsi/archive/${HTTP_NAXSI_MODULE_PV}.tar.gz"
+HTTP_NAXSI_MODULE_WD="${WORKDIR}/naxsi-${HTTP_NAXSI_MODULE_PV}/naxsi_src"
+
+# nginx-rtmp-module (https://github.com/arut/nginx-rtmp-module, BSD license)
+RTMP_MODULE_PV="1.2.1"
+RTMP_MODULE_P="ngx_rtmp-${RTMP_MODULE_PV}"
+RTMP_MODULE_URI="https://github.com/arut/nginx-rtmp-module/archive/v${RTMP_MODULE_PV}.tar.gz"
+RTMP_MODULE_WD="${WORKDIR}/nginx-rtmp-module-${RTMP_MODULE_PV}"
+
+# nginx-dav-ext-module (https://github.com/arut/nginx-dav-ext-module, BSD license)
+HTTP_DAV_EXT_MODULE_PV="3.0.0"
+HTTP_DAV_EXT_MODULE_P="ngx_http_dav_ext-${HTTP_DAV_EXT_MODULE_PV}"
+HTTP_DAV_EXT_MODULE_URI="https://github.com/arut/nginx-dav-ext-module/archive/v${HTTP_DAV_EXT_MODULE_PV}.tar.gz"
+HTTP_DAV_EXT_MODULE_WD="${WORKDIR}/nginx-dav-ext-module-${HTTP_DAV_EXT_MODULE_PV}"
+
+# echo-nginx-module (https://github.com/openresty/echo-nginx-module, BSD license)
+HTTP_ECHO_MODULE_PV="0.62"
+HTTP_ECHO_MODULE_P="ngx_http_echo-${HTTP_ECHO_MODULE_PV}"
+HTTP_ECHO_MODULE_URI="https://github.com/openresty/echo-nginx-module/archive/v${HTTP_ECHO_MODULE_PV}.tar.gz"
+HTTP_ECHO_MODULE_WD="${WORKDIR}/echo-nginx-module-${HTTP_ECHO_MODULE_PV}"
+
+# mod_security for nginx (https://modsecurity.org/, Apache-2.0)
+# keep the MODULE_P here consistent with upstream to avoid tarball duplication
+HTTP_SECURITY_MODULE_PV="2.9.3"
+HTTP_SECURITY_MODULE_P="modsecurity-${HTTP_SECURITY_MODULE_PV}"
+HTTP_SECURITY_MODULE_URI="https://www.modsecurity.org/tarball/${HTTP_SECURITY_MODULE_PV}/${HTTP_SECURITY_MODULE_P}.tar.gz"
+HTTP_SECURITY_MODULE_WD="${WORKDIR}/${HTTP_SECURITY_MODULE_P}"
+
+# push-stream-module (http://www.nginxpushstream.com, https://github.com/wandenberg/nginx-push-stream-module, GPL-3)
+HTTP_PUSH_STREAM_MODULE_PV="0.5.4"
+HTTP_PUSH_STREAM_MODULE_P="ngx_http_push_stream-${HTTP_PUSH_STREAM_MODULE_PV}"
+HTTP_PUSH_STREAM_MODULE_URI="https://github.com/wandenberg/nginx-push-stream-module/archive/${HTTP_PUSH_STREAM_MODULE_PV}.tar.gz"
+HTTP_PUSH_STREAM_MODULE_WD="${WORKDIR}/nginx-push-stream-module-${HTTP_PUSH_STREAM_MODULE_PV}"
+
+# sticky-module (https://bitbucket.org/nginx-goodies/nginx-sticky-module-ng, BSD-2)
+HTTP_STICKY_MODULE_PV="1.2.6-10-g08a395c66e42"
+HTTP_STICKY_MODULE_P="nginx_http_sticky_module_ng-${HTTP_STICKY_MODULE_PV}"
+HTTP_STICKY_MODULE_URI="https://bitbucket.org/nginx-goodies/nginx-sticky-module-ng/get/${HTTP_STICKY_MODULE_PV}.tar.bz2"
+HTTP_STICKY_MODULE_WD="${WORKDIR}/nginx-goodies-nginx-sticky-module-ng-08a395c66e42"
+
+# mogilefs-module (https://github.com/vkholodkov/nginx-mogilefs-module, BSD-2)
+HTTP_MOGILEFS_MODULE_PV="1.0.4"
+HTTP_MOGILEFS_MODULE_P="ngx_mogilefs_module-${HTTP_MOGILEFS_MODULE_PV}"
+HTTP_MOGILEFS_MODULE_URI="https://github.com/vkholodkov/nginx-mogilefs-module/archive/${HTTP_MOGILEFS_MODULE_PV}.tar.gz"
+HTTP_MOGILEFS_MODULE_WD="${WORKDIR}/nginx_mogilefs_module-${HTTP_MOGILEFS_MODULE_PV}"
+
+# memc-module (https://github.com/openresty/memc-nginx-module, BSD-2)
+HTTP_MEMC_MODULE_PV="0.19"
+HTTP_MEMC_MODULE_P="ngx_memc_module-${HTTP_MEMC_MODULE_PV}"
+HTTP_MEMC_MODULE_URI="https://github.com/openresty/memc-nginx-module/archive/v${HTTP_MEMC_MODULE_PV}.tar.gz"
+HTTP_MEMC_MODULE_WD="${WORKDIR}/memc-nginx-module-${HTTP_MEMC_MODULE_PV}"
+
+# nginx-ldap-auth-module (https://github.com/kvspb/nginx-auth-ldap, BSD-2)
+HTTP_LDAP_MODULE_PV="42d195d7a7575ebab1c369ad3fc5d78dc2c2669c"
+HTTP_LDAP_MODULE_P="nginx-auth-ldap-${HTTP_LDAP_MODULE_PV}"
+HTTP_LDAP_MODULE_URI="https://github.com/kvspb/nginx-auth-ldap/archive/${HTTP_LDAP_MODULE_PV}.tar.gz"
+HTTP_LDAP_MODULE_WD="${WORKDIR}/nginx-auth-ldap-${HTTP_LDAP_MODULE_PV}"
+
+# geoip2 (https://github.com/leev/ngx_http_geoip2_module, BSD-2)
+GEOIP2_MODULE_PV="3.3"
+GEOIP2_MODULE_P="ngx_http_geoip2_module-${GEOIP2_MODULE_PV}"
+GEOIP2_MODULE_URI="https://github.com/leev/ngx_http_geoip2_module/archive/${GEOIP2_MODULE_PV}.tar.gz"
+GEOIP2_MODULE_WD="${WORKDIR}/ngx_http_geoip2_module-${GEOIP2_MODULE_PV}"
+
+# njs-module (https://github.com/nginx/njs, as-is)
+NJS_MODULE_PV="0.4.4"
+NJS_MODULE_P="njs-${NJS_MODULE_PV}"
+NJS_MODULE_URI="https://github.com/nginx/njs/archive/${NJS_MODULE_PV}.tar.gz"
+NJS_MODULE_WD="${WORKDIR}/njs-${NJS_MODULE_PV}"
+
+# We handle deps below ourselves
+SSL_DEPS_SKIP=1
+AUTOTOOLS_AUTO_DEPEND="no"
+
+inherit autotools ssl-cert toolchain-funcs perl-module flag-o-matic user systemd versionator multilib pax-utils
+
+DESCRIPTION="Robust, small and high performance http and reverse proxy server"
+HOMEPAGE="https://nginx.org"
+SRC_URI="https://nginx.org/download/${P}.tar.gz
+	${DEVEL_KIT_MODULE_URI} -> ${DEVEL_KIT_MODULE_P}.tar.gz
+	nginx_modules_http_auth_ldap? ( ${HTTP_LDAP_MODULE_URI} -> ${HTTP_LDAP_MODULE_P}.tar.gz )
+	nginx_modules_http_auth_pam? ( ${HTTP_AUTH_PAM_MODULE_URI} -> ${HTTP_AUTH_PAM_MODULE_P}.tar.gz )
+	nginx_modules_http_brotli? ( ${HTTP_BROTLI_MODULE_URI} -> ${HTTP_BROTLI_MODULE_P}.tar.gz )
+	nginx_modules_http_cache_purge? ( ${HTTP_CACHE_PURGE_MODULE_URI} -> ${HTTP_CACHE_PURGE_MODULE_P}.tar.gz )
+	nginx_modules_http_dav_ext? ( ${HTTP_DAV_EXT_MODULE_URI} -> ${HTTP_DAV_EXT_MODULE_P}.tar.gz )
+	nginx_modules_http_echo? ( ${HTTP_ECHO_MODULE_URI} -> ${HTTP_ECHO_MODULE_P}.tar.gz )
+	nginx_modules_http_fancyindex? ( ${HTTP_FANCYINDEX_MODULE_URI} -> ${HTTP_FANCYINDEX_MODULE_P}.tar.gz )
+	nginx_modules_http_geoip2? ( ${GEOIP2_MODULE_URI} -> ${GEOIP2_MODULE_P}.tar.gz )
+	nginx_modules_http_headers_more? ( ${HTTP_HEADERS_MORE_MODULE_URI} -> ${HTTP_HEADERS_MORE_MODULE_P}.tar.gz )
+	nginx_modules_http_javascript? ( ${NJS_MODULE_URI} -> ${NJS_MODULE_P}.tar.gz )
+	nginx_modules_http_lua? ( ${HTTP_LUA_MODULE_URI} -> ${HTTP_LUA_MODULE_P}.tar.gz )
+	nginx_modules_http_memc? ( ${HTTP_MEMC_MODULE_URI} -> ${HTTP_MEMC_MODULE_P}.tar.gz )
+	nginx_modules_http_metrics? ( ${HTTP_METRICS_MODULE_URI} -> ${HTTP_METRICS_MODULE_P}.tar.gz )
+	nginx_modules_http_mogilefs? ( ${HTTP_MOGILEFS_MODULE_URI} -> ${HTTP_MOGILEFS_MODULE_P}.tar.gz )
+	nginx_modules_http_naxsi? ( ${HTTP_NAXSI_MODULE_URI} -> ${HTTP_NAXSI_MODULE_P}.tar.gz )
+	nginx_modules_http_push_stream? ( ${HTTP_PUSH_STREAM_MODULE_URI} -> ${HTTP_PUSH_STREAM_MODULE_P}.tar.gz )
+	nginx_modules_http_security? ( ${HTTP_SECURITY_MODULE_URI} -> ${HTTP_SECURITY_MODULE_P}.tar.gz )
+	nginx_modules_http_slowfs_cache? ( ${HTTP_SLOWFS_CACHE_MODULE_URI} -> ${HTTP_SLOWFS_CACHE_MODULE_P}.tar.gz )
+	nginx_modules_http_sticky? ( ${HTTP_STICKY_MODULE_URI} -> ${HTTP_STICKY_MODULE_P}.tar.bz2 )
+	nginx_modules_http_upload_progress? ( ${HTTP_UPLOAD_PROGRESS_MODULE_URI} -> ${HTTP_UPLOAD_PROGRESS_MODULE_P}.tar.gz )
+	nginx_modules_http_upstream_check? ( ${HTTP_UPSTREAM_CHECK_MODULE_URI} -> ${HTTP_UPSTREAM_CHECK_MODULE_P}.tar.gz )
+	nginx_modules_http_vhost_traffic_status? ( ${HTTP_VHOST_TRAFFIC_STATUS_MODULE_URI} -> ${HTTP_VHOST_TRAFFIC_STATUS_MODULE_P}.tar.gz )
+	nginx_modules_stream_geoip2? ( ${GEOIP2_MODULE_URI} -> ${GEOIP2_MODULE_P}.tar.gz )
+	nginx_modules_stream_javascript? ( ${NJS_MODULE_URI} -> ${NJS_MODULE_P}.tar.gz )
+	rtmp? ( ${RTMP_MODULE_URI} -> ${RTMP_MODULE_P}.tar.gz )"
+
+LICENSE="BSD-2 BSD SSLeay MIT GPL-2 GPL-2+
+	nginx_modules_http_security? ( Apache-2.0 )
+	nginx_modules_http_push_stream? ( GPL-3 )"
+
+SLOT="mainline"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+
+# Package doesn't provide a real test suite
+RESTRICT="test"
+
+NGINX_MODULES_STD="access auth_basic autoindex browser charset empty_gif
+	fastcgi geo grpc gzip limit_req limit_conn map memcached mirror
+	proxy referer rewrite scgi ssi split_clients upstream_hash
+	upstream_ip_hash upstream_keepalive upstream_least_conn
+	upstream_zone userid uwsgi"
+NGINX_MODULES_OPT="addition auth_request dav degradation flv geoip gunzip
+	gzip_static image_filter mp4 perl random_index realip secure_link
+	slice stub_status sub xslt"
+NGINX_MODULES_STREAM_STD="access geo limit_conn map return split_clients
+	upstream_hash upstream_least_conn upstream_zone"
+NGINX_MODULES_STREAM_OPT="geoip realip ssl_preread"
+NGINX_MODULES_MAIL="imap pop3 smtp"
+NGINX_MODULES_3RD="
+	http_auth_ldap
+	http_auth_pam
+	http_brotli
+	http_cache_purge
+	http_dav_ext
+	http_echo
+	http_fancyindex
+	http_geoip2
+	http_headers_more
+	http_javascript
+	http_lua
+	http_memc
+	http_metrics
+	http_mogilefs
+	http_naxsi
+	http_push_stream
+	http_security
+	http_slowfs_cache
+	http_sticky
+	http_upload_progress
+	http_upstream_check
+	http_vhost_traffic_status
+	stream_geoip2
+	stream_javascript
+"
+
+IUSE="aio debug +http +http2 +http-cache +ipv6 libatomic libressl luajit +pcre
+	pcre-jit rtmp selinux ssl threads userland_GNU vim-syntax"
+
+for mod in $NGINX_MODULES_STD; do
+	IUSE="${IUSE} +nginx_modules_http_${mod}"
+done
+
+for mod in $NGINX_MODULES_OPT; do
+	IUSE="${IUSE} nginx_modules_http_${mod}"
+done
+
+for mod in $NGINX_MODULES_STREAM_STD; do
+	IUSE="${IUSE} nginx_modules_stream_${mod}"
+done
+
+for mod in $NGINX_MODULES_STREAM_OPT; do
+	IUSE="${IUSE} nginx_modules_stream_${mod}"
+done
+
+for mod in $NGINX_MODULES_MAIL; do
+	IUSE="${IUSE} nginx_modules_mail_${mod}"
+done
+
+for mod in $NGINX_MODULES_3RD; do
+	IUSE="${IUSE} nginx_modules_${mod}"
+done
+
+# Add so we can warn users updating about config changes
+# @TODO: jbergstroem: remove on next release series
+IUSE="${IUSE} nginx_modules_http_spdy"
+
+CDEPEND="
+	pcre? ( dev-libs/libpcre:= )
+	pcre-jit? ( dev-libs/libpcre:=[jit] )
+	ssl? (
+		!libressl? ( dev-libs/openssl:0= )
+		libressl? ( dev-libs/libressl:= )
+	)
+	http2? (
+		!libressl? ( >=dev-libs/openssl-1.0.1c:0= )
+		libressl? ( dev-libs/libressl:= )
+	)
+	http-cache? (
+		userland_GNU? (
+			!libressl? ( dev-libs/openssl:0= )
+			libressl? ( dev-libs/libressl:= )
+		)
+	)
+	nginx_modules_http_brotli? ( app-arch/brotli:= )
+	nginx_modules_http_geoip? ( dev-libs/geoip )
+	nginx_modules_http_geoip2? ( dev-libs/libmaxminddb:= )
+	nginx_modules_http_gunzip? ( sys-libs/zlib )
+	nginx_modules_http_gzip? ( sys-libs/zlib )
+	nginx_modules_http_gzip_static? ( sys-libs/zlib )
+	nginx_modules_http_image_filter? ( media-libs/gd:=[jpeg,png] )
+	nginx_modules_http_perl? ( >=dev-lang/perl-5.8:= )
+	nginx_modules_http_rewrite? ( dev-libs/libpcre:= )
+	nginx_modules_http_secure_link? (
+		userland_GNU? (
+			!libressl? ( dev-libs/openssl:0= )
+			libressl? ( dev-libs/libressl:= )
+		)
+	)
+	nginx_modules_http_xslt? ( dev-libs/libxml2:= dev-libs/libxslt )
+	nginx_modules_http_lua? ( dev-lang/luajit:2= )
+	nginx_modules_http_auth_pam? ( sys-libs/pam )
+	nginx_modules_http_metrics? ( dev-libs/yajl:= )
+	nginx_modules_http_dav_ext? ( dev-libs/libxml2 )
+	nginx_modules_http_security? (
+		dev-libs/apr:=
+		dev-libs/apr-util:=
+		dev-libs/libxml2:=
+		net-misc/curl
+		www-servers/apache
+	)
+	nginx_modules_http_auth_ldap? ( net-nds/openldap[ssl?] )
+	nginx_modules_stream_geoip? ( dev-libs/geoip )
+	nginx_modules_stream_geoip2? ( dev-libs/libmaxminddb:= )"
+RDEPEND="${CDEPEND}
+	selinux? ( sec-policy/selinux-nginx )
+	!www-servers/nginx:0"
+DEPEND="${CDEPEND}
+	nginx_modules_http_brotli? ( virtual/pkgconfig )
+	nginx_modules_http_security? ( ${AUTOTOOLS_DEPEND} )
+	arm? ( dev-libs/libatomic_ops )
+	libatomic? ( dev-libs/libatomic_ops )"
+PDEPEND="vim-syntax? ( app-vim/nginx-syntax )"
+
+REQUIRED_USE="pcre-jit? ( pcre )
+	nginx_modules_http_fancyindex? ( nginx_modules_http_addition )
+	nginx_modules_http_grpc? ( http2 )
+	nginx_modules_http_lua? (
+		luajit
+		nginx_modules_http_rewrite
+	)
+	nginx_modules_http_naxsi? ( pcre )
+	nginx_modules_http_dav_ext? ( nginx_modules_http_dav nginx_modules_http_xslt )
+	nginx_modules_http_metrics? ( nginx_modules_http_stub_status )
+	nginx_modules_http_security? ( pcre )
+	nginx_modules_http_push_stream? ( ssl )"
+
+pkg_setup() {
+	NGINX_HOME="/var/lib/nginx"
+	NGINX_HOME_TMP="${NGINX_HOME}/tmp"
+
+	ebegin "Creating nginx user and group"
+	enewgroup ${PN}
+	enewuser ${PN} -1 -1 "${NGINX_HOME}" ${PN}
+	eend $?
+
+	if use libatomic; then
+		ewarn "GCC 4.1+ features built-in atomic operations."
+		ewarn "Using libatomic_ops is only needed if using"
+		ewarn "a different compiler or a GCC prior to 4.1"
+	fi
+
+	if [[ -n $NGINX_ADD_MODULES ]]; then
+		ewarn "You are building custom modules via \$NGINX_ADD_MODULES!"
+		ewarn "This nginx installation is not supported!"
+		ewarn "Make sure you can reproduce the bug without those modules"
+		ewarn "_before_ reporting bugs."
+	fi
+
+	if use !http; then
+		ewarn "To actually disable all http-functionality you also have to disable"
+		ewarn "all nginx http modules."
+	fi
+
+	if use nginx_modules_http_mogilefs && use threads; then
+		eerror "mogilefs won't compile with threads support."
+		eerror "Please disable either flag and try again."
+		die "Can't compile mogilefs with threads support"
+	fi
+}
+
+src_prepare() {
+	eapply "${FILESDIR}/${PN}-1.4.1-fix-perl-install-path.patch"
+	eapply "${FILESDIR}/${PN}-httpoxy-mitigation-r1.patch"
+
+	if use nginx_modules_http_brotli; then
+		cd "${HTTP_BROTLI_MODULE_WD}" || die
+		eapply "${FILESDIR}"/http_brotli-detect-brotli-r3.patch
+		cd "${S}" || die
+	fi
+
+	if use nginx_modules_http_upstream_check; then
+		eapply -p0 "${FILESDIR}"/http_upstream_check-nginx-1.11.5+.patch
+	fi
+
+	if use nginx_modules_http_cache_purge; then
+		cd "${HTTP_CACHE_PURGE_MODULE_WD}" || die
+		eapply "${FILESDIR}"/http_cache_purge-1.11.6+.patch
+		cd "${S}" || die
+	fi
+
+	if use nginx_modules_http_security; then
+		cd "${HTTP_SECURITY_MODULE_WD}" || die
+
+		eautoreconf
+
+		if use luajit ; then
+			sed -i \
+				-e 's|^\(LUA_PKGNAMES\)=.*|\1="luajit"|' \
+				configure || die
+		fi
+
+		cd "${S}" || die
+	fi
+
+	if use nginx_modules_http_upload_progress; then
+		cd "${HTTP_UPLOAD_PROGRESS_MODULE_WD}" || die
+		eapply "${FILESDIR}"/http_uploadprogress-issue_50-r1.patch
+		cd "${S}" || die
+	fi
+
+	find auto/ -type f -print0 | xargs -0 sed -i 's:\&\& make:\&\& \\$(MAKE):' || die
+	# We have config protection, don't rename etc files
+	sed -i 's:.default::' auto/install || die
+	# remove useless files
+	sed -i -e '/koi-/d' -e '/win-/d' auto/install || die
+
+	# don't install to /etc/nginx/ if not in use
+	local module
+	for module in fastcgi scgi uwsgi ; do
+		if ! use nginx_modules_http_${module}; then
+			sed -i -e "/${module}/d" auto/install || die
+		fi
+	done
+
+	eapply_user
+}
+
+src_configure() {
+	# mod_security needs to generate nginx/modsecurity/config before including it
+	if use nginx_modules_http_security; then
+		cd "${HTTP_SECURITY_MODULE_WD}" || die
+
+		./configure \
+			--enable-standalone-module \
+			--disable-mlogc \
+			--with-ssdeep=no \
+			$(use_enable pcre-jit) \
+			$(use_with nginx_modules_http_lua lua) || die "configure failed for mod_security"
+
+		cd "${S}" || die
+	fi
+
+	local myconf=() http_enabled= mail_enabled= stream_enabled=
+
+	use aio       && myconf+=( --with-file-aio )
+	use debug     && myconf+=( --with-debug )
+	use http2     && myconf+=( --with-http_v2_module )
+	use libatomic && myconf+=( --with-libatomic )
+	use pcre      && myconf+=( --with-pcre )
+	use pcre-jit  && myconf+=( --with-pcre-jit )
+	use threads   && myconf+=( --with-threads )
+
+	# HTTP modules
+	for mod in $NGINX_MODULES_STD; do
+		if use nginx_modules_http_${mod}; then
+			http_enabled=1
+		else
+			myconf+=( --without-http_${mod}_module )
+		fi
+	done
+
+	for mod in $NGINX_MODULES_OPT; do
+		if use nginx_modules_http_${mod}; then
+			http_enabled=1
+			myconf+=( --with-http_${mod}_module )
+		fi
+	done
+
+	if use nginx_modules_http_fastcgi; then
+		myconf+=( --with-http_realip_module )
+	fi
+
+	# third-party modules
+	if use nginx_modules_http_upload_progress; then
+		http_enabled=1
+		myconf+=( --add-module=${HTTP_UPLOAD_PROGRESS_MODULE_WD} )
+	fi
+
+	if use nginx_modules_http_headers_more; then
+		http_enabled=1
+		myconf+=( --add-module=${HTTP_HEADERS_MORE_MODULE_WD} )
+	fi
+
+	if use nginx_modules_http_cache_purge; then
+		http_enabled=1
+		myconf+=( --add-module=${HTTP_CACHE_PURGE_MODULE_WD} )
+	fi
+
+	if use nginx_modules_http_slowfs_cache; then
+		http_enabled=1
+		myconf+=( --add-module=${HTTP_SLOWFS_CACHE_MODULE_WD} )
+	fi
+
+	if use nginx_modules_http_fancyindex; then
+		http_enabled=1
+		myconf+=( --add-module=${HTTP_FANCYINDEX_MODULE_WD} )
+	fi
+
+	if use nginx_modules_http_lua; then
+		http_enabled=1
+		export LUAJIT_LIB=$(pkg-config --variable libdir luajit)
+		export LUAJIT_INC=$(pkg-config --variable includedir luajit)
+		myconf+=( --add-module=${DEVEL_KIT_MODULE_WD} )
+		myconf+=( --add-module=${HTTP_LUA_MODULE_WD} )
+	fi
+
+	if use nginx_modules_http_auth_pam; then
+		http_enabled=1
+		myconf+=( --add-module=${HTTP_AUTH_PAM_MODULE_WD} )
+	fi
+
+	if use nginx_modules_http_upstream_check; then
+		http_enabled=1
+		myconf+=( --add-module=${HTTP_UPSTREAM_CHECK_MODULE_WD} )
+	fi
+
+	if use nginx_modules_http_metrics; then
+		http_enabled=1
+		myconf+=( --add-module=${HTTP_METRICS_MODULE_WD} )
+	fi
+
+	if use nginx_modules_http_naxsi ; then
+		http_enabled=1
+		myconf+=(  --add-module=${HTTP_NAXSI_MODULE_WD} )
+	fi
+
+	if use rtmp ; then
+		http_enabled=1
+		myconf+=( --add-module=${RTMP_MODULE_WD} )
+	fi
+
+	if use nginx_modules_http_dav_ext ; then
+		http_enabled=1
+		myconf+=( --add-module=${HTTP_DAV_EXT_MODULE_WD} )
+	fi
+
+	if use nginx_modules_http_echo ; then
+		http_enabled=1
+		myconf+=( --add-module=${HTTP_ECHO_MODULE_WD} )
+	fi
+
+	if use nginx_modules_http_security ; then
+		http_enabled=1
+		myconf+=( --add-module=${HTTP_SECURITY_MODULE_WD}/nginx/modsecurity )
+	fi
+
+	if use nginx_modules_http_push_stream ; then
+		http_enabled=1
+		myconf+=( --add-module=${HTTP_PUSH_STREAM_MODULE_WD} )
+	fi
+
+	if use nginx_modules_http_sticky ; then
+		http_enabled=1
+		myconf+=( --add-module=${HTTP_STICKY_MODULE_WD} )
+	fi
+
+	if use nginx_modules_http_mogilefs ; then
+		http_enabled=1
+		myconf+=( --add-module=${HTTP_MOGILEFS_MODULE_WD} )
+	fi
+
+	if use nginx_modules_http_memc ; then
+		http_enabled=1
+		myconf+=( --add-module=${HTTP_MEMC_MODULE_WD} )
+	fi
+
+	if use nginx_modules_http_auth_ldap; then
+		http_enabled=1
+		myconf+=( --add-module=${HTTP_LDAP_MODULE_WD} )
+	fi
+
+	if use nginx_modules_http_vhost_traffic_status; then
+		http_enabled=1
+		myconf+=( --add-module=${HTTP_VHOST_TRAFFIC_STATUS_MODULE_WD} )
+	fi
+
+	if use nginx_modules_http_geoip2 || use nginx_modules_stream_geoip2; then
+		myconf+=( --add-module=${GEOIP2_MODULE_WD} )
+	fi
+
+	if use nginx_modules_http_javascript || use nginx_modules_stream_javascript; then
+		myconf+=( --add-module="${NJS_MODULE_WD}/nginx" )
+	fi
+
+	if use nginx_modules_http_brotli; then
+		http_enabled=1
+		myconf+=( --add-module=${HTTP_BROTLI_MODULE_WD} )
+	fi
+
+	if use http || use http-cache || use http2 || use nginx_modules_http_javascript; then
+		http_enabled=1
+	fi
+
+	if [ $http_enabled ]; then
+		use http-cache || myconf+=( --without-http-cache )
+		use ssl && myconf+=( --with-http_ssl_module )
+	else
+		myconf+=( --without-http --without-http-cache )
+	fi
+
+	# Stream modules
+	for mod in $NGINX_MODULES_STREAM_STD; do
+		if use nginx_modules_stream_${mod}; then
+			stream_enabled=1
+		else
+			myconf+=( --without-stream_${mod}_module )
+		fi
+	done
+
+	for mod in $NGINX_MODULES_STREAM_OPT; do
+		if use nginx_modules_stream_${mod}; then
+			stream_enabled=1
+			myconf+=( --with-stream_${mod}_module )
+		fi
+	done
+
+	if use nginx_modules_stream_geoip2 || use nginx_modules_stream_javascript; then
+		stream_enabled=1
+	fi
+
+	if [ $stream_enabled ]; then
+		myconf+=( --with-stream )
+		use ssl && myconf+=( --with-stream_ssl_module )
+	fi
+
+	# MAIL modules
+	for mod in $NGINX_MODULES_MAIL; do
+		if use nginx_modules_mail_${mod}; then
+			mail_enabled=1
+		else
+			myconf+=( --without-mail_${mod}_module )
+		fi
+	done
+
+	if [ $mail_enabled ]; then
+		myconf+=( --with-mail )
+		use ssl && myconf+=( --with-mail_ssl_module )
+	fi
+
+	# custom modules
+	for mod in $NGINX_ADD_MODULES; do
+		myconf+=(  --add-module=${mod} )
+	done
+
+	# https://bugs.gentoo.org/286772
+	export LANG=C LC_ALL=C
+	tc-export AR CC
+
+	if ! use prefix; then
+		myconf+=( --user=${PN} )
+		myconf+=( --group=${PN} )
+	fi
+
+	local WITHOUT_IPV6=
+	if ! use ipv6; then
+		WITHOUT_IPV6=" -DNGX_HAVE_INET6=0"
+	fi
+
+	if [[ -n "${EXTRA_ECONF}" ]]; then
+		myconf+=( ${EXTRA_ECONF} )
+		ewarn "EXTRA_ECONF applied. Now you are on your own, good luck!"
+	fi
+
+	./configure \
+		--prefix="${EPREFIX}"/usr \
+		--conf-path="${EPREFIX}"/etc/${PN}/${PN}.conf \
+		--error-log-path="${EPREFIX}"/var/log/${PN}/error_log \
+		--pid-path="${EPREFIX}"/run/${PN}.pid \
+		--lock-path="${EPREFIX}"/run/lock/${PN}.lock \
+		--with-cc-opt="-I${EROOT}usr/include${WITHOUT_IPV6}" \
+		--with-ld-opt="-L${EROOT}usr/$(get_libdir)" \
+		--http-log-path="${EPREFIX}"/var/log/${PN}/access_log \
+		--http-client-body-temp-path="${EPREFIX}${NGINX_HOME_TMP}"/client \
+		--http-proxy-temp-path="${EPREFIX}${NGINX_HOME_TMP}"/proxy \
+		--http-fastcgi-temp-path="${EPREFIX}${NGINX_HOME_TMP}"/fastcgi \
+		--http-scgi-temp-path="${EPREFIX}${NGINX_HOME_TMP}"/scgi \
+		--http-uwsgi-temp-path="${EPREFIX}${NGINX_HOME_TMP}"/uwsgi \
+		--with-compat \
+		"${myconf[@]}" || die "configure failed"
+
+	# A purely cosmetic change that makes nginx -V more readable. This can be
+	# good if people outside the gentoo community would troubleshoot and
+	# question the users setup.
+	sed -i -e "s|${WORKDIR}|external_module|g" objs/ngx_auto_config.h || die
+}
+
+src_compile() {
+	use nginx_modules_http_security && emake -C "${HTTP_SECURITY_MODULE_WD}"
+
+	# https://bugs.gentoo.org/286772
+	export LANG=C LC_ALL=C
+	emake LINK="${CC} ${LDFLAGS}" OTHERLDFLAGS="${LDFLAGS}"
+}
+
+src_install() {
+	emake DESTDIR="${D%/}" install
+
+	cp "${FILESDIR}"/nginx.conf-r2 "${ED%/}"/etc/nginx/nginx.conf || die
+
+	newinitd "${FILESDIR}"/nginx.initd-r4 nginx
+	newconfd "${FILESDIR}"/nginx.confd nginx
+
+	systemd_newunit "${FILESDIR}"/nginx.service-r1 nginx.service
+
+	doman man/nginx.8
+	dodoc CHANGES* README
+
+	# just keepdir. do not copy the default htdocs files (bug #449136)
+	keepdir /var/www/localhost
+	rm -rf "${ED%/}"/usr/html || die
+
+	# set up a list of directories to keep
+	local keepdir_list="${NGINX_HOME_TMP}"/client
+	local module
+	for module in proxy fastcgi scgi uwsgi; do
+		use nginx_modules_http_${module} && keepdir_list+=" ${NGINX_HOME_TMP}/${module}"
+	done
+
+	keepdir /var/log/nginx ${keepdir_list}
+
+	# this solves a problem with SELinux where nginx doesn't see the directories
+	# as root and tries to create them as nginx
+	fperms 0750 "${NGINX_HOME_TMP}"
+	fowners ${PN}:0 "${NGINX_HOME_TMP}"
+
+	fperms 0700 ${keepdir_list}
+	fowners ${PN}:${PN} ${keepdir_list}
+
+	fperms 0710 /var/log/nginx
+	fowners 0:${PN} /var/log/nginx
+
+	# logrotate
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}"/nginx.logrotate-r1 nginx
+
+	# Don't create /run
+	rm -rf "${ED%/}"/run || die
+
+	if use luajit; then
+		pax-mark m "${ED%/}/usr/sbin/nginx"
+	fi
+
+	if use nginx_modules_http_perl; then
+		cd "${S}"/objs/src/http/modules/perl/ || die
+		emake DESTDIR="${D}" INSTALLDIRS=vendor
+		perl_delete_localpod
+		cd "${S}" || die
+	fi
+
+	if use nginx_modules_http_cache_purge; then
+		docinto ${HTTP_CACHE_PURGE_MODULE_P}
+		dodoc "${HTTP_CACHE_PURGE_MODULE_WD}"/{CHANGES,README.md,TODO.md}
+	fi
+
+	if use nginx_modules_http_slowfs_cache; then
+		docinto ${HTTP_SLOWFS_CACHE_MODULE_P}
+		dodoc "${HTTP_SLOWFS_CACHE_MODULE_WD}"/{CHANGES,README.md}
+	fi
+
+	if use nginx_modules_http_fancyindex; then
+		docinto ${HTTP_FANCYINDEX_MODULE_P}
+		dodoc "${HTTP_FANCYINDEX_MODULE_WD}"/README.rst
+	fi
+
+	if use nginx_modules_http_lua; then
+		docinto ${HTTP_LUA_MODULE_P}
+		dodoc "${HTTP_LUA_MODULE_WD}"/README.markdown
+	fi
+
+	if use nginx_modules_http_auth_pam; then
+		docinto ${HTTP_AUTH_PAM_MODULE_P}
+		dodoc "${HTTP_AUTH_PAM_MODULE_WD}"/{README.md,ChangeLog}
+	fi
+
+	if use nginx_modules_http_upstream_check; then
+		docinto ${HTTP_UPSTREAM_CHECK_MODULE_P}
+		dodoc "${HTTP_UPSTREAM_CHECK_MODULE_WD}"/{README,CHANGES}
+	fi
+
+	if use nginx_modules_http_naxsi; then
+		insinto /etc/nginx
+		doins "${HTTP_NAXSI_MODULE_WD}"/../naxsi_config/naxsi_core.rules
+	fi
+
+	if use rtmp; then
+		docinto ${RTMP_MODULE_P}
+		dodoc "${RTMP_MODULE_WD}"/{AUTHORS,README.md,stat.xsl}
+	fi
+
+	if use nginx_modules_http_dav_ext; then
+		docinto ${HTTP_DAV_EXT_MODULE_P}
+		dodoc "${HTTP_DAV_EXT_MODULE_WD}"/README.rst
+	fi
+
+	if use nginx_modules_http_echo; then
+		docinto ${HTTP_ECHO_MODULE_P}
+		dodoc "${HTTP_ECHO_MODULE_WD}"/README.markdown
+	fi
+
+	if use nginx_modules_http_security; then
+		docinto ${HTTP_SECURITY_MODULE_P}
+		dodoc "${HTTP_SECURITY_MODULE_WD}"/{CHANGES,README.md,authors.txt}
+	fi
+
+	if use nginx_modules_http_push_stream; then
+		docinto ${HTTP_PUSH_STREAM_MODULE_P}
+		dodoc "${HTTP_PUSH_STREAM_MODULE_WD}"/{AUTHORS,CHANGELOG.textile,README.textile}
+	fi
+
+	if use nginx_modules_http_sticky; then
+		docinto ${HTTP_STICKY_MODULE_P}
+		dodoc "${HTTP_STICKY_MODULE_WD}"/{README.md,Changelog.txt,docs/sticky.pdf}
+	fi
+
+	if use nginx_modules_http_memc; then
+		docinto ${HTTP_MEMC_MODULE_P}
+		dodoc "${HTTP_MEMC_MODULE_WD}"/README.markdown
+	fi
+
+	if use nginx_modules_http_auth_ldap; then
+		docinto ${HTTP_LDAP_MODULE_P}
+		dodoc "${HTTP_LDAP_MODULE_WD}"/example.conf
+	fi
+}
+
+pkg_postinst() {
+	if use ssl; then
+		if [[ ! -f "${EROOT}"etc/ssl/${PN}/${PN}.key ]]; then
+			install_cert /etc/ssl/${PN}/${PN}
+			use prefix || chown ${PN}:${PN} "${EROOT}"etc/ssl/${PN}/${PN}.{crt,csr,key,pem}
+		fi
+	fi
+
+	if use nginx_modules_http_spdy; then
+		ewarn ""
+		ewarn "In nginx 1.9.5 the spdy module was superseded by http2."
+		ewarn "Update your configs and package.use accordingly."
+	fi
+
+	if use nginx_modules_http_lua; then
+		ewarn ""
+		ewarn "While you can build lua 3rd party module against ${P}"
+		ewarn "the author warns that >=${PN}-1.11.11 is still not an"
+		ewarn "officially supported target yet. You are on your own."
+		ewarn "Expect runtime failures, memory leaks and other problems!"
+	fi
+
+	if use nginx_modules_http_lua && use http2; then
+		ewarn ""
+		ewarn "Lua 3rd party module author warns against using ${P} with"
+		ewarn "NGINX_MODULES_HTTP=\"lua http2\". For more info, see https://git.io/OldLsg"
+	fi
+
+	local _n_permission_layout_checks=0
+	local _has_to_adjust_permissions=0
+	local _has_to_show_permission_warning=0
+
+	# Defaults to 1 to inform people doing a fresh installation
+	# that we ship modified {scgi,uwsgi,fastcgi}_params files
+	local _has_to_show_httpoxy_mitigation_notice=1
+
+	local _replacing_version=
+	for _replacing_version in ${REPLACING_VERSIONS}; do
+		_n_permission_layout_checks=$((${_n_permission_layout_checks}+1))
+
+		if [[ ${_n_permission_layout_checks} -gt 1 ]]; then
+			# Should never happen:
+			# Package is abusing slots but doesn't allow multiple parallel installations.
+			# If we run into this situation it is unsafe to automatically adjust any
+			# permission...
+			_has_to_show_permission_warning=1
+
+			ewarn "Replacing multiple ${PN}' versions is unsupported! " \
+				"You will have to adjust permissions on your own."
+
+			break
+		fi
+
+		local _replacing_version_branch=$(get_version_component_range 1-2 "${_replacing_version}")
+		debug-print "Updating an existing installation (v${_replacing_version}; branch '${_replacing_version_branch}') ..."
+
+		# Do we need to adjust permissions to fix CVE-2013-0337 (bug #458726, #469094)?
+		# This was before we introduced multiple nginx versions so we
+		# do not need to distinguish between stable and mainline
+		local _need_to_fix_CVE2013_0337=1
+
+		if version_is_at_least "1.4.1-r2" "${_replacing_version}"; then
+			# We are updating an installation which should already be fixed
+			_need_to_fix_CVE2013_0337=0
+			debug-print "Skipping CVE-2013-0337 ... existing installation should not be affected!"
+		else
+			_has_to_adjust_permissions=1
+			debug-print "Need to adjust permissions to fix CVE-2013-0337!"
+		fi
+
+		# Do we need to inform about HTTPoxy mitigation?
+		# In repository since commit 8be44f76d4ac02cebcd1e0e6e6284bb72d054b0f
+		if ! version_is_at_least "1.10" "${_replacing_version_branch}"; then
+			# Updating from <1.10
+			_has_to_show_httpoxy_mitigation_notice=1
+			debug-print "Need to inform about HTTPoxy mitigation!"
+		else
+			# Updating from >=1.10
+			local _fixed_in_pvr=
+			case "${_replacing_version_branch}" in
+				"1.10")
+					_fixed_in_pvr="1.10.1-r2"
+					;;
+				"1.11")
+					_fixed_in_pvr="1.11.3-r1"
+					;;
+				*)
+					# This should be any future branch.
+					# If we run this code it is safe to assume that the user has
+					# already seen the HTTPoxy mitigation notice because he/she is doing
+					# an update from previous version where we have already shown
+					# the warning. Otherwise, we wouldn't hit this code path ...
+					_fixed_in_pvr=
+			esac
+
+			if [[ -z "${_fixed_in_pvr}" ]] || version_is_at_least "${_fixed_in_pvr}" "${_replacing_version}"; then
+				# We are updating an installation where we already informed
+				# that we are mitigating HTTPoxy per default
+				_has_to_show_httpoxy_mitigation_notice=0
+				debug-print "No need to inform about HTTPoxy mitigation ... information was already shown for existing installation!"
+			else
+				_has_to_show_httpoxy_mitigation_notice=1
+				debug-print "Need to inform about HTTPoxy mitigation!"
+			fi
+		fi
+
+		# Do we need to adjust permissions to fix CVE-2016-1247 (bug #605008)?
+		# All branches up to 1.11 are affected
+		local _need_to_fix_CVE2016_1247=1
+
+		if ! version_is_at_least "1.10" "${_replacing_version_branch}"; then
+			# Updating from <1.10
+			_has_to_adjust_permissions=1
+			debug-print "Need to adjust permissions to fix CVE-2016-1247!"
+		else
+			# Updating from >=1.10
+			local _fixed_in_pvr=
+			case "${_replacing_version_branch}" in
+				"1.10")
+					_fixed_in_pvr="1.10.2-r3"
+					;;
+				"1.11")
+					_fixed_in_pvr="1.11.6-r1"
+					;;
+				*)
+					# This should be any future branch.
+					# If we run this code it is safe to assume that we have already
+					# adjusted permissions or were never affected because user is
+					# doing an update from previous version which was safe or did
+					# the adjustments. Otherwise, we wouldn't hit this code path ...
+					_fixed_in_pvr=
+			esac
+
+			if [[ -z "${_fixed_in_pvr}" ]] || version_is_at_least "${_fixed_in_pvr}" "${_replacing_version}"; then
+				# We are updating an installation which should already be adjusted
+				# or which was never affected
+				_need_to_fix_CVE2016_1247=0
+				debug-print "Skipping CVE-2016-1247 ... existing installation should not be affected!"
+			else
+				_has_to_adjust_permissions=1
+				debug-print "Need to adjust permissions to fix CVE-2016-1247!"
+			fi
+		fi
+	done
+
+	if [[ ${_has_to_adjust_permissions} -eq 1 ]]; then
+		# We do not DIE when chmod/chown commands are failing because
+		# package is already merged on user's system at this stage
+		# and we cannot retry without losing the information that
+		# the existing installation needs to adjust permissions.
+		# Instead we are going to a show a big warning ...
+
+		if [[ ${_has_to_show_permission_warning} -eq 0 ]] && [[ ${_need_to_fix_CVE2013_0337} -eq 1 ]]; then
+			ewarn ""
+			ewarn "The world-readable bit (if set) has been removed from the"
+			ewarn "following directories to mitigate a security bug"
+			ewarn "(CVE-2013-0337, bug #458726):"
+			ewarn ""
+			ewarn "  ${EPREFIX}/var/log/nginx"
+			ewarn "  ${EPREFIX}${NGINX_HOME_TMP}/{,client,proxy,fastcgi,scgi,uwsgi}"
+			ewarn ""
+			ewarn "Check if this is correct for your setup before restarting nginx!"
+			ewarn "This is a one-time change and will not happen on subsequent updates."
+			ewarn "Furthermore nginx' temp directories got moved to '${EPREFIX}${NGINX_HOME_TMP}'"
+			chmod o-rwx \
+				"${EPREFIX}"/var/log/nginx \
+				"${EPREFIX}"${NGINX_HOME_TMP}/{,client,proxy,fastcgi,scgi,uwsgi} || \
+				_has_to_show_permission_warning=1
+		fi
+
+		if [[ ${_has_to_show_permission_warning} -eq 0 ]] && [[ ${_need_to_fix_CVE2016_1247} -eq 1 ]]; then
+			ewarn ""
+			ewarn "The permissions on the following directory have been reset in"
+			ewarn "order to mitigate a security bug (CVE-2016-1247, bug #605008):"
+			ewarn ""
+			ewarn "  ${EPREFIX}/var/log/nginx"
+			ewarn ""
+			ewarn "Check if this is correct for your setup before restarting nginx!"
+			ewarn "Also ensure that no other log directory used by any of your"
+			ewarn "vhost(s) is not writeable for nginx user. Any of your log files"
+			ewarn "used by nginx can be abused to escalate privileges!"
+			ewarn "This is a one-time change and will not happen on subsequent updates."
+			chown 0:nginx "${EPREFIX}"/var/log/nginx || _has_to_show_permission_warning=1
+			chmod 710 "${EPREFIX}"/var/log/nginx || _has_to_show_permission_warning=1
+		fi
+
+		if [[ ${_has_to_show_permission_warning} -eq 1 ]]; then
+			# Should never happen ...
+			ewarn ""
+			ewarn "*************************************************************"
+			ewarn "***************         W A R N I N G         ***************"
+			ewarn "*************************************************************"
+			ewarn "The one-time only attempt to adjust permissions of the"
+			ewarn "existing nginx installation failed. Be aware that we will not"
+			ewarn "try to adjust the same permissions again because now you are"
+			ewarn "using a nginx version where we expect that the permissions"
+			ewarn "are already adjusted or that you know what you are doing and"
+			ewarn "want to keep custom permissions."
+			ewarn ""
+		fi
+	fi
+
+	# Sanity check for CVE-2016-1247
+	# Required to warn users who received the warning above and thought
+	# they could fix it by unmerging and re-merging the package or have
+	# unmerged a affected installation on purpose in the past leaving
+	# /var/log/nginx on their system due to keepdir/non-empty folder
+	# and are now installing the package again.
+	local _sanity_check_testfile=$(mktemp --dry-run "${EPREFIX}"/var/log/nginx/.CVE-2016-1247.XXXXXXXXX)
+	su -s /bin/sh -c "touch ${_sanity_check_testfile}" nginx >&/dev/null
+	if [ $? -eq 0 ] ; then
+		# Cleanup -- no reason to die here!
+		rm -f "${_sanity_check_testfile}"
+
+		ewarn ""
+		ewarn "*************************************************************"
+		ewarn "***************         W A R N I N G         ***************"
+		ewarn "*************************************************************"
+		ewarn "Looks like your installation is vulnerable to CVE-2016-1247"
+		ewarn "(bug #605008) because nginx user is able to create files in"
+		ewarn ""
+		ewarn "  ${EPREFIX}/var/log/nginx"
+		ewarn ""
+		ewarn "Also ensure that no other log directory used by any of your"
+		ewarn "vhost(s) is not writeable for nginx user. Any of your log files"
+		ewarn "used by nginx can be abused to escalate privileges!"
+	fi
+
+	if [[ ${_has_to_show_httpoxy_mitigation_notice} -eq 1 ]]; then
+		# HTTPoxy mitigation
+		ewarn ""
+		ewarn "This nginx installation comes with a mitigation for the HTTPoxy"
+		ewarn "vulnerability for FastCGI, SCGI and uWSGI applications by setting"
+		ewarn "the HTTP_PROXY parameter to an empty string per default when you"
+		ewarn "are sourcing one of the default"
+		ewarn ""
+		ewarn "  - 'fastcgi_params' or 'fastcgi.conf'"
+		ewarn "  - 'scgi_params'"
+		ewarn "  - 'uwsgi_params'"
+		ewarn ""
+		ewarn "files in your server block(s)."
+		ewarn ""
+		ewarn "If this is causing any problems for you make sure that you are sourcing the"
+		ewarn "default parameters _before_ you set your own values."
+		ewarn "If you are relying on user-supplied proxy values you have to remove the"
+		ewarn "correlating lines from the file(s) mentioned above."
+		ewarn ""
+	fi
+}
diff --git a/www-servers/nginx/nginx-1.19.5.ebuild b/www-servers/nginx/nginx-1.19.5.ebuild
new file mode 100644
index 000000000000..2f271e65ba7a
--- /dev/null
+++ b/www-servers/nginx/nginx-1.19.5.ebuild
@@ -0,0 +1,1087 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+# Maintainer notes:
+# - http_rewrite-independent pcre-support makes sense for matching locations without an actual rewrite
+# - any http-module activates the main http-functionality and overrides USE=-http
+# - keep the following requirements in mind before adding external modules:
+#	* alive upstream
+#	* sane packaging
+#	* builds cleanly
+#	* does not need a patch for nginx core
+# - TODO: test the google-perftools module (included in vanilla tarball)
+
+# prevent perl-module from adding automagic perl DEPENDs
+GENTOO_DEPEND_ON_PERL="no"
+
+# devel_kit (https://github.com/simpl/ngx_devel_kit, BSD license)
+DEVEL_KIT_MODULE_PV="0.3.1"
+DEVEL_KIT_MODULE_P="ngx_devel_kit-${DEVEL_KIT_MODULE_PV}"
+DEVEL_KIT_MODULE_URI="https://github.com/simpl/ngx_devel_kit/archive/v${DEVEL_KIT_MODULE_PV}.tar.gz"
+DEVEL_KIT_MODULE_WD="${WORKDIR}/ngx_devel_kit-${DEVEL_KIT_MODULE_PV}"
+
+# ngx_brotli (https://github.com/google/ngx_brotli, BSD-2)
+HTTP_BROTLI_MODULE_PV="1.0.0rc"
+HTTP_BROTLI_MODULE_P="ngx_brotli-${HTTP_BROTLI_MODULE_PV}"
+HTTP_BROTLI_MODULE_URI="https://github.com/google/ngx_brotli/archive/v${HTTP_BROTLI_MODULE_PV}.tar.gz"
+HTTP_BROTLI_MODULE_WD="${WORKDIR}/ngx_brotli-${HTTP_BROTLI_MODULE_PV}"
+
+# http_uploadprogress (https://github.com/masterzen/nginx-upload-progress-module, BSD-2 license)
+HTTP_UPLOAD_PROGRESS_MODULE_PV="0.9.2"
+HTTP_UPLOAD_PROGRESS_MODULE_P="ngx_http_upload_progress-${HTTP_UPLOAD_PROGRESS_MODULE_PV}-r1"
+HTTP_UPLOAD_PROGRESS_MODULE_URI="https://github.com/masterzen/nginx-upload-progress-module/archive/v${HTTP_UPLOAD_PROGRESS_MODULE_PV}.tar.gz"
+HTTP_UPLOAD_PROGRESS_MODULE_WD="${WORKDIR}/nginx-upload-progress-module-${HTTP_UPLOAD_PROGRESS_MODULE_PV}"
+
+# http_headers_more (https://github.com/agentzh/headers-more-nginx-module, BSD license)
+HTTP_HEADERS_MORE_MODULE_PV="0.33"
+HTTP_HEADERS_MORE_MODULE_P="ngx_http_headers_more-${HTTP_HEADERS_MORE_MODULE_PV}"
+HTTP_HEADERS_MORE_MODULE_URI="https://github.com/agentzh/headers-more-nginx-module/archive/v${HTTP_HEADERS_MORE_MODULE_PV}.tar.gz"
+HTTP_HEADERS_MORE_MODULE_WD="${WORKDIR}/headers-more-nginx-module-${HTTP_HEADERS_MORE_MODULE_PV}"
+
+# http_cache_purge (http://labs.frickle.com/nginx_ngx_cache_purge/, https://github.com/FRiCKLE/ngx_cache_purge, BSD-2 license)
+HTTP_CACHE_PURGE_MODULE_PV="2.3"
+HTTP_CACHE_PURGE_MODULE_P="ngx_http_cache_purge-${HTTP_CACHE_PURGE_MODULE_PV}"
+HTTP_CACHE_PURGE_MODULE_URI="http://labs.frickle.com/files/ngx_cache_purge-${HTTP_CACHE_PURGE_MODULE_PV}.tar.gz"
+HTTP_CACHE_PURGE_MODULE_WD="${WORKDIR}/ngx_cache_purge-${HTTP_CACHE_PURGE_MODULE_PV}"
+
+# http_slowfs_cache (http://labs.frickle.com/nginx_ngx_slowfs_cache/, BSD-2 license)
+HTTP_SLOWFS_CACHE_MODULE_PV="1.10"
+HTTP_SLOWFS_CACHE_MODULE_P="ngx_http_slowfs_cache-${HTTP_SLOWFS_CACHE_MODULE_PV}"
+HTTP_SLOWFS_CACHE_MODULE_URI="http://labs.frickle.com/files/ngx_slowfs_cache-${HTTP_SLOWFS_CACHE_MODULE_PV}.tar.gz"
+HTTP_SLOWFS_CACHE_MODULE_WD="${WORKDIR}/ngx_slowfs_cache-${HTTP_SLOWFS_CACHE_MODULE_PV}"
+
+# http_fancyindex (https://github.com/aperezdc/ngx-fancyindex, BSD license)
+HTTP_FANCYINDEX_MODULE_PV="0.4.4"
+HTTP_FANCYINDEX_MODULE_P="ngx_http_fancyindex-${HTTP_FANCYINDEX_MODULE_PV}"
+HTTP_FANCYINDEX_MODULE_URI="https://github.com/aperezdc/ngx-fancyindex/archive/v${HTTP_FANCYINDEX_MODULE_PV}.tar.gz"
+HTTP_FANCYINDEX_MODULE_WD="${WORKDIR}/ngx-fancyindex-${HTTP_FANCYINDEX_MODULE_PV}"
+
+# http_lua (https://github.com/openresty/lua-nginx-module, BSD license)
+HTTP_LUA_MODULE_PV="0.10.15"
+HTTP_LUA_MODULE_P="ngx_http_lua-${HTTP_LUA_MODULE_PV}"
+HTTP_LUA_MODULE_URI="https://github.com/openresty/lua-nginx-module/archive/v${HTTP_LUA_MODULE_PV}.tar.gz"
+HTTP_LUA_MODULE_WD="${WORKDIR}/lua-nginx-module-${HTTP_LUA_MODULE_PV}"
+
+# http_auth_pam (https://github.com/stogh/ngx_http_auth_pam_module/, http://web.iti.upv.es/~sto/nginx/, BSD-2 license)
+HTTP_AUTH_PAM_MODULE_PV="1.5.2"
+HTTP_AUTH_PAM_MODULE_P="ngx_http_auth_pam-${HTTP_AUTH_PAM_MODULE_PV}"
+HTTP_AUTH_PAM_MODULE_URI="https://github.com/stogh/ngx_http_auth_pam_module/archive/v${HTTP_AUTH_PAM_MODULE_PV}.tar.gz"
+HTTP_AUTH_PAM_MODULE_WD="${WORKDIR}/ngx_http_auth_pam_module-${HTTP_AUTH_PAM_MODULE_PV}"
+
+# http_upstream_check (https://github.com/yaoweibin/nginx_upstream_check_module, BSD license)
+HTTP_UPSTREAM_CHECK_MODULE_PV="9aecf15ec379fe98f62355c57b60c0bc83296f04"
+HTTP_UPSTREAM_CHECK_MODULE_P="ngx_http_upstream_check-${HTTP_UPSTREAM_CHECK_MODULE_PV}"
+HTTP_UPSTREAM_CHECK_MODULE_URI="https://github.com/yaoweibin/nginx_upstream_check_module/archive/${HTTP_UPSTREAM_CHECK_MODULE_PV}.tar.gz"
+HTTP_UPSTREAM_CHECK_MODULE_WD="${WORKDIR}/nginx_upstream_check_module-${HTTP_UPSTREAM_CHECK_MODULE_PV}"
+
+# http_metrics (https://github.com/zenops/ngx_metrics, BSD license)
+HTTP_METRICS_MODULE_PV="0.1.1"
+HTTP_METRICS_MODULE_P="ngx_metrics-${HTTP_METRICS_MODULE_PV}"
+HTTP_METRICS_MODULE_URI="https://github.com/madvertise/ngx_metrics/archive/v${HTTP_METRICS_MODULE_PV}.tar.gz"
+HTTP_METRICS_MODULE_WD="${WORKDIR}/ngx_metrics-${HTTP_METRICS_MODULE_PV}"
+
+# http_vhost_traffic_status (https://github.com/vozlt/nginx-module-vts, BSD license)
+HTTP_VHOST_TRAFFIC_STATUS_MODULE_PV="46d85558e344dfe2b078ce757fd36c69a1ec2dd3"
+HTTP_VHOST_TRAFFIC_STATUS_MODULE_P="ngx_http_vhost_traffic_status-${HTTP_VHOST_TRAFFIC_STATUS_MODULE_PV}"
+HTTP_VHOST_TRAFFIC_STATUS_MODULE_URI="https://github.com/vozlt/nginx-module-vts/archive/${HTTP_VHOST_TRAFFIC_STATUS_MODULE_PV}.tar.gz"
+HTTP_VHOST_TRAFFIC_STATUS_MODULE_WD="${WORKDIR}/nginx-module-vts-${HTTP_VHOST_TRAFFIC_STATUS_MODULE_PV}"
+
+# naxsi-core (https://github.com/nbs-system/naxsi, GPLv2+)
+HTTP_NAXSI_MODULE_PV="0.56"
+HTTP_NAXSI_MODULE_P="ngx_http_naxsi-${HTTP_NAXSI_MODULE_PV}"
+HTTP_NAXSI_MODULE_URI="https://github.com/nbs-system/naxsi/archive/${HTTP_NAXSI_MODULE_PV}.tar.gz"
+HTTP_NAXSI_MODULE_WD="${WORKDIR}/naxsi-${HTTP_NAXSI_MODULE_PV}/naxsi_src"
+
+# nginx-rtmp-module (https://github.com/arut/nginx-rtmp-module, BSD license)
+RTMP_MODULE_PV="1.2.1"
+RTMP_MODULE_P="ngx_rtmp-${RTMP_MODULE_PV}"
+RTMP_MODULE_URI="https://github.com/arut/nginx-rtmp-module/archive/v${RTMP_MODULE_PV}.tar.gz"
+RTMP_MODULE_WD="${WORKDIR}/nginx-rtmp-module-${RTMP_MODULE_PV}"
+
+# nginx-dav-ext-module (https://github.com/arut/nginx-dav-ext-module, BSD license)
+HTTP_DAV_EXT_MODULE_PV="3.0.0"
+HTTP_DAV_EXT_MODULE_P="ngx_http_dav_ext-${HTTP_DAV_EXT_MODULE_PV}"
+HTTP_DAV_EXT_MODULE_URI="https://github.com/arut/nginx-dav-ext-module/archive/v${HTTP_DAV_EXT_MODULE_PV}.tar.gz"
+HTTP_DAV_EXT_MODULE_WD="${WORKDIR}/nginx-dav-ext-module-${HTTP_DAV_EXT_MODULE_PV}"
+
+# echo-nginx-module (https://github.com/openresty/echo-nginx-module, BSD license)
+HTTP_ECHO_MODULE_PV="0.62"
+HTTP_ECHO_MODULE_P="ngx_http_echo-${HTTP_ECHO_MODULE_PV}"
+HTTP_ECHO_MODULE_URI="https://github.com/openresty/echo-nginx-module/archive/v${HTTP_ECHO_MODULE_PV}.tar.gz"
+HTTP_ECHO_MODULE_WD="${WORKDIR}/echo-nginx-module-${HTTP_ECHO_MODULE_PV}"
+
+# mod_security for nginx (https://modsecurity.org/, Apache-2.0)
+# keep the MODULE_P here consistent with upstream to avoid tarball duplication
+HTTP_SECURITY_MODULE_PV="2.9.3"
+HTTP_SECURITY_MODULE_P="modsecurity-${HTTP_SECURITY_MODULE_PV}"
+HTTP_SECURITY_MODULE_URI="https://www.modsecurity.org/tarball/${HTTP_SECURITY_MODULE_PV}/${HTTP_SECURITY_MODULE_P}.tar.gz"
+HTTP_SECURITY_MODULE_WD="${WORKDIR}/${HTTP_SECURITY_MODULE_P}"
+
+# push-stream-module (http://www.nginxpushstream.com, https://github.com/wandenberg/nginx-push-stream-module, GPL-3)
+HTTP_PUSH_STREAM_MODULE_PV="0.5.4"
+HTTP_PUSH_STREAM_MODULE_P="ngx_http_push_stream-${HTTP_PUSH_STREAM_MODULE_PV}"
+HTTP_PUSH_STREAM_MODULE_URI="https://github.com/wandenberg/nginx-push-stream-module/archive/${HTTP_PUSH_STREAM_MODULE_PV}.tar.gz"
+HTTP_PUSH_STREAM_MODULE_WD="${WORKDIR}/nginx-push-stream-module-${HTTP_PUSH_STREAM_MODULE_PV}"
+
+# sticky-module (https://bitbucket.org/nginx-goodies/nginx-sticky-module-ng, BSD-2)
+HTTP_STICKY_MODULE_PV="1.2.6-10-g08a395c66e42"
+HTTP_STICKY_MODULE_P="nginx_http_sticky_module_ng-${HTTP_STICKY_MODULE_PV}"
+HTTP_STICKY_MODULE_URI="https://bitbucket.org/nginx-goodies/nginx-sticky-module-ng/get/${HTTP_STICKY_MODULE_PV}.tar.bz2"
+HTTP_STICKY_MODULE_WD="${WORKDIR}/nginx-goodies-nginx-sticky-module-ng-08a395c66e42"
+
+# mogilefs-module (https://github.com/vkholodkov/nginx-mogilefs-module, BSD-2)
+HTTP_MOGILEFS_MODULE_PV="1.0.4"
+HTTP_MOGILEFS_MODULE_P="ngx_mogilefs_module-${HTTP_MOGILEFS_MODULE_PV}"
+HTTP_MOGILEFS_MODULE_URI="https://github.com/vkholodkov/nginx-mogilefs-module/archive/${HTTP_MOGILEFS_MODULE_PV}.tar.gz"
+HTTP_MOGILEFS_MODULE_WD="${WORKDIR}/nginx_mogilefs_module-${HTTP_MOGILEFS_MODULE_PV}"
+
+# memc-module (https://github.com/openresty/memc-nginx-module, BSD-2)
+HTTP_MEMC_MODULE_PV="0.19"
+HTTP_MEMC_MODULE_P="ngx_memc_module-${HTTP_MEMC_MODULE_PV}"
+HTTP_MEMC_MODULE_URI="https://github.com/openresty/memc-nginx-module/archive/v${HTTP_MEMC_MODULE_PV}.tar.gz"
+HTTP_MEMC_MODULE_WD="${WORKDIR}/memc-nginx-module-${HTTP_MEMC_MODULE_PV}"
+
+# nginx-ldap-auth-module (https://github.com/kvspb/nginx-auth-ldap, BSD-2)
+HTTP_LDAP_MODULE_PV="42d195d7a7575ebab1c369ad3fc5d78dc2c2669c"
+HTTP_LDAP_MODULE_P="nginx-auth-ldap-${HTTP_LDAP_MODULE_PV}"
+HTTP_LDAP_MODULE_URI="https://github.com/kvspb/nginx-auth-ldap/archive/${HTTP_LDAP_MODULE_PV}.tar.gz"
+HTTP_LDAP_MODULE_WD="${WORKDIR}/nginx-auth-ldap-${HTTP_LDAP_MODULE_PV}"
+
+# geoip2 (https://github.com/leev/ngx_http_geoip2_module, BSD-2)
+GEOIP2_MODULE_PV="3.3"
+GEOIP2_MODULE_P="ngx_http_geoip2_module-${GEOIP2_MODULE_PV}"
+GEOIP2_MODULE_URI="https://github.com/leev/ngx_http_geoip2_module/archive/${GEOIP2_MODULE_PV}.tar.gz"
+GEOIP2_MODULE_WD="${WORKDIR}/ngx_http_geoip2_module-${GEOIP2_MODULE_PV}"
+
+# njs-module (https://github.com/nginx/njs, as-is)
+NJS_MODULE_PV="0.4.4"
+NJS_MODULE_P="njs-${NJS_MODULE_PV}"
+NJS_MODULE_URI="https://github.com/nginx/njs/archive/${NJS_MODULE_PV}.tar.gz"
+NJS_MODULE_WD="${WORKDIR}/njs-${NJS_MODULE_PV}"
+
+# We handle deps below ourselves
+SSL_DEPS_SKIP=1
+AUTOTOOLS_AUTO_DEPEND="no"
+
+inherit autotools ssl-cert toolchain-funcs perl-module flag-o-matic user systemd versionator multilib pax-utils
+
+DESCRIPTION="Robust, small and high performance http and reverse proxy server"
+HOMEPAGE="https://nginx.org"
+SRC_URI="https://nginx.org/download/${P}.tar.gz
+	${DEVEL_KIT_MODULE_URI} -> ${DEVEL_KIT_MODULE_P}.tar.gz
+	nginx_modules_http_auth_ldap? ( ${HTTP_LDAP_MODULE_URI} -> ${HTTP_LDAP_MODULE_P}.tar.gz )
+	nginx_modules_http_auth_pam? ( ${HTTP_AUTH_PAM_MODULE_URI} -> ${HTTP_AUTH_PAM_MODULE_P}.tar.gz )
+	nginx_modules_http_brotli? ( ${HTTP_BROTLI_MODULE_URI} -> ${HTTP_BROTLI_MODULE_P}.tar.gz )
+	nginx_modules_http_cache_purge? ( ${HTTP_CACHE_PURGE_MODULE_URI} -> ${HTTP_CACHE_PURGE_MODULE_P}.tar.gz )
+	nginx_modules_http_dav_ext? ( ${HTTP_DAV_EXT_MODULE_URI} -> ${HTTP_DAV_EXT_MODULE_P}.tar.gz )
+	nginx_modules_http_echo? ( ${HTTP_ECHO_MODULE_URI} -> ${HTTP_ECHO_MODULE_P}.tar.gz )
+	nginx_modules_http_fancyindex? ( ${HTTP_FANCYINDEX_MODULE_URI} -> ${HTTP_FANCYINDEX_MODULE_P}.tar.gz )
+	nginx_modules_http_geoip2? ( ${GEOIP2_MODULE_URI} -> ${GEOIP2_MODULE_P}.tar.gz )
+	nginx_modules_http_headers_more? ( ${HTTP_HEADERS_MORE_MODULE_URI} -> ${HTTP_HEADERS_MORE_MODULE_P}.tar.gz )
+	nginx_modules_http_javascript? ( ${NJS_MODULE_URI} -> ${NJS_MODULE_P}.tar.gz )
+	nginx_modules_http_lua? ( ${HTTP_LUA_MODULE_URI} -> ${HTTP_LUA_MODULE_P}.tar.gz )
+	nginx_modules_http_memc? ( ${HTTP_MEMC_MODULE_URI} -> ${HTTP_MEMC_MODULE_P}.tar.gz )
+	nginx_modules_http_metrics? ( ${HTTP_METRICS_MODULE_URI} -> ${HTTP_METRICS_MODULE_P}.tar.gz )
+	nginx_modules_http_mogilefs? ( ${HTTP_MOGILEFS_MODULE_URI} -> ${HTTP_MOGILEFS_MODULE_P}.tar.gz )
+	nginx_modules_http_naxsi? ( ${HTTP_NAXSI_MODULE_URI} -> ${HTTP_NAXSI_MODULE_P}.tar.gz )
+	nginx_modules_http_push_stream? ( ${HTTP_PUSH_STREAM_MODULE_URI} -> ${HTTP_PUSH_STREAM_MODULE_P}.tar.gz )
+	nginx_modules_http_security? ( ${HTTP_SECURITY_MODULE_URI} -> ${HTTP_SECURITY_MODULE_P}.tar.gz )
+	nginx_modules_http_slowfs_cache? ( ${HTTP_SLOWFS_CACHE_MODULE_URI} -> ${HTTP_SLOWFS_CACHE_MODULE_P}.tar.gz )
+	nginx_modules_http_sticky? ( ${HTTP_STICKY_MODULE_URI} -> ${HTTP_STICKY_MODULE_P}.tar.bz2 )
+	nginx_modules_http_upload_progress? ( ${HTTP_UPLOAD_PROGRESS_MODULE_URI} -> ${HTTP_UPLOAD_PROGRESS_MODULE_P}.tar.gz )
+	nginx_modules_http_upstream_check? ( ${HTTP_UPSTREAM_CHECK_MODULE_URI} -> ${HTTP_UPSTREAM_CHECK_MODULE_P}.tar.gz )
+	nginx_modules_http_vhost_traffic_status? ( ${HTTP_VHOST_TRAFFIC_STATUS_MODULE_URI} -> ${HTTP_VHOST_TRAFFIC_STATUS_MODULE_P}.tar.gz )
+	nginx_modules_stream_geoip2? ( ${GEOIP2_MODULE_URI} -> ${GEOIP2_MODULE_P}.tar.gz )
+	nginx_modules_stream_javascript? ( ${NJS_MODULE_URI} -> ${NJS_MODULE_P}.tar.gz )
+	rtmp? ( ${RTMP_MODULE_URI} -> ${RTMP_MODULE_P}.tar.gz )"
+
+LICENSE="BSD-2 BSD SSLeay MIT GPL-2 GPL-2+
+	nginx_modules_http_security? ( Apache-2.0 )
+	nginx_modules_http_push_stream? ( GPL-3 )"
+
+SLOT="mainline"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+
+# Package doesn't provide a real test suite
+RESTRICT="test"
+
+NGINX_MODULES_STD="access auth_basic autoindex browser charset empty_gif
+	fastcgi geo grpc gzip limit_req limit_conn map memcached mirror
+	proxy referer rewrite scgi ssi split_clients upstream_hash
+	upstream_ip_hash upstream_keepalive upstream_least_conn
+	upstream_zone userid uwsgi"
+NGINX_MODULES_OPT="addition auth_request dav degradation flv geoip gunzip
+	gzip_static image_filter mp4 perl random_index realip secure_link
+	slice stub_status sub xslt"
+NGINX_MODULES_STREAM_STD="access geo limit_conn map return split_clients
+	upstream_hash upstream_least_conn upstream_zone"
+NGINX_MODULES_STREAM_OPT="geoip realip ssl_preread"
+NGINX_MODULES_MAIL="imap pop3 smtp"
+NGINX_MODULES_3RD="
+	http_auth_ldap
+	http_auth_pam
+	http_brotli
+	http_cache_purge
+	http_dav_ext
+	http_echo
+	http_fancyindex
+	http_geoip2
+	http_headers_more
+	http_javascript
+	http_lua
+	http_memc
+	http_metrics
+	http_mogilefs
+	http_naxsi
+	http_push_stream
+	http_security
+	http_slowfs_cache
+	http_sticky
+	http_upload_progress
+	http_upstream_check
+	http_vhost_traffic_status
+	stream_geoip2
+	stream_javascript
+"
+
+IUSE="aio debug +http +http2 +http-cache +ipv6 libatomic libressl luajit +pcre
+	pcre-jit rtmp selinux ssl threads userland_GNU vim-syntax"
+
+for mod in $NGINX_MODULES_STD; do
+	IUSE="${IUSE} +nginx_modules_http_${mod}"
+done
+
+for mod in $NGINX_MODULES_OPT; do
+	IUSE="${IUSE} nginx_modules_http_${mod}"
+done
+
+for mod in $NGINX_MODULES_STREAM_STD; do
+	IUSE="${IUSE} nginx_modules_stream_${mod}"
+done
+
+for mod in $NGINX_MODULES_STREAM_OPT; do
+	IUSE="${IUSE} nginx_modules_stream_${mod}"
+done
+
+for mod in $NGINX_MODULES_MAIL; do
+	IUSE="${IUSE} nginx_modules_mail_${mod}"
+done
+
+for mod in $NGINX_MODULES_3RD; do
+	IUSE="${IUSE} nginx_modules_${mod}"
+done
+
+# Add so we can warn users updating about config changes
+# @TODO: jbergstroem: remove on next release series
+IUSE="${IUSE} nginx_modules_http_spdy"
+
+CDEPEND="
+	pcre? ( dev-libs/libpcre:= )
+	pcre-jit? ( dev-libs/libpcre:=[jit] )
+	ssl? (
+		!libressl? ( dev-libs/openssl:0= )
+		libressl? ( dev-libs/libressl:= )
+	)
+	http2? (
+		!libressl? ( >=dev-libs/openssl-1.0.1c:0= )
+		libressl? ( dev-libs/libressl:= )
+	)
+	http-cache? (
+		userland_GNU? (
+			!libressl? ( dev-libs/openssl:0= )
+			libressl? ( dev-libs/libressl:= )
+		)
+	)
+	nginx_modules_http_brotli? ( app-arch/brotli:= )
+	nginx_modules_http_geoip? ( dev-libs/geoip )
+	nginx_modules_http_geoip2? ( dev-libs/libmaxminddb:= )
+	nginx_modules_http_gunzip? ( sys-libs/zlib )
+	nginx_modules_http_gzip? ( sys-libs/zlib )
+	nginx_modules_http_gzip_static? ( sys-libs/zlib )
+	nginx_modules_http_image_filter? ( media-libs/gd:=[jpeg,png] )
+	nginx_modules_http_perl? ( >=dev-lang/perl-5.8:= )
+	nginx_modules_http_rewrite? ( dev-libs/libpcre:= )
+	nginx_modules_http_secure_link? (
+		userland_GNU? (
+			!libressl? ( dev-libs/openssl:0= )
+			libressl? ( dev-libs/libressl:= )
+		)
+	)
+	nginx_modules_http_xslt? ( dev-libs/libxml2:= dev-libs/libxslt )
+	nginx_modules_http_lua? ( dev-lang/luajit:2= )
+	nginx_modules_http_auth_pam? ( sys-libs/pam )
+	nginx_modules_http_metrics? ( dev-libs/yajl:= )
+	nginx_modules_http_dav_ext? ( dev-libs/libxml2 )
+	nginx_modules_http_security? (
+		dev-libs/apr:=
+		dev-libs/apr-util:=
+		dev-libs/libxml2:=
+		net-misc/curl
+		www-servers/apache
+	)
+	nginx_modules_http_auth_ldap? ( net-nds/openldap[ssl?] )
+	nginx_modules_stream_geoip? ( dev-libs/geoip )
+	nginx_modules_stream_geoip2? ( dev-libs/libmaxminddb:= )"
+RDEPEND="${CDEPEND}
+	selinux? ( sec-policy/selinux-nginx )
+	!www-servers/nginx:0"
+DEPEND="${CDEPEND}
+	nginx_modules_http_brotli? ( virtual/pkgconfig )
+	nginx_modules_http_security? ( ${AUTOTOOLS_DEPEND} )
+	arm? ( dev-libs/libatomic_ops )
+	libatomic? ( dev-libs/libatomic_ops )"
+PDEPEND="vim-syntax? ( app-vim/nginx-syntax )"
+
+REQUIRED_USE="pcre-jit? ( pcre )
+	nginx_modules_http_fancyindex? ( nginx_modules_http_addition )
+	nginx_modules_http_grpc? ( http2 )
+	nginx_modules_http_lua? (
+		luajit
+		nginx_modules_http_rewrite
+	)
+	nginx_modules_http_naxsi? ( pcre )
+	nginx_modules_http_dav_ext? ( nginx_modules_http_dav nginx_modules_http_xslt )
+	nginx_modules_http_metrics? ( nginx_modules_http_stub_status )
+	nginx_modules_http_security? ( pcre )
+	nginx_modules_http_push_stream? ( ssl )"
+
+pkg_setup() {
+	NGINX_HOME="/var/lib/nginx"
+	NGINX_HOME_TMP="${NGINX_HOME}/tmp"
+
+	ebegin "Creating nginx user and group"
+	enewgroup ${PN}
+	enewuser ${PN} -1 -1 "${NGINX_HOME}" ${PN}
+	eend $?
+
+	if use libatomic; then
+		ewarn "GCC 4.1+ features built-in atomic operations."
+		ewarn "Using libatomic_ops is only needed if using"
+		ewarn "a different compiler or a GCC prior to 4.1"
+	fi
+
+	if [[ -n $NGINX_ADD_MODULES ]]; then
+		ewarn "You are building custom modules via \$NGINX_ADD_MODULES!"
+		ewarn "This nginx installation is not supported!"
+		ewarn "Make sure you can reproduce the bug without those modules"
+		ewarn "_before_ reporting bugs."
+	fi
+
+	if use !http; then
+		ewarn "To actually disable all http-functionality you also have to disable"
+		ewarn "all nginx http modules."
+	fi
+
+	if use nginx_modules_http_mogilefs && use threads; then
+		eerror "mogilefs won't compile with threads support."
+		eerror "Please disable either flag and try again."
+		die "Can't compile mogilefs with threads support"
+	fi
+}
+
+src_prepare() {
+	eapply "${FILESDIR}/${PN}-1.4.1-fix-perl-install-path.patch"
+	eapply "${FILESDIR}/${PN}-httpoxy-mitigation-r1.patch"
+
+	if use nginx_modules_http_brotli; then
+		cd "${HTTP_BROTLI_MODULE_WD}" || die
+		eapply "${FILESDIR}"/http_brotli-detect-brotli-r3.patch
+		cd "${S}" || die
+	fi
+
+	if use nginx_modules_http_upstream_check; then
+		eapply -p0 "${FILESDIR}"/http_upstream_check-nginx-1.11.5+.patch
+	fi
+
+	if use nginx_modules_http_cache_purge; then
+		cd "${HTTP_CACHE_PURGE_MODULE_WD}" || die
+		eapply "${FILESDIR}"/http_cache_purge-1.11.6+.patch
+		cd "${S}" || die
+	fi
+
+	if use nginx_modules_http_security; then
+		cd "${HTTP_SECURITY_MODULE_WD}" || die
+
+		eautoreconf
+
+		if use luajit ; then
+			sed -i \
+				-e 's|^\(LUA_PKGNAMES\)=.*|\1="luajit"|' \
+				configure || die
+		fi
+
+		cd "${S}" || die
+	fi
+
+	if use nginx_modules_http_upload_progress; then
+		cd "${HTTP_UPLOAD_PROGRESS_MODULE_WD}" || die
+		eapply "${FILESDIR}"/http_uploadprogress-issue_50-r1.patch
+		cd "${S}" || die
+	fi
+
+	find auto/ -type f -print0 | xargs -0 sed -i 's:\&\& make:\&\& \\$(MAKE):' || die
+	# We have config protection, don't rename etc files
+	sed -i 's:.default::' auto/install || die
+	# remove useless files
+	sed -i -e '/koi-/d' -e '/win-/d' auto/install || die
+
+	# don't install to /etc/nginx/ if not in use
+	local module
+	for module in fastcgi scgi uwsgi ; do
+		if ! use nginx_modules_http_${module}; then
+			sed -i -e "/${module}/d" auto/install || die
+		fi
+	done
+
+	eapply_user
+}
+
+src_configure() {
+	# mod_security needs to generate nginx/modsecurity/config before including it
+	if use nginx_modules_http_security; then
+		cd "${HTTP_SECURITY_MODULE_WD}" || die
+
+		./configure \
+			--enable-standalone-module \
+			--disable-mlogc \
+			--with-ssdeep=no \
+			$(use_enable pcre-jit) \
+			$(use_with nginx_modules_http_lua lua) || die "configure failed for mod_security"
+
+		cd "${S}" || die
+	fi
+
+	local myconf=() http_enabled= mail_enabled= stream_enabled=
+
+	use aio       && myconf+=( --with-file-aio )
+	use debug     && myconf+=( --with-debug )
+	use http2     && myconf+=( --with-http_v2_module )
+	use libatomic && myconf+=( --with-libatomic )
+	use pcre      && myconf+=( --with-pcre )
+	use pcre-jit  && myconf+=( --with-pcre-jit )
+	use threads   && myconf+=( --with-threads )
+
+	# HTTP modules
+	for mod in $NGINX_MODULES_STD; do
+		if use nginx_modules_http_${mod}; then
+			http_enabled=1
+		else
+			myconf+=( --without-http_${mod}_module )
+		fi
+	done
+
+	for mod in $NGINX_MODULES_OPT; do
+		if use nginx_modules_http_${mod}; then
+			http_enabled=1
+			myconf+=( --with-http_${mod}_module )
+		fi
+	done
+
+	if use nginx_modules_http_fastcgi; then
+		myconf+=( --with-http_realip_module )
+	fi
+
+	# third-party modules
+	if use nginx_modules_http_upload_progress; then
+		http_enabled=1
+		myconf+=( --add-module=${HTTP_UPLOAD_PROGRESS_MODULE_WD} )
+	fi
+
+	if use nginx_modules_http_headers_more; then
+		http_enabled=1
+		myconf+=( --add-module=${HTTP_HEADERS_MORE_MODULE_WD} )
+	fi
+
+	if use nginx_modules_http_cache_purge; then
+		http_enabled=1
+		myconf+=( --add-module=${HTTP_CACHE_PURGE_MODULE_WD} )
+	fi
+
+	if use nginx_modules_http_slowfs_cache; then
+		http_enabled=1
+		myconf+=( --add-module=${HTTP_SLOWFS_CACHE_MODULE_WD} )
+	fi
+
+	if use nginx_modules_http_fancyindex; then
+		http_enabled=1
+		myconf+=( --add-module=${HTTP_FANCYINDEX_MODULE_WD} )
+	fi
+
+	if use nginx_modules_http_lua; then
+		http_enabled=1
+		export LUAJIT_LIB=$(pkg-config --variable libdir luajit)
+		export LUAJIT_INC=$(pkg-config --variable includedir luajit)
+		myconf+=( --add-module=${DEVEL_KIT_MODULE_WD} )
+		myconf+=( --add-module=${HTTP_LUA_MODULE_WD} )
+	fi
+
+	if use nginx_modules_http_auth_pam; then
+		http_enabled=1
+		myconf+=( --add-module=${HTTP_AUTH_PAM_MODULE_WD} )
+	fi
+
+	if use nginx_modules_http_upstream_check; then
+		http_enabled=1
+		myconf+=( --add-module=${HTTP_UPSTREAM_CHECK_MODULE_WD} )
+	fi
+
+	if use nginx_modules_http_metrics; then
+		http_enabled=1
+		myconf+=( --add-module=${HTTP_METRICS_MODULE_WD} )
+	fi
+
+	if use nginx_modules_http_naxsi ; then
+		http_enabled=1
+		myconf+=(  --add-module=${HTTP_NAXSI_MODULE_WD} )
+	fi
+
+	if use rtmp ; then
+		http_enabled=1
+		myconf+=( --add-module=${RTMP_MODULE_WD} )
+	fi
+
+	if use nginx_modules_http_dav_ext ; then
+		http_enabled=1
+		myconf+=( --add-module=${HTTP_DAV_EXT_MODULE_WD} )
+	fi
+
+	if use nginx_modules_http_echo ; then
+		http_enabled=1
+		myconf+=( --add-module=${HTTP_ECHO_MODULE_WD} )
+	fi
+
+	if use nginx_modules_http_security ; then
+		http_enabled=1
+		myconf+=( --add-module=${HTTP_SECURITY_MODULE_WD}/nginx/modsecurity )
+	fi
+
+	if use nginx_modules_http_push_stream ; then
+		http_enabled=1
+		myconf+=( --add-module=${HTTP_PUSH_STREAM_MODULE_WD} )
+	fi
+
+	if use nginx_modules_http_sticky ; then
+		http_enabled=1
+		myconf+=( --add-module=${HTTP_STICKY_MODULE_WD} )
+	fi
+
+	if use nginx_modules_http_mogilefs ; then
+		http_enabled=1
+		myconf+=( --add-module=${HTTP_MOGILEFS_MODULE_WD} )
+	fi
+
+	if use nginx_modules_http_memc ; then
+		http_enabled=1
+		myconf+=( --add-module=${HTTP_MEMC_MODULE_WD} )
+	fi
+
+	if use nginx_modules_http_auth_ldap; then
+		http_enabled=1
+		myconf+=( --add-module=${HTTP_LDAP_MODULE_WD} )
+	fi
+
+	if use nginx_modules_http_vhost_traffic_status; then
+		http_enabled=1
+		myconf+=( --add-module=${HTTP_VHOST_TRAFFIC_STATUS_MODULE_WD} )
+	fi
+
+	if use nginx_modules_http_geoip2 || use nginx_modules_stream_geoip2; then
+		myconf+=( --add-module=${GEOIP2_MODULE_WD} )
+	fi
+
+	if use nginx_modules_http_javascript || use nginx_modules_stream_javascript; then
+		myconf+=( --add-module="${NJS_MODULE_WD}/nginx" )
+	fi
+
+	if use nginx_modules_http_brotli; then
+		http_enabled=1
+		myconf+=( --add-module=${HTTP_BROTLI_MODULE_WD} )
+	fi
+
+	if use http || use http-cache || use http2 || use nginx_modules_http_javascript; then
+		http_enabled=1
+	fi
+
+	if [ $http_enabled ]; then
+		use http-cache || myconf+=( --without-http-cache )
+		use ssl && myconf+=( --with-http_ssl_module )
+	else
+		myconf+=( --without-http --without-http-cache )
+	fi
+
+	# Stream modules
+	for mod in $NGINX_MODULES_STREAM_STD; do
+		if use nginx_modules_stream_${mod}; then
+			stream_enabled=1
+		else
+			myconf+=( --without-stream_${mod}_module )
+		fi
+	done
+
+	for mod in $NGINX_MODULES_STREAM_OPT; do
+		if use nginx_modules_stream_${mod}; then
+			stream_enabled=1
+			myconf+=( --with-stream_${mod}_module )
+		fi
+	done
+
+	if use nginx_modules_stream_geoip2 || use nginx_modules_stream_javascript; then
+		stream_enabled=1
+	fi
+
+	if [ $stream_enabled ]; then
+		myconf+=( --with-stream )
+		use ssl && myconf+=( --with-stream_ssl_module )
+	fi
+
+	# MAIL modules
+	for mod in $NGINX_MODULES_MAIL; do
+		if use nginx_modules_mail_${mod}; then
+			mail_enabled=1
+		else
+			myconf+=( --without-mail_${mod}_module )
+		fi
+	done
+
+	if [ $mail_enabled ]; then
+		myconf+=( --with-mail )
+		use ssl && myconf+=( --with-mail_ssl_module )
+	fi
+
+	# custom modules
+	for mod in $NGINX_ADD_MODULES; do
+		myconf+=(  --add-module=${mod} )
+	done
+
+	# https://bugs.gentoo.org/286772
+	export LANG=C LC_ALL=C
+	tc-export AR CC
+
+	if ! use prefix; then
+		myconf+=( --user=${PN} )
+		myconf+=( --group=${PN} )
+	fi
+
+	local WITHOUT_IPV6=
+	if ! use ipv6; then
+		WITHOUT_IPV6=" -DNGX_HAVE_INET6=0"
+	fi
+
+	if [[ -n "${EXTRA_ECONF}" ]]; then
+		myconf+=( ${EXTRA_ECONF} )
+		ewarn "EXTRA_ECONF applied. Now you are on your own, good luck!"
+	fi
+
+	./configure \
+		--prefix="${EPREFIX}"/usr \
+		--conf-path="${EPREFIX}"/etc/${PN}/${PN}.conf \
+		--error-log-path="${EPREFIX}"/var/log/${PN}/error_log \
+		--pid-path="${EPREFIX}"/run/${PN}.pid \
+		--lock-path="${EPREFIX}"/run/lock/${PN}.lock \
+		--with-cc-opt="-I${EROOT}usr/include${WITHOUT_IPV6}" \
+		--with-ld-opt="-L${EROOT}usr/$(get_libdir)" \
+		--http-log-path="${EPREFIX}"/var/log/${PN}/access_log \
+		--http-client-body-temp-path="${EPREFIX}${NGINX_HOME_TMP}"/client \
+		--http-proxy-temp-path="${EPREFIX}${NGINX_HOME_TMP}"/proxy \
+		--http-fastcgi-temp-path="${EPREFIX}${NGINX_HOME_TMP}"/fastcgi \
+		--http-scgi-temp-path="${EPREFIX}${NGINX_HOME_TMP}"/scgi \
+		--http-uwsgi-temp-path="${EPREFIX}${NGINX_HOME_TMP}"/uwsgi \
+		--with-compat \
+		"${myconf[@]}" || die "configure failed"
+
+	# A purely cosmetic change that makes nginx -V more readable. This can be
+	# good if people outside the gentoo community would troubleshoot and
+	# question the users setup.
+	sed -i -e "s|${WORKDIR}|external_module|g" objs/ngx_auto_config.h || die
+}
+
+src_compile() {
+	use nginx_modules_http_security && emake -C "${HTTP_SECURITY_MODULE_WD}"
+
+	# https://bugs.gentoo.org/286772
+	export LANG=C LC_ALL=C
+	emake LINK="${CC} ${LDFLAGS}" OTHERLDFLAGS="${LDFLAGS}"
+}
+
+src_install() {
+	emake DESTDIR="${D%/}" install
+
+	cp "${FILESDIR}"/nginx.conf-r2 "${ED%/}"/etc/nginx/nginx.conf || die
+
+	newinitd "${FILESDIR}"/nginx.initd-r4 nginx
+	newconfd "${FILESDIR}"/nginx.confd nginx
+
+	systemd_newunit "${FILESDIR}"/nginx.service-r1 nginx.service
+
+	doman man/nginx.8
+	dodoc CHANGES* README
+
+	# just keepdir. do not copy the default htdocs files (bug #449136)
+	keepdir /var/www/localhost
+	rm -rf "${ED%/}"/usr/html || die
+
+	# set up a list of directories to keep
+	local keepdir_list="${NGINX_HOME_TMP}"/client
+	local module
+	for module in proxy fastcgi scgi uwsgi; do
+		use nginx_modules_http_${module} && keepdir_list+=" ${NGINX_HOME_TMP}/${module}"
+	done
+
+	keepdir /var/log/nginx ${keepdir_list}
+
+	# this solves a problem with SELinux where nginx doesn't see the directories
+	# as root and tries to create them as nginx
+	fperms 0750 "${NGINX_HOME_TMP}"
+	fowners ${PN}:0 "${NGINX_HOME_TMP}"
+
+	fperms 0700 ${keepdir_list}
+	fowners ${PN}:${PN} ${keepdir_list}
+
+	fperms 0710 /var/log/nginx
+	fowners 0:${PN} /var/log/nginx
+
+	# logrotate
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}"/nginx.logrotate-r1 nginx
+
+	# Don't create /run
+	rm -rf "${ED%/}"/run || die
+
+	if use luajit; then
+		pax-mark m "${ED%/}/usr/sbin/nginx"
+	fi
+
+	if use nginx_modules_http_perl; then
+		cd "${S}"/objs/src/http/modules/perl/ || die
+		emake DESTDIR="${D}" INSTALLDIRS=vendor
+		perl_delete_localpod
+		cd "${S}" || die
+	fi
+
+	if use nginx_modules_http_cache_purge; then
+		docinto ${HTTP_CACHE_PURGE_MODULE_P}
+		dodoc "${HTTP_CACHE_PURGE_MODULE_WD}"/{CHANGES,README.md,TODO.md}
+	fi
+
+	if use nginx_modules_http_slowfs_cache; then
+		docinto ${HTTP_SLOWFS_CACHE_MODULE_P}
+		dodoc "${HTTP_SLOWFS_CACHE_MODULE_WD}"/{CHANGES,README.md}
+	fi
+
+	if use nginx_modules_http_fancyindex; then
+		docinto ${HTTP_FANCYINDEX_MODULE_P}
+		dodoc "${HTTP_FANCYINDEX_MODULE_WD}"/README.rst
+	fi
+
+	if use nginx_modules_http_lua; then
+		docinto ${HTTP_LUA_MODULE_P}
+		dodoc "${HTTP_LUA_MODULE_WD}"/README.markdown
+	fi
+
+	if use nginx_modules_http_auth_pam; then
+		docinto ${HTTP_AUTH_PAM_MODULE_P}
+		dodoc "${HTTP_AUTH_PAM_MODULE_WD}"/{README.md,ChangeLog}
+	fi
+
+	if use nginx_modules_http_upstream_check; then
+		docinto ${HTTP_UPSTREAM_CHECK_MODULE_P}
+		dodoc "${HTTP_UPSTREAM_CHECK_MODULE_WD}"/{README,CHANGES}
+	fi
+
+	if use nginx_modules_http_naxsi; then
+		insinto /etc/nginx
+		doins "${HTTP_NAXSI_MODULE_WD}"/../naxsi_config/naxsi_core.rules
+	fi
+
+	if use rtmp; then
+		docinto ${RTMP_MODULE_P}
+		dodoc "${RTMP_MODULE_WD}"/{AUTHORS,README.md,stat.xsl}
+	fi
+
+	if use nginx_modules_http_dav_ext; then
+		docinto ${HTTP_DAV_EXT_MODULE_P}
+		dodoc "${HTTP_DAV_EXT_MODULE_WD}"/README.rst
+	fi
+
+	if use nginx_modules_http_echo; then
+		docinto ${HTTP_ECHO_MODULE_P}
+		dodoc "${HTTP_ECHO_MODULE_WD}"/README.markdown
+	fi
+
+	if use nginx_modules_http_security; then
+		docinto ${HTTP_SECURITY_MODULE_P}
+		dodoc "${HTTP_SECURITY_MODULE_WD}"/{CHANGES,README.md,authors.txt}
+	fi
+
+	if use nginx_modules_http_push_stream; then
+		docinto ${HTTP_PUSH_STREAM_MODULE_P}
+		dodoc "${HTTP_PUSH_STREAM_MODULE_WD}"/{AUTHORS,CHANGELOG.textile,README.textile}
+	fi
+
+	if use nginx_modules_http_sticky; then
+		docinto ${HTTP_STICKY_MODULE_P}
+		dodoc "${HTTP_STICKY_MODULE_WD}"/{README.md,Changelog.txt,docs/sticky.pdf}
+	fi
+
+	if use nginx_modules_http_memc; then
+		docinto ${HTTP_MEMC_MODULE_P}
+		dodoc "${HTTP_MEMC_MODULE_WD}"/README.markdown
+	fi
+
+	if use nginx_modules_http_auth_ldap; then
+		docinto ${HTTP_LDAP_MODULE_P}
+		dodoc "${HTTP_LDAP_MODULE_WD}"/example.conf
+	fi
+}
+
+pkg_postinst() {
+	if use ssl; then
+		if [[ ! -f "${EROOT}"etc/ssl/${PN}/${PN}.key ]]; then
+			install_cert /etc/ssl/${PN}/${PN}
+			use prefix || chown ${PN}:${PN} "${EROOT}"etc/ssl/${PN}/${PN}.{crt,csr,key,pem}
+		fi
+	fi
+
+	if use nginx_modules_http_spdy; then
+		ewarn ""
+		ewarn "In nginx 1.9.5 the spdy module was superseded by http2."
+		ewarn "Update your configs and package.use accordingly."
+	fi
+
+	if use nginx_modules_http_lua; then
+		ewarn ""
+		ewarn "While you can build lua 3rd party module against ${P}"
+		ewarn "the author warns that >=${PN}-1.11.11 is still not an"
+		ewarn "officially supported target yet. You are on your own."
+		ewarn "Expect runtime failures, memory leaks and other problems!"
+	fi
+
+	if use nginx_modules_http_lua && use http2; then
+		ewarn ""
+		ewarn "Lua 3rd party module author warns against using ${P} with"
+		ewarn "NGINX_MODULES_HTTP=\"lua http2\". For more info, see https://git.io/OldLsg"
+	fi
+
+	local _n_permission_layout_checks=0
+	local _has_to_adjust_permissions=0
+	local _has_to_show_permission_warning=0
+
+	# Defaults to 1 to inform people doing a fresh installation
+	# that we ship modified {scgi,uwsgi,fastcgi}_params files
+	local _has_to_show_httpoxy_mitigation_notice=1
+
+	local _replacing_version=
+	for _replacing_version in ${REPLACING_VERSIONS}; do
+		_n_permission_layout_checks=$((${_n_permission_layout_checks}+1))
+
+		if [[ ${_n_permission_layout_checks} -gt 1 ]]; then
+			# Should never happen:
+			# Package is abusing slots but doesn't allow multiple parallel installations.
+			# If we run into this situation it is unsafe to automatically adjust any
+			# permission...
+			_has_to_show_permission_warning=1
+
+			ewarn "Replacing multiple ${PN}' versions is unsupported! " \
+				"You will have to adjust permissions on your own."
+
+			break
+		fi
+
+		local _replacing_version_branch=$(get_version_component_range 1-2 "${_replacing_version}")
+		debug-print "Updating an existing installation (v${_replacing_version}; branch '${_replacing_version_branch}') ..."
+
+		# Do we need to adjust permissions to fix CVE-2013-0337 (bug #458726, #469094)?
+		# This was before we introduced multiple nginx versions so we
+		# do not need to distinguish between stable and mainline
+		local _need_to_fix_CVE2013_0337=1
+
+		if version_is_at_least "1.4.1-r2" "${_replacing_version}"; then
+			# We are updating an installation which should already be fixed
+			_need_to_fix_CVE2013_0337=0
+			debug-print "Skipping CVE-2013-0337 ... existing installation should not be affected!"
+		else
+			_has_to_adjust_permissions=1
+			debug-print "Need to adjust permissions to fix CVE-2013-0337!"
+		fi
+
+		# Do we need to inform about HTTPoxy mitigation?
+		# In repository since commit 8be44f76d4ac02cebcd1e0e6e6284bb72d054b0f
+		if ! version_is_at_least "1.10" "${_replacing_version_branch}"; then
+			# Updating from <1.10
+			_has_to_show_httpoxy_mitigation_notice=1
+			debug-print "Need to inform about HTTPoxy mitigation!"
+		else
+			# Updating from >=1.10
+			local _fixed_in_pvr=
+			case "${_replacing_version_branch}" in
+				"1.10")
+					_fixed_in_pvr="1.10.1-r2"
+					;;
+				"1.11")
+					_fixed_in_pvr="1.11.3-r1"
+					;;
+				*)
+					# This should be any future branch.
+					# If we run this code it is safe to assume that the user has
+					# already seen the HTTPoxy mitigation notice because he/she is doing
+					# an update from previous version where we have already shown
+					# the warning. Otherwise, we wouldn't hit this code path ...
+					_fixed_in_pvr=
+			esac
+
+			if [[ -z "${_fixed_in_pvr}" ]] || version_is_at_least "${_fixed_in_pvr}" "${_replacing_version}"; then
+				# We are updating an installation where we already informed
+				# that we are mitigating HTTPoxy per default
+				_has_to_show_httpoxy_mitigation_notice=0
+				debug-print "No need to inform about HTTPoxy mitigation ... information was already shown for existing installation!"
+			else
+				_has_to_show_httpoxy_mitigation_notice=1
+				debug-print "Need to inform about HTTPoxy mitigation!"
+			fi
+		fi
+
+		# Do we need to adjust permissions to fix CVE-2016-1247 (bug #605008)?
+		# All branches up to 1.11 are affected
+		local _need_to_fix_CVE2016_1247=1
+
+		if ! version_is_at_least "1.10" "${_replacing_version_branch}"; then
+			# Updating from <1.10
+			_has_to_adjust_permissions=1
+			debug-print "Need to adjust permissions to fix CVE-2016-1247!"
+		else
+			# Updating from >=1.10
+			local _fixed_in_pvr=
+			case "${_replacing_version_branch}" in
+				"1.10")
+					_fixed_in_pvr="1.10.2-r3"
+					;;
+				"1.11")
+					_fixed_in_pvr="1.11.6-r1"
+					;;
+				*)
+					# This should be any future branch.
+					# If we run this code it is safe to assume that we have already
+					# adjusted permissions or were never affected because user is
+					# doing an update from previous version which was safe or did
+					# the adjustments. Otherwise, we wouldn't hit this code path ...
+					_fixed_in_pvr=
+			esac
+
+			if [[ -z "${_fixed_in_pvr}" ]] || version_is_at_least "${_fixed_in_pvr}" "${_replacing_version}"; then
+				# We are updating an installation which should already be adjusted
+				# or which was never affected
+				_need_to_fix_CVE2016_1247=0
+				debug-print "Skipping CVE-2016-1247 ... existing installation should not be affected!"
+			else
+				_has_to_adjust_permissions=1
+				debug-print "Need to adjust permissions to fix CVE-2016-1247!"
+			fi
+		fi
+	done
+
+	if [[ ${_has_to_adjust_permissions} -eq 1 ]]; then
+		# We do not DIE when chmod/chown commands are failing because
+		# package is already merged on user's system at this stage
+		# and we cannot retry without losing the information that
+		# the existing installation needs to adjust permissions.
+		# Instead we are going to a show a big warning ...
+
+		if [[ ${_has_to_show_permission_warning} -eq 0 ]] && [[ ${_need_to_fix_CVE2013_0337} -eq 1 ]]; then
+			ewarn ""
+			ewarn "The world-readable bit (if set) has been removed from the"
+			ewarn "following directories to mitigate a security bug"
+			ewarn "(CVE-2013-0337, bug #458726):"
+			ewarn ""
+			ewarn "  ${EPREFIX}/var/log/nginx"
+			ewarn "  ${EPREFIX}${NGINX_HOME_TMP}/{,client,proxy,fastcgi,scgi,uwsgi}"
+			ewarn ""
+			ewarn "Check if this is correct for your setup before restarting nginx!"
+			ewarn "This is a one-time change and will not happen on subsequent updates."
+			ewarn "Furthermore nginx' temp directories got moved to '${EPREFIX}${NGINX_HOME_TMP}'"
+			chmod o-rwx \
+				"${EPREFIX}"/var/log/nginx \
+				"${EPREFIX}"${NGINX_HOME_TMP}/{,client,proxy,fastcgi,scgi,uwsgi} || \
+				_has_to_show_permission_warning=1
+		fi
+
+		if [[ ${_has_to_show_permission_warning} -eq 0 ]] && [[ ${_need_to_fix_CVE2016_1247} -eq 1 ]]; then
+			ewarn ""
+			ewarn "The permissions on the following directory have been reset in"
+			ewarn "order to mitigate a security bug (CVE-2016-1247, bug #605008):"
+			ewarn ""
+			ewarn "  ${EPREFIX}/var/log/nginx"
+			ewarn ""
+			ewarn "Check if this is correct for your setup before restarting nginx!"
+			ewarn "Also ensure that no other log directory used by any of your"
+			ewarn "vhost(s) is not writeable for nginx user. Any of your log files"
+			ewarn "used by nginx can be abused to escalate privileges!"
+			ewarn "This is a one-time change and will not happen on subsequent updates."
+			chown 0:nginx "${EPREFIX}"/var/log/nginx || _has_to_show_permission_warning=1
+			chmod 710 "${EPREFIX}"/var/log/nginx || _has_to_show_permission_warning=1
+		fi
+
+		if [[ ${_has_to_show_permission_warning} -eq 1 ]]; then
+			# Should never happen ...
+			ewarn ""
+			ewarn "*************************************************************"
+			ewarn "***************         W A R N I N G         ***************"
+			ewarn "*************************************************************"
+			ewarn "The one-time only attempt to adjust permissions of the"
+			ewarn "existing nginx installation failed. Be aware that we will not"
+			ewarn "try to adjust the same permissions again because now you are"
+			ewarn "using a nginx version where we expect that the permissions"
+			ewarn "are already adjusted or that you know what you are doing and"
+			ewarn "want to keep custom permissions."
+			ewarn ""
+		fi
+	fi
+
+	# Sanity check for CVE-2016-1247
+	# Required to warn users who received the warning above and thought
+	# they could fix it by unmerging and re-merging the package or have
+	# unmerged a affected installation on purpose in the past leaving
+	# /var/log/nginx on their system due to keepdir/non-empty folder
+	# and are now installing the package again.
+	local _sanity_check_testfile=$(mktemp --dry-run "${EPREFIX}"/var/log/nginx/.CVE-2016-1247.XXXXXXXXX)
+	su -s /bin/sh -c "touch ${_sanity_check_testfile}" nginx >&/dev/null
+	if [ $? -eq 0 ] ; then
+		# Cleanup -- no reason to die here!
+		rm -f "${_sanity_check_testfile}"
+
+		ewarn ""
+		ewarn "*************************************************************"
+		ewarn "***************         W A R N I N G         ***************"
+		ewarn "*************************************************************"
+		ewarn "Looks like your installation is vulnerable to CVE-2016-1247"
+		ewarn "(bug #605008) because nginx user is able to create files in"
+		ewarn ""
+		ewarn "  ${EPREFIX}/var/log/nginx"
+		ewarn ""
+		ewarn "Also ensure that no other log directory used by any of your"
+		ewarn "vhost(s) is not writeable for nginx user. Any of your log files"
+		ewarn "used by nginx can be abused to escalate privileges!"
+	fi
+
+	if [[ ${_has_to_show_httpoxy_mitigation_notice} -eq 1 ]]; then
+		# HTTPoxy mitigation
+		ewarn ""
+		ewarn "This nginx installation comes with a mitigation for the HTTPoxy"
+		ewarn "vulnerability for FastCGI, SCGI and uWSGI applications by setting"
+		ewarn "the HTTP_PROXY parameter to an empty string per default when you"
+		ewarn "are sourcing one of the default"
+		ewarn ""
+		ewarn "  - 'fastcgi_params' or 'fastcgi.conf'"
+		ewarn "  - 'scgi_params'"
+		ewarn "  - 'uwsgi_params'"
+		ewarn ""
+		ewarn "files in your server block(s)."
+		ewarn ""
+		ewarn "If this is causing any problems for you make sure that you are sourcing the"
+		ewarn "default parameters _before_ you set your own values."
+		ewarn "If you are relying on user-supplied proxy values you have to remove the"
+		ewarn "correlating lines from the file(s) mentioned above."
+		ewarn ""
+	fi
+}
diff --git a/www-servers/pshs/Manifest b/www-servers/pshs/Manifest
index b2e81b1c359c..3bca30a799c0 100644
--- a/www-servers/pshs/Manifest
+++ b/www-servers/pshs/Manifest
@@ -1,7 +1,3 @@
-DIST pshs-0.3.4.tar.bz2 81435 BLAKE2B e5a72c02efbaa95f0069d2533ce4434da88a5eaf33b7025b5d83bd0679631d6ee0b1faf31a5f3b0ed3bf2e23d4500bf6f473d997cabf99d8b769f4a2c662d32f SHA512 d264b46ad54286d5c4fac601e3353c1029af75ad59f28fea5a2970dc7e9b00327a08dfdd82141c76656f07047cfce1fa35b485b2f69f0728bcf74c835def917d
-DIST pshs-0.3.5.tar.bz2 79871 BLAKE2B 07322ce82d80ecc0db166672d1694902a3ae743fd5d43d79261fab66a2f08e58f990d3c5a47dd39c9d041f195cacf31d5db3546336ccc3d961709d17712adf53 SHA512 5cb0cd8950f708f0c4d7b9281e2863440c579557c285fdfda1082eebf849bfb7cd25965de05c7f7b96527eed94b95c635f8cd2d397ebfd4af12195f70b3c5648
 DIST pshs-0.4.1.tar.gz 11758 BLAKE2B b3f9422c8ebd47d3de9993b93ea0438232f3ba037d7433b08875a131f449fab880a205bb62616a057328b7d6fe9c00277fbb2e886a1494d2234ab684b0a1e90f SHA512 7ecd0e5019e9778b5f2eff31b8e2f481972cf6da66e4493cff850aa1ec13a4df46e46782799ab25cecd1cc36122f797c6ae0ac2863ea604477784a79191a62d6
-EBUILD pshs-0.3.4.ebuild 976 BLAKE2B 8f24f99c604d1ef8e43adcd59f8d74d986a088d54d3413b504a0fb6c44d450aadf8d33c55c36ae220e02fca1c3bbcd5b76283300228672f8d4de10f27fbe0047 SHA512 f8313c8eaa7f13f544ac7a55469765219791906049f6efaba5918aae476e011913ec62271568c2bb556676a34e6fd03b932db78c29a448ada0a0fb86ec9ee042
-EBUILD pshs-0.3.5.ebuild 835 BLAKE2B 553fb6d15e7149c69e8f3e22d4f28eb184c42896eb63cd8fea02d912467292409837b79f020a396715a33742b3ef99bc7025ced8b3f4b408a371f7d993cb44c0 SHA512 79a7810708a6c5636c1c96b5f818e4efbef2413dac6281a8362bba16b7d1656d487e30cd0dbe9acb3cf2d22a614411a0609111d8c1f23d04e27c7c9b77d17e15
-EBUILD pshs-0.4.1.ebuild 865 BLAKE2B f40e8683e508b56eeb0031c38bf506d0dba1ccc7b7d4d58c6d28b5b8ee1ff2926fdc4502b779c924eec41d1e1660e9b48fb3bd9584c6034cea659959d9f19d2b SHA512 f67e06e743cbe8b820fe6b020d6342def6f572e353bccac3a53fe4f4cc7a9aa3ec430a81ad275ce60a505d99d814711644e3d4d0469efd6979cd394c8c2ef638
-MISC metadata.xml 812 BLAKE2B 22683da13714799f768dbbf0e941ef96434d78566d3b7ee136d88214b360ef2c1d15dd4357238103bfeccc559e99e342ff3b61c3241563d816671844f2e4c23d SHA512 9e58734863a46f1f6d8d4b0c2666fc0d596d45d924a60fc5a19a173018e3ca881c20862a3e879a63b9ccfab6dc6018ba122b3537e408336db26672b02374cdb2
+EBUILD pshs-0.4.1.ebuild 863 BLAKE2B 83e30ed6d9c92ce635d5ae580acb4c1474648e1481eabaed62cd079a2543c4a8568cb30a6b9ab7453f5f9df52387898877b9991d8df2cd0914a01b8216316a52 SHA512 937bd47e1fc0e39c1c0552bf8aa86771cffe8f8bdea4ddb4d78063f2f5a6735481b1adb44cfff472622b7c7887f6b717a7ca5f6c5918600ab011d6ab861cb9b4
+MISC metadata.xml 698 BLAKE2B b2b93502d6c8751d60cf2cbf5daf2e78fc5301f1a3cbe5755ac11e9bc8dabbac642cfa87b81025488e7b41e18bdd6f6c356e09f612d8e3738ba55ac34d7514ed SHA512 bbedebc60e8a6e9750a80cf6f44fb35d791ef60c76bb1bac683b3f5240f1daac9951525149ff04ba48cf96ffed2f6fb913e5fca6249acfbe7bad0777866952b0
diff --git a/www-servers/pshs/metadata.xml b/www-servers/pshs/metadata.xml
index f2777ef196ca..7e3e8077f4bb 100644
--- a/www-servers/pshs/metadata.xml
+++ b/www-servers/pshs/metadata.xml
@@ -8,8 +8,6 @@
 	<use>
 		<flag name="magic">Enable automatic detection of Content-Type
 			using libmagic (<pkg>sys-apps/file</pkg>)</flag>
-		<flag name="netlink">Use libnetlink (<pkg>sys-apps/iproute2</pkg>) to
-			get network interface addresses</flag>
 		<flag name="qrcode">Enable generating QRCodes for server URL</flag>
 	</use>
 	<upstream>
diff --git a/www-servers/pshs/pshs-0.3.4.ebuild b/www-servers/pshs/pshs-0.3.4.ebuild
deleted file mode 100644
index 1cba5442a194..000000000000
--- a/www-servers/pshs/pshs-0.3.4.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="Pretty small HTTP server -- a command-line tool to share files"
-HOMEPAGE="https://github.com/mgorny/pshs/"
-SRC_URI="https://github.com/mgorny/${PN}/releases/download/v${PV}/${P}.tar.bz2"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="libressl +magic +netlink qrcode ssl upnp"
-
-RDEPEND=">=dev-libs/libevent-2:0=
-	magic? ( sys-apps/file:0= )
-	qrcode? ( media-gfx/qrencode:0= )
-	ssl? ( >=dev-libs/libevent-2.1:0=[ssl]
-		!libressl? ( dev-libs/openssl:0= )
-		libressl? ( dev-libs/libressl:= )
-	)
-	upnp? ( net-libs/miniupnpc:0= )"
-DEPEND="${RDEPEND}
-	netlink? ( sys-apps/iproute2[-minimal]
-		>=sys-kernel/linux-headers-2.6.27 )"
-# libnetlink is static only ATM
-
-src_configure() {
-	local myconf=(
-		$(use_enable magic libmagic)
-		$(use_enable netlink)
-		$(use_enable qrcode qrencode)
-		$(use_enable ssl)
-		$(use_enable upnp)
-	)
-
-	econf "${myconf[@]}"
-}
diff --git a/www-servers/pshs/pshs-0.3.5.ebuild b/www-servers/pshs/pshs-0.3.5.ebuild
deleted file mode 100644
index 6b3e64295963..000000000000
--- a/www-servers/pshs/pshs-0.3.5.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="Pretty small HTTP server -- a command-line tool to share files"
-HOMEPAGE="https://github.com/mgorny/pshs/"
-SRC_URI="https://github.com/mgorny/${PN}/releases/download/v${PV}/${P}.tar.bz2"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="libressl +magic qrcode ssl upnp"
-
-RDEPEND=">=dev-libs/libevent-2:0=
-	magic? ( sys-apps/file:0= )
-	qrcode? ( media-gfx/qrencode:0= )
-	ssl? ( >=dev-libs/libevent-2.1:0=[ssl]
-		!libressl? ( dev-libs/openssl:0= )
-		libressl? ( dev-libs/libressl:= )
-	)
-	upnp? ( net-libs/miniupnpc:0= )"
-DEPEND="${RDEPEND}"
-
-src_configure() {
-	local myconf=(
-		$(use_enable magic libmagic)
-		$(use_enable qrcode qrencode)
-		$(use_enable ssl)
-		$(use_enable upnp)
-	)
-
-	econf "${myconf[@]}"
-}
diff --git a/www-servers/pshs/pshs-0.4.1.ebuild b/www-servers/pshs/pshs-0.4.1.ebuild
index e20baa15b0c6..1d7ddf7a5956 100644
--- a/www-servers/pshs/pshs-0.4.1.ebuild
+++ b/www-servers/pshs/pshs-0.4.1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="libressl +magic qrcode ssl upnp"
 
 RDEPEND=">=dev-libs/libevent-2:0=
diff --git a/www-servers/puma/Manifest b/www-servers/puma/Manifest
index bed69926339a..54c0f2356ee5 100644
--- a/www-servers/puma/Manifest
+++ b/www-servers/puma/Manifest
@@ -3,6 +3,8 @@ AUX puma-3.12.5-cve-2020-11077.patch 3490 BLAKE2B 08f103ed5a5cf9878404f04c139476
 AUX puma-4.3.4-cve-2020-11077.patch 3578 BLAKE2B 34ed185950223fe952f29c98aa80211f8b066ec9d89a04ce4900b6fa654521ac4abb3ae4fd6ae9f56c3143649b0d07bb1a1b66691522c1a9d0ee4d574fe9c58b SHA512 1df326102f6efd0b0aec4918ddda8beba467a76fb863cb0f117d9f073cd6adfdc4dbcb5b698cff8a43404794aa0171e5c124bdf9e0b8ab4161475c6ab3bbd95e
 DIST puma-3.12.5.tar.gz 219175 BLAKE2B 55e80fba8fd84004090cb8d30b6fd01652f1beb1d1216c5d41ce46c616677504fa867f9701ed2631f4edc956c9377d72c6fd4a1b61e99fdbb50ea371b170a0c0 SHA512 1e6721844cbabab0cfb8b1707625723061821dae3ee06a3330075f787ae580e6836d9cbe436e63dc4602253ad1da3b56135316c923c03bbbae454d9457a44aec
 DIST puma-4.3.4.tar.gz 241806 BLAKE2B 5450f14112ad45c48794186c7e9f078feed28a4194a917c949f4058b9d3a115273df6d93260de330047fa59730cb3ad45f31eb05e5880569e95a0b2c9de99a42 SHA512 619bf44c17622233b673dbf6c8f34b0463cd32684df81c20f31045d3106a86e110753b4da80e7b51b46fe18d90ee107d9a84a975dc3116840d9a9b5962178873
+DIST puma-5.0.4.tar.gz 275942 BLAKE2B 1e607d7ff44ae9b677f6fb41355fe3b660bd880a642e5d3859e177c9327b68c0db729621ef0b3d7a5bb08917249fb7eac688027ceb62f072dabe7ba30086bf79 SHA512 6804ef3bfd4fa3a6695c213e3550244adace91121cb2c45f06fa4c68fb502787c5fdebba41b4754216eab880ca8738ab6f83d0ec9456a86fc6db99a4d4405bd8
 EBUILD puma-3.12.5-r1.ebuild 2159 BLAKE2B 9890e397dd8966c4f1480cc435cca1235a87d317d37fd7879a32b03a8ad8b1ec1a6898f7cf5731c8f80a0014ad8dc7b01bc3c10a46f817269101f641101d12a3 SHA512 f922181874ab1c8cd685f1837d3631682aaacc2c316bffe8918fd35f1c8a2f879d5b199a3a4bb9346017bb5e5faec51135ec47a0f502c300413d6a5c9389631a
 EBUILD puma-4.3.4-r1.ebuild 2176 BLAKE2B 433e221931b2716fdf1bbddf2aa7c2e08c759a63681bb21b34c3a5b8db3618203c4024473fbe98ba88dc7c4f0b63e96444f5305ace3338b14d1dd62140fbbed3 SHA512 91dde6a7c485b46f158f35432e136bb40b5115dace83e9f4446b4cf1c8e24660467b23f5f147bb6c26e699c13405e36205db4871e4afa6a1b1cc1c9180998b9c
+EBUILD puma-5.0.4.ebuild 1904 BLAKE2B 4041272a4dc73f59b34d6d95c2819d70e9c548c2534dbe58cd71c477524f77655a34025cb3d4c3a4b9100fdd6663ec077e382f651d28bb30cd06e184e0c4ab17 SHA512 8868450157cbeaaac662db7949df14735f43deaa1dece0481743240603b4aa6f8393f00d004754abea2c8a8c06c9b15cf9f5f00b25688b06ea8bddcf834416fa
 MISC metadata.xml 709 BLAKE2B f0a69d0e7f4c5e593ff5648b51de393610f579fd9fff372749fca4491e8dd57b7e853f87104e8b86f8e90013fe54f8c3141e28ae87d17432e60f329f51a67db6 SHA512 dd872907d8e164d0b63f1b4db076d9407c33581ae80ecafb119904ceebe4c05eb74d01d51c3217cf475faf02d3732e9854553fc980c1b054c42b95af58ee1c0e
diff --git a/www-servers/puma/puma-5.0.4.ebuild b/www-servers/puma/puma-5.0.4.ebuild
new file mode 100644
index 000000000000..4ae517dd9959
--- /dev/null
+++ b/www-servers/puma/puma-5.0.4.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+USE_RUBY="ruby25 ruby26 ruby27"
+
+RUBY_FAKEGEM_GEMSPEC="puma.gemspec"
+
+inherit multilib ruby-fakegem
+
+DESCRIPTION="a simple, fast, threaded, and highly concurrent HTTP 1.1 server for Ruby/Rack"
+HOMEPAGE="https://puma.io/"
+SRC_URI="https://github.com/puma/puma/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="3"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+IUSE=""
+
+DEPEND+=" dev-libs/openssl:0 test? ( net-misc/curl )"
+RDEPEND+=" dev-libs/openssl:0"
+
+ruby_add_bdepend "virtual/ruby-ssl
+	test? ( dev-ruby/rack >=dev-ruby/minitest-5.9:5 >=dev-ruby/test-unit-3.0:2 )"
+
+ruby_add_rdepend "dev-ruby/nio4r:2"
+
+all_ruby_prepare() {
+	sed -e '/bundler/ s:^:#:' \
+		-e '/prove/ s:^:#:' \
+		-e '/stub_const/ s:^:#:' \
+		-i test/helper.rb || die
+
+	# Avoid tests failing inconsistently
+	sed -i -e '/test_bad_client/askip "inconsistent results"' test/test_web_server.rb || die
+
+	# Avoid launcher tests since they make assumptions about bundler use
+	rm -f test/test_launcher.rb || die
+
+	# Skip integration tests since they make a lot of assumptions about
+	# the environment
+	rm -f test/test_integration_* test/test_preserve_bundler_env.rb|| die
+
+	# Avoid test that uses unpackaged stub_const
+	sed -i -e '/test_shutdown_with_grace/,/^  end/ s:^:#:' test/test_thread_pool.rb || die
+
+	sed -e 's/git ls-files --/find/' \
+		-e 's:_relative ": "./:' \
+		-i ${RUBY_FAKEGEM_GEMSPEC} || die
+}
+
+each_ruby_configure() {
+	${RUBY} -Cext/puma_http11 extconf.rb || die
+}
+
+each_ruby_compile() {
+	emake V=1 -Cext/puma_http11
+	cp ext/puma_http11/puma_http11$(get_modname) lib/puma/ || die
+}
+
+each_ruby_test() {
+	einfo "Running test suite"
+	${RUBY} -Ilib:.:test -e "gem 'minitest', '~>5.9'; gem 'test-unit', '~>3.0'; require 'minitest/autorun'; Dir['test/**/*test_*.rb'].each{|f| require f}" || die
+}
diff --git a/www-servers/tomcat/Manifest b/www-servers/tomcat/Manifest
index f942871ac0d8..638582dbdcef 100644
--- a/www-servers/tomcat/Manifest
+++ b/www-servers/tomcat/Manifest
@@ -2,22 +2,24 @@ AUX tomcat-7.0.99-build.xml.patch 5913 BLAKE2B 21316c4ce76bd3e87c2749354cbd455c1
 AUX tomcat-8.5.57-build.xml.patch 10554 BLAKE2B 40df509d8f5e3022a9d384d8d939800062ec383ea000f1224dfd5816a76af12dbde7d36826659707ae7e2a2bf0c19c1e8bc96bec5854bcd2422910530a0530fd SHA512 c1e3b73e2aece5e849219c663a01a31bd2f6355d37b51e18b68d42a05be2a49d173520450ac1aeef7b394fe860135afda225d450b4e98d912fe90231c9d70601
 AUX tomcat-9.0.37-build.xml.patch 11111 BLAKE2B dea5b3226ec9ade17e8e84c1ea00c97bb6154e212f5e43ee93876c60d4ac365e24613d80457b02ab27141a51933d8a758acd8ed2ee7f0224d13c0fb9d18101ae SHA512 3f185c3108a1f6ddccc068fe4b9f45638faba1060ab26237da17521110450d19722f374a86c4122eb59ee7ea53dbec78c9e77d8ba1c36c9e8e8cbbb414e9041c
 AUX tomcat-9.0.37-fix-build-rewrite.patch 513 BLAKE2B e806ca32771bcad0fbc2f1b3f223af2b17d2caffe6ed034783294650d4ec22c8d9d9d215ade85569f6627508c61b7d469412d582093708b6bb728d6123d65155 SHA512 7aab16d1b52fa88352df849ca051dcaf27f645b1b3edd3df3a7d87385b5068d300105f89c18ba3a0f65818739b85ec847ddd5b28b8b655efbb7b39036099cae2
+AUX tomcat-9.0.40-build.xml.patch 11106 BLAKE2B 6aeb5b4055e32dd30c430bb32dad7b89180c94418cb8e9fb9518441b5d636e984a8b502bb2c3e458d0760a726b0dbe16185f0f21a38608d180a497a7fa5e374d SHA512 6d68baca85c028e81ba990e7b11e4b86a5ad1d701a3d0a413f97640388da60d96ed50ea98f0e2ed1cc99d89030cd004214309816d428def6b2d9d51d4d5d0e36
+AUX tomcat-9.0.40-insufficient-ecj.patch 1718 BLAKE2B 2a90c57c54c32b7e561c378abe4a0a10a898f80aca13859b0944bb690d59ab7bf1bd69b4c6d21bb253a4463d9e481887783a1769d651bc75437f52ae555341e1 SHA512 cd4e7347a649fec319eba6aae3b6c7aa6146b14a7b9e51f8354ccdbaed29093a8623721acaec7649bec92b98e73b37c2cd36b2a3b9136dc5b25368a0523e9c2a
 AUX tomcat-instance-manager-r1.bash 6451 BLAKE2B 3bcd9dd4d3360a91f4a548c050eab6f7174453cfbe7b4a1a7167e122efa3ec2ea6c17c88de1f9223e21e773cf717ed04d79fe0b1e7fc816400033094a07a35c6 SHA512 3c8f994519d1ca5ff24229798786ad3d75dd20dbf8b3b81f6c0ccd121b978d2cb12633270f463a39ed5c4097e5869b1a4bfbf867994a64c5e41916e378038570
 AUX tomcat-instance-manager-r2.bash 6999 BLAKE2B f1c771678bd8b894ecf242d5a8fb22f5b2f0f33445a1ff158c242b5154edc4483a5707ce33a5dcee53a3106e631ad8218243d8b72a32a10cd99e9646fa54085d SHA512 c30c156cbf2b53cf8498288bacaedd48872dce52f461ff32071310b438bdb5015c1cd1d512a2905c4db01e2b22342590e1b8aeadbd44f29062606fabbb2f2fed
 AUX tomcat-r1.init 3200 BLAKE2B eb913d32bb8c1883e58551a25ff9516337d947c6fd2c7b449601a89a4518286d61dbca76417265289782a7a08540d8e78a3ea1cd1427d43d87e24813261c0fee SHA512 3d32e2ad998adfbaea5fe0ffcbbe6659dcb530a110faed5f2712ae2fd767353b1fc3f1ac83a24d43138c1bfc55949e645833a428ab982be14415887fc46d9fab
 AUX tomcat.conf 1811 BLAKE2B a92606e113172c6f0f73e18ab8ad8796f38bd8c741bb2fd1f6c43d7682728729d0198d4150e42282c7e732750231b7cdbfb51de9b24f2ba780a22700965113c5 SHA512 0747dd2fdad6c68123425adce39f625d34924ae3e7c9d5a00361565a593047d7a4d01dee64c1ef831e5ad79b51750babaf642b0588d4b5948bbed441d53d654d
-DIST apache-tomcat-7.0.105-src.tar.gz 5312024 BLAKE2B 0eaad66c6dcc3e2f6a2d8e142a7832cbd413724cab8b10f00e87d5535f4f20d5ba4712794e09444a8b3e0cf23f036da7c6923f038a6a11714682b129ed4ac5dd SHA512 249e039775e833d75b631cec26132b42e4aed25491a29f2349fa41b81737688b0a2e453072d8e3c5fc28763a9d1922f59da7529378ce8fd472eca7bbc73a6bd2
 DIST apache-tomcat-7.0.106-src.tar.gz 5302091 BLAKE2B f60975ef5570501b03e71645969170c44450f2b56f37688001ad1b4dce3a394f6800e9b28a8fabf59241116345fb7e2a287441f3eace020bc5c0203d57630c91 SHA512 5ce5a5af93c58e69c4758c2c0dedeadeceb6be920421b9d3b3d071d32fc8eb59ba8312c98d037b8434fe43d57a9f720ad8790de29a26ed2959f6c761fe1fd573
-DIST apache-tomcat-8.5.57-src.tar.gz 5730658 BLAKE2B f9bd2e159abc6af62c8681c38ea4eae8155f95df11f7c244e45018929189ef6b6a37a11e84119c3ddcb134a8ab58773add19cbab7506bb87c43b0039899fde60 SHA512 8bf4334b190c36900b708ee7097097e513f2d4572f119173bee732c76b5b660350fe516e58ac867250c2ef7a1371b55c116d3a1abd18323ceb92337f1dcb0f60
-DIST apache-tomcat-8.5.58-src.tar.gz 5773000 BLAKE2B e361cc359f86bb02fa4c39ebd51b52b4552aa78603c4d8fa5c5c8d87bcb89f6ed391408e3713a5011b7b8cc29506ad65f25b6047ec1009267ce8a68d396b3bc6 SHA512 f9e21c0c60b80e1a15049ff4ee6a4914036d19ed171c40bc614fc999c81c59c394c0a6595ac969a5b86662fa6c366676e7ecb2695c28518473b3f6c79e9a0e05
-DIST apache-tomcat-9.0.37-src.tar.gz 5894559 BLAKE2B 63148418ef96e90f212ce8a00dc6a274a8da2a1aa8a53ad0f6d3960efc8e876dd2812f425c0f21c73ee291752c5fd3bc8025eed46d18d31ae72e8bbe6dc1ba10 SHA512 6e819fe255c467b0081e91c17a53fa383fe84d922492c62d7dd93cabf00e22ab30872ecaa298a9b12977b8c7518f36c8429091b24c9fb5200db64e80e853ce98
+DIST apache-tomcat-7.0.107-src.tar.gz 5312698 BLAKE2B 1f2712ddce6aa604692aaf6a6c706469d3dbcb2266a99e62346c15b8347fff573608440473be8e20b8632a431f8838dd29f24f6bf630a13d262c444be68e0d2c SHA512 820923697c487367786c595d3aeaa58981d25b56529c6739b9388ad771f3264e6995f7659805cc5b2ef9456dbd42bad92ad2cfa3c7f741920a5b7bff2cc1bb1b
+DIST apache-tomcat-8.5.59-src.tar.gz 5787634 BLAKE2B 8ca1aa8b4d12d0e73c0d7937e906530037168ac349b196e172935332e632b1e9ab15379f532cb8fb1b2f853d01567332af9c031393882c833dcea65f9e626b09 SHA512 bed80e86c4dc972fd6ad414a804ed2bffc797e22b0a5e0e6e93c8540fb87cffb2fd2f1f8d97873a3ee24397f7961a8fdeb6756c542a532e4b73468bccec6e626
+DIST apache-tomcat-8.5.60-src.tar.gz 5837412 BLAKE2B 0c2200412900f7f6d318051333b15b8c6236e00f6194c21fc45bb95b565c4146e2682b879f3a293de3ab65524013f786a7f69dd7e91f1c4cc903179075253cc4 SHA512 43222e5d04b3de400429d6f1792d418172b6ff15dcc17e392cd66a5444d740a323b9c426a9f39678b3460452545fda4d784f56961d5ea56b9c0e1ca466d49040
 DIST apache-tomcat-9.0.38-src.tar.gz 5948083 BLAKE2B ac076684f10a51bf0e0b5b0dbf18ee476ec900bead0089010de7b4a7d380a1e18035eaa0d0f661c863aa53491e51f719c2a5985e4791bcc9dada4c421db39fe7 SHA512 13c79abed71ead564b108ec8a046e78374611acd906f4b6e775ac0427446117192be6b25f29894e625e2dc13f79abbc97bc52b32120ce5701cbe0f5ae05bc57b
+DIST apache-tomcat-9.0.40-src.tar.gz 6017562 BLAKE2B 1c90511911363bb3b154124382f6401851c3a0e7925e06cc8f2b4f02a7b4c1c59bc75007a8b387f06742cbeca7f840b6860d84dc7c6fdb1e7774b22dbca6082f SHA512 61b8e191315cee2bc0437013dbe7d1fb3451182e0b316fb377581c7d47a59cefb7f2ff30d96a2d6326a99c86f4151b26d1ef76bda5029b30d81c8297a0b362fb
 DIST biz.aQute.bnd-5.1.1.jar 16088761 BLAKE2B 59906cc39ea27ef20cbf82de1ba78096f34dc417da6dc5c28e21f6e92c0625efecf14cec6c5faf0ab17551c31a6c87a24614c2ac75ac902cfea30199ecc0d39f SHA512 8092b083e7b86e75bf27233964763b88bee74d8ae141c85e387c1cc8bd0cbf3a54be27afea29931fb3ae950700a515fd4a28cfe8e7f26cbaaec506aa06357a37
 DIST biz.aQute.bndlib-5.1.1.jar 3652944 BLAKE2B dad9f9835fb407a36e0eae4b65fa2fda147e06ab3f3211a2ed2f1631aeccd6d14d198c325793cb1ce9a57b719a836db230d0452715744ba5a4a6c2983c17916b SHA512 d7da056ba541ae0862159bf5e38e1a5351b2ab5388c88733b46601c2d7dab8970f16af00df186a6cb67fbe81ef53f2c8402db9d28a8c6819dadf60a1df40879b
-EBUILD tomcat-7.0.105-r1.ebuild 4224 BLAKE2B 9ff5e9fa663926e0609ffc15804c5426e95d4eb6dacd1e4e9f27ca06dd167f22bccf44e8b2cfc323532490846f7ae04672494f000e5efcddbf21c1126ae17a67 SHA512 9160d59093bbe4fe7260ac0bb26f124f70574cc4564f52f02d2987f7d6ca46825fe973cdbc69f1493d6a5a9c62ba5059ccabf5bb618ccdfd162c631b1a347b3e
-EBUILD tomcat-7.0.106.ebuild 4225 BLAKE2B 3f82018ea97e47df2439b4230ad19a2bd22163d0558acfafb26d8a1c006cc49cdd0074204b2ac8707f2fbc6a062a62ed8d016fcd0467d38ac51850059f23b818 SHA512 45587f442b61cf66e7fe35bf28a8d8053471e65d81fa982f555b132a58cf9157fb73e500c1049ec411c26dd22073c703d1cd6d0289456ce6d0ac1ba73fcbb160
-EBUILD tomcat-8.5.57-r1.ebuild 4805 BLAKE2B 3a5d5f2af2c2d9e430f986b1226754f039956e4af8a23c05ffe4f77f9e662703c95d235b78796bd8e34f3b22f873324aa1d797600ad36ef5cbc612e9429fd953 SHA512 501fc5e0db0329232cb68b370e3d496a4a9c9a992c50e4d6b9a7151f4478ea7e6778ffa054bdbe8eeb0be42e5f6fec6597ce2240f1a0550f8e100bfdb0369117
-EBUILD tomcat-8.5.58.ebuild 4814 BLAKE2B 93e522408e2807387a75f58b67d1bb3fba27dba3bdb27f6cc986a6445771abfa43c66cbc836e12436124d8e8c817d730ea04b8704ef4fb4cbea63db6aad1cb5b SHA512 1dba877f97b8356b13f94a8afa058d3530ab2b2e203bb88cc51da7d80efbcc75adee78d226c1e7f1f4e06d71b658fcbc776e84e11faab1021014c9c8837c38b1
-EBUILD tomcat-9.0.37-r1.ebuild 5590 BLAKE2B 550cb8e050d04bbc872b788c35fbea2aff91d9d12c153cf06a41e980bc9f9f61adbc025271e50764ecde87585999a2ab243040962ef71a96aa4e18c13197c1c2 SHA512 576e3a41e80f10c0372e81de2bacf7f900c6bc6220986be56fa102a0133521bc7c11af69b5c5083a9224f605d3d09a22b86965a8d8e32b81ec781a66d3fd5c2d
-EBUILD tomcat-9.0.38.ebuild 5606 BLAKE2B baf1188fd19208aa7fa4470b442dd94cbd115fc4ebc485083fee1403115c5218323106c3c5aa4437d8b23c26767dcac699ee79398448a90a4ae39f4671041f32 SHA512 98df3f7df1fb9cc3461f45c627b72321a7d7362ee40031237d5e3da97a4e5f76ff4105d94a00c36d2030eed5df74b64e2ebaa74d16be98848dbd26f4b5d8bd7f
+EBUILD tomcat-7.0.106.ebuild 4224 BLAKE2B 9ff5e9fa663926e0609ffc15804c5426e95d4eb6dacd1e4e9f27ca06dd167f22bccf44e8b2cfc323532490846f7ae04672494f000e5efcddbf21c1126ae17a67 SHA512 9160d59093bbe4fe7260ac0bb26f124f70574cc4564f52f02d2987f7d6ca46825fe973cdbc69f1493d6a5a9c62ba5059ccabf5bb618ccdfd162c631b1a347b3e
+EBUILD tomcat-7.0.107.ebuild 4225 BLAKE2B 3f82018ea97e47df2439b4230ad19a2bd22163d0558acfafb26d8a1c006cc49cdd0074204b2ac8707f2fbc6a062a62ed8d016fcd0467d38ac51850059f23b818 SHA512 45587f442b61cf66e7fe35bf28a8d8053471e65d81fa982f555b132a58cf9157fb73e500c1049ec411c26dd22073c703d1cd6d0289456ce6d0ac1ba73fcbb160
+EBUILD tomcat-8.5.59.ebuild 4813 BLAKE2B 42c6d453f0792a330e1e87c3ed7e7328b25774208d93dd376628582adce4258d09fa1f6fa10fbdf4ce912a158809bbdaf748bd339ad13bd08371ac6942e0b6ab SHA512 9946520457b189bc0cd06f02d6eccd09d8d9e6211424f24bfdad21442c9223b3bf6d505f6595f64572a5b8b6ef0d367bdfd6d998e0ae6c501f0c92837ddf8aed
+EBUILD tomcat-8.5.60.ebuild 4805 BLAKE2B 216c508e3f22ba203f43654eda6a567e78562d29d154172aab0e550c4426bf94e5f5bb56a664173a6a6bd626b899087b9d302a9fff5e73cc28bb52e93bc5a918 SHA512 d441136e62c130070a69b91f4aff6375857cf3ccae2f1697d37c70f31a912fbf977e892f84bbf7121f1bb5f1ca65f40f1c1af485242100d203151fc13b550eba
+EBUILD tomcat-9.0.38-r1.ebuild 5639 BLAKE2B bcdad460075d306e38a287587bd6b276433a0b733904c3ca2495c670f72bec84365aca5c991b18d1e90a0b2c049864dc6b57a5dcf3cf6988b33da6a1a8524659 SHA512 8ba94e57a5ea8356864cbcc54cd4381d7ebfc89db56434920b391b937697fdfd1857d54a82de9dddb946717ce9b96c95782064020b78ab92d042afc641960f53
+EBUILD tomcat-9.0.40.ebuild 5684 BLAKE2B 3a405f0221f549637f77104a6bf32f1c8d4a52050fc8fb3801206e78218a6e373f2fda62e0f759093a86d10991949f319591238540d0314310ee63dae80596cb SHA512 86a1c7b19d7b905ba92e4d151e04aa66976d7d1719027c4fdcc3ab4007b746d0b7fd348f248a430cb70f2b4a5a96fdd6c2006f2382d73853f6315fc7dcd8b68a
 MISC metadata.xml 712 BLAKE2B 3e0a9b1bd07334015006678c0e1d933dc3d7b65291425754f7bcaec673f2316ba85b2e7df2c79a90f0d53dfbc443329cbea8ddfde7d4c93a1635b6140a3b18b6 SHA512 bc7c894d5f945a732078cc4d9a7fa9d0374ebb6aec449487f8968b22aed07bc5e20094448fda9be7516206121d0dfec8c6d6e48ee818786999703ea778a82109
diff --git a/www-servers/tomcat/files/tomcat-9.0.40-build.xml.patch b/www-servers/tomcat/files/tomcat-9.0.40-build.xml.patch
new file mode 100644
index 000000000000..4b9999e283b8
--- /dev/null
+++ b/www-servers/tomcat/files/tomcat-9.0.40-build.xml.patch
@@ -0,0 +1,284 @@
+diff --git a/build.xml b/build.xml
+index 56a9701..ee86df9 100644
+--- a/build.xml
++++ b/build.xml
+@@ -1014,6 +1014,7 @@
+       addOSGi="true" />
+ 
+     <!-- Servlet 4.0 Implementation JAR File -->
++<!--
+     <jarIt jarfile="${servlet-api.jar}"
+       filesDir="${tomcat.classes}"
+       filesId="files.servlet-api"
+@@ -1021,21 +1022,23 @@
+       notice="${tomcat.manifests}/servlet-api.jar.notice"
+       license="${tomcat.manifests}/servlet-api.jar.license"
+       addOSGi="true" />
+-
++-->
+     <!-- EL Implementation JAR File -->
++<!--
+     <jarIt jarfile="${el-api.jar}"
+       filesDir="${tomcat.classes}"
+       filesId="files.el-api"
+       manifest="${tomcat.manifests}/el-api.jar.manifest"
+       addOSGi="true" />
+-
++-->
+     <!-- JSP Implementation JAR File -->
++<!--
+     <jarIt jarfile="${jsp-api.jar}"
+       filesDir="${tomcat.classes}"
+       filesId="files.jsp-api"
+       manifest="${tomcat.manifests}/jsp-api.jar.manifest"
+       addOSGi="true" />
+-
++-->
+     <!-- WebSocket API JAR File -->
+     <jarIt jarfile="${websocket-api.jar}"
+       filesDir="${tomcat.classes}"
+@@ -1148,10 +1151,10 @@
+       addOSGi="true" />
+ 
+     <!-- Re-packaged Apache Commons DBCP 2-->
+-    <jarIt jarfile="${tomcat-dbcp.jar}"
++<!--    <jarIt jarfile="${tomcat-dbcp.jar}"
+       filesDir="${tomcat.classes}"
+       filesId="files.tomcat-dbcp"
+-      addOSGi="true" />
++      addOSGi="true" /> -->
+ 
+     <!-- i18n JARs -->
+     <jar jarfile="${tomcat.build}/lib/tomcat-i18n-cs.jar"
+@@ -1374,9 +1377,9 @@
+ 
+   <target name="deploy" depends="package,build-docs,build-tomcat-jdbc,compile-webapp-examples"
+           description="Default. Builds a working Tomcat instance">
+-
++<!--
+     <copy tofile="${tomcat.build}/bin/commons-daemon.jar" file="${commons-daemon.jar}" />
+-
++-->
+     <!-- Copy scripts -->
+     <copy todir="${tomcat.build}/bin">
+       <fileset dir="bin">
+@@ -1436,7 +1439,7 @@
+         <exclude name="${jdt.jar.filename}"/>
+       </fileset>
+     </delete>
+-    <copy file="${jdt.jar}" todir="${tomcat.build}/lib"/>
++<!--    <copy file="${jdt.jar}" todir="${tomcat.build}/lib"/> -->
+ 
+     <!-- Add sources for examples -->
+     <antcall target="examples-sources" />
+@@ -1479,7 +1482,7 @@
+ 
+   </target>
+ 
+-  <target name="build-tomcat-jdbc" depends="package">
++  <target name="build-tomcat-jdbc" depends="package" unless="noget">
+     <!-- build the jdbc-pool jar and source jar-->
+     <echo message="Building Tomcat JDBC pool libraries"/>
+     <ant antfile="${tomcat.jdbc.dir}/build.xml" dir="${tomcat.jdbc.dir}"
+@@ -1494,7 +1497,7 @@
+     <copy file="${tomcat-jdbc.jar}" todir="${tomcat.build}/lib"/>
+   </target>
+ 
+-  <target name="build-tomcat-jdbc-src">
++  <target name="build-tomcat-jdbc-src" unless="noget">
+     <!-- build the jdbc-pool source jar-->
+     <echo message="Building Tomcat JDBC pool src JAR"/>
+     <ant antfile="${tomcat.jdbc.dir}/build.xml" dir="${tomcat.jdbc.dir}"
+@@ -1597,9 +1600,11 @@
+ 
+     <copy file="${basedir}/LICENSE" todir="${tomcat.embed}" />
+     <copy file="${basedir}/NOTICE" todir="${tomcat.embed}" />
++<!--
+     <copy file="${tomcat-dbcp.jar}" todir="${tomcat.embed}"
+       failonerror="false"/>
+     <copy file="${jdt.jar}" todir="${tomcat.embed}" />
++-->
+     <copy file="${annotations-api.jar}" todir="${tomcat.embed}" />
+ 
+     <!-- Note the meta-inf below will work as long as there is only one JAR
+@@ -2171,11 +2176,12 @@
+     </copy>
+ 
+     <!-- Source bundles for native components -->
++<!--
+     <copy tofile="${tomcat.dist}/bin/tomcat-native.tar.gz"
+             file="${tomcat-native.tar.gz}" />
+     <copy tofile="${tomcat.dist}/bin/commons-daemon-native.tar.gz"
+             file="${commons-daemon.native.src.tgz}" />
+-
++-->
+     <!-- platform README files -->
+     <echo append="false" file="${tomcat.dist}/bin/x64/README">
+ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform.
+@@ -2206,6 +2212,7 @@ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform.
+         <path location="${ant.core.lib}"/>
+       </classpath>
+     </javadoc>
++<!--
+     <javadoc packagenames="javax.servlet.*"
+       excludepackagenames="javax.servlet.jsp.*"
+       sourcepath="${tomcat.dist}/src/java"
+@@ -2270,6 +2277,7 @@ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform.
+         <path location="${ant.core.lib}"/>
+       </classpath>
+     </javadoc>
++-->
+     <javadoc packagenames="javax.websocket.*"
+       sourcepath="${tomcat.dist}/src/java"
+       destdir="${tomcat.dist}/webapps/docs/websocketapi"
+@@ -2332,13 +2340,17 @@ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform.
+         <path location="${osgi-annotations.jar}"/>
+       </classpath>
+       <link href="../annotationapi"/>
++<!--
+       <link href="../servletapi"/>
+       <link href="../jspapi"/>
+       <link href="../elapi"/>
++-->
+       <link href="../websocketapi"/>
+       <link href="../jaspicapi"/>
++<!--
+       <link href="https://docs.oracle.com/javase/8/docs/api/"/>
+       <link href="https://javaee.github.io/javaee-spec/javadocs/"/>
++-->
+       <packageset dir="${tomcat.dist}/src/java/">
+         <include name="org/**"/>
+         <exclude name="org/apache/el/parser/**"/>
+@@ -3066,7 +3078,7 @@ skip.installer property in build.properties" />
+ 
+   <target name="download-compile"
+           description="Download components necessary to compile"
+-          depends="setup-bnd">
++          depends="setup-bnd" unless="noget">
+ 
+     <!-- Download Commons Daemon -->
+     <antcall target="downloadgz-2">
+@@ -3121,7 +3133,7 @@ skip.installer property in build.properties" />
+   </target>
+ 
+   <target name="download-test-compile"
+-          description="Download additional components for the tests" >
++          description="Download additional components for the tests" unless="noget">
+ 
+     <antcall target="downloadfile">
+       <param name="sourcefile" value="${junit.loc}"/>
+@@ -3199,7 +3211,7 @@ skip.installer property in build.properties" />
+   </target>
+ 
+   <target name="download-dist"
+-          description="Download additional components for a distribution" >
++          description="Download additional components for a distribution" unless="noget">
+ 
+     <antcall target="downloadfile-2">
+       <param name="sourcefile.1" value="${tomcat-native.loc.1}"/>
+@@ -3254,13 +3266,13 @@ skip.installer property in build.properties" />
+ 
+   <!-- =============== Utility Targets to support downloads ================ -->
+ 
+-  <target name="setproxy" if="${proxy.use}">
++  <target name="setproxy" if="${proxy.use}" unless="noget">
+     <setproxy proxyhost="${proxy.host}" proxyport="${proxy.port}"
+               proxyuser="${proxy.user}" proxypassword="${proxy.password}" />
+     <echo message="Using ${proxy.host}:${proxy.port} to download ${sourcefile}"/>
+   </target>
+ 
+-  <target name="testexist">
++  <target name="testexist" unless="noget">
+     <echo message="Testing  for ${destfile}"/>
+     <available file="${destfile}" property="exist"/>
+   </target>
+@@ -3382,7 +3394,7 @@ skip.installer property in build.properties" />
+     </sequential>
+   </macrodef>
+ 
+-  <target name="downloadgz" unless="exist" depends="testexist,setproxy">
++  <target name="downloadgz" unless="noget" depends="testexist,setproxy">
+     <!-- Download and extract the package -->
+     <local name="temp.file"/>
+     <mkdir dir="${base.path}"/>
+@@ -3399,7 +3411,7 @@ skip.installer property in build.properties" />
+     <delete file="${temp.file}.tar.gz"/>
+   </target>
+ 
+-  <target name="downloadgz-2" unless="exist" depends="testexist">
++  <target name="downloadgz-2" unless="noget" depends="testexist">
+     <!-- Download and extract the package from the two alternative locations -->
+     <local name="temp.file"/>
+     <mkdir dir="${base.path}"/>
+@@ -3424,7 +3436,7 @@ skip.installer property in build.properties" />
+     <delete file="${temp.file}.tar.gz"/>
+   </target>
+ 
+-  <target name="downloadzip" unless="exist" depends="testexist,setproxy">
++  <target name="downloadzip" unless="noget" depends="testexist,setproxy">
+     <!-- Download and extract the package -->
+     <local name="temp.file"/>
+     <mkdir dir="${base.path}"/>
+@@ -3440,7 +3452,7 @@ skip.installer property in build.properties" />
+     <delete file="${temp.file}"/>
+   </target>
+ 
+-  <target name="downloadzip-2" unless="exist" depends="testexist">
++  <target name="downloadzip-2" unless="noget" depends="testexist">
+     <!-- Download and extract the package from the two alternative locations -->
+     <local name="temp.file"/>
+     <mkdir dir="${base.path}"/>
+@@ -3464,7 +3476,7 @@ skip.installer property in build.properties" />
+     <delete file="${temp.file}"/>
+   </target>
+ 
+-  <target name="downloadfile" unless="exist" depends="testexist,setproxy">
++  <target name="downloadfile" unless="noget" depends="testexist,setproxy">
+     <!-- Download the file -->
+     <local name="temp.file"/>
+     <mkdir dir="${base.path}"/>
+@@ -3479,7 +3491,7 @@ skip.installer property in build.properties" />
+     <move file="${temp.file}" tofile="${destfile}"/>
+   </target>
+ 
+-  <target name="downloadfile-2" unless="exist" depends="testexist">
++  <target name="downloadfile-2" unless="noget" depends="testexist">
+     <!-- Download the file from the two alternative locations -->
+     <local name="temp.file"/>
+     <mkdir dir="${base.path}"/>
+@@ -3507,7 +3519,7 @@ skip.installer property in build.properties" />
+     <move file="${temp.file}" tofile="${destfile}"/>
+   </target>
+ 
+-  <target name="trydownload.check" depends="setproxy">
++  <target name="trydownload.check" depends="setproxy" unless="noget">
+     <condition property="trydownload.run">
+       <and>
+         <not>
+@@ -3518,7 +3530,7 @@ skip.installer property in build.properties" />
+     </condition>
+   </target>
+ 
+-  <target name="trydownload" if="trydownload.run" depends="trydownload.check">
++  <target name="trydownload" if="trydownload.run" depends="trydownload.check" unless="noget">
+     <!-- Downloads a file if not yet downloaded and the source URL is available -->
+     <get src="${sourcefile}" httpusecaches="${trydownload.httpusecaches}" dest="${destfile}" />
+   </target>
+@@ -3529,7 +3541,7 @@ skip.installer property in build.properties" />
+ 
+   <target name="ide-eclipse"
+           depends="download-compile, download-test-compile"
+-          description="Prepares the source tree to be built in Eclipse">
++          description="Prepares the source tree to be built in Eclipse" unless="noget">
+ 
+     <!-- Copy the sample project files into the root directory -->
+     <copy file="${tomcat.home}/res/ide-support/eclipse/eclipse.project" tofile="${tomcat.home}/.project"/>
+@@ -3547,7 +3559,7 @@ Read the Building page on the Apache Tomcat documentation site for details on ho
+ 
+   <target name="ide-intellij"
+           depends="download-compile, download-test-compile"
+-          description="Creates project directory .idea for IntelliJ IDEA">
++          description="Creates project directory .idea for IntelliJ IDEA" unless="noget">
+ 
+     <copy todir="${tomcat.home}/.idea">
+       <fileset dir="${tomcat.home}/res/ide-support/idea"/>
diff --git a/www-servers/tomcat/files/tomcat-9.0.40-insufficient-ecj.patch b/www-servers/tomcat/files/tomcat-9.0.40-insufficient-ecj.patch
new file mode 100644
index 000000000000..dd002e2ca216
--- /dev/null
+++ b/www-servers/tomcat/files/tomcat-9.0.40-insufficient-ecj.patch
@@ -0,0 +1,24 @@
+diff --git a/java/org/apache/jasper/compiler/JDTCompiler.java b/java/org/apache/jasper/compiler/JDTCompiler.java
+index 4722a4a..27ce287 100644
+--- a/java/org/apache/jasper/compiler/JDTCompiler.java
++++ b/java/org/apache/jasper/compiler/JDTCompiler.java
+@@ -307,7 +307,7 @@ public class JDTCompiler extends org.apache.jasper.compiler.Compiler {
+             } else if(opt.equals("13")) {
+                 settings.put(CompilerOptions.OPTION_Source, CompilerOptions.VERSION_13);
+             } else if(opt.equals("14")) {
+-                settings.put(CompilerOptions.OPTION_Source, CompilerOptions.VERSION_14);
++                settings.put(CompilerOptions.OPTION_Source, "14");
+             } else if(opt.equals("15")) {
+                 // Constant not available in latest ECJ version shipped with
+                 // Tomcat. May be supported in a snapshot build.
+@@ -368,8 +368,8 @@ public class JDTCompiler extends org.apache.jasper.compiler.Compiler {
+                 settings.put(CompilerOptions.OPTION_TargetPlatform, CompilerOptions.VERSION_13);
+                 settings.put(CompilerOptions.OPTION_Compliance, CompilerOptions.VERSION_13);
+             } else if(opt.equals("14")) {
+-                settings.put(CompilerOptions.OPTION_TargetPlatform, CompilerOptions.VERSION_14);
+-                settings.put(CompilerOptions.OPTION_Compliance, CompilerOptions.VERSION_14);
++                settings.put(CompilerOptions.OPTION_TargetPlatform, "14");
++                settings.put(CompilerOptions.OPTION_Compliance, "14");
+             } else if(opt.equals("15")) {
+                 // Constant not available in latest ECJ version shipped with
+                 // Tomcat. May be supported in a snapshot build.
diff --git a/www-servers/tomcat/tomcat-7.0.106.ebuild b/www-servers/tomcat/tomcat-7.0.106.ebuild
index acdb9985f254..a905c145be4a 100644
--- a/www-servers/tomcat/tomcat-7.0.106.ebuild
+++ b/www-servers/tomcat/tomcat-7.0.106.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://apache/${PN}/tomcat-7/v${PV}/src/${MY_P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="7"
-KEYWORDS="~amd64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="amd64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
 IUSE="extra-webapps websockets"
 
 RESTRICT="test" # can we run them on a production system?
diff --git a/www-servers/tomcat/tomcat-7.0.105-r1.ebuild b/www-servers/tomcat/tomcat-7.0.107.ebuild
index a905c145be4a..acdb9985f254 100644
--- a/www-servers/tomcat/tomcat-7.0.105-r1.ebuild
+++ b/www-servers/tomcat/tomcat-7.0.107.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://apache/${PN}/tomcat-7/v${PV}/src/${MY_P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="7"
-KEYWORDS="amd64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="~amd64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
 IUSE="extra-webapps websockets"
 
 RESTRICT="test" # can we run them on a production system?
diff --git a/www-servers/tomcat/tomcat-8.5.57-r1.ebuild b/www-servers/tomcat/tomcat-8.5.59.ebuild
index 3ab7947a19c5..3e285a9aaac4 100644
--- a/www-servers/tomcat/tomcat-8.5.57-r1.ebuild
+++ b/www-servers/tomcat/tomcat-8.5.59.ebuild
@@ -56,7 +56,7 @@ src_prepare() {
 	# Remove bundled servlet-api
 	rm -rv java/javax/{el,servlet} || die
 
-	eapply "${FILESDIR}/${P}-build.xml.patch"
+	eapply "${FILESDIR}/${PN}-8.5.57-build.xml.patch"
 
 	# For use of catalina.sh in netbeans
 	sed -i -e "/^# ----- Execute The Requested Command/ a\
diff --git a/www-servers/tomcat/tomcat-8.5.58.ebuild b/www-servers/tomcat/tomcat-8.5.60.ebuild
index cb1cc0e1c51c..86d3e5d65919 100644
--- a/www-servers/tomcat/tomcat-8.5.58.ebuild
+++ b/www-servers/tomcat/tomcat-8.5.60.ebuild
@@ -29,7 +29,7 @@ RDEPEND="${COMMON_DEP}
 	virtual/jre"
 DEPEND="${COMMON_DEP}
 	app-admin/pwgen
-	>=dev-java/ant-core-1.9.13
+	dev-java/ant-core
 	virtual/jdk:1.8
 	doc? (
 		dev-java/glassfish-xmlrpc-api:0
diff --git a/www-servers/tomcat/tomcat-9.0.38.ebuild b/www-servers/tomcat/tomcat-9.0.38-r1.ebuild
index aa4ab40d9c97..96cdfe92f36c 100644
--- a/www-servers/tomcat/tomcat-9.0.38.ebuild
+++ b/www-servers/tomcat/tomcat-9.0.38-r1.ebuild
@@ -88,7 +88,7 @@ src_prepare() {
 JAVA_ANT_REWRITE_CLASSPATH="true"
 
 EANT_BUILD_TARGET="deploy"
-EANT_GENTOO_CLASSPATH="eclipse-ecj-${ECJ_SLOT},tomcat-servlet-api-${SAPI_SLOT},glassfish-xmlrpc-api,wsdl4j"
+EANT_GENTOO_CLASSPATH="eclipse-ecj-${ECJ_SLOT},tomcat-servlet-api-${SAPI_SLOT},wsdl4j"
 EANT_TEST_GENTOO_CLASSPATH="easymock-3.2"
 EANT_GENTOO_CLASSPATH_EXTRA="${S}/output/classes"
 EANT_NEEDS_TOOLS="true"
@@ -105,7 +105,7 @@ src_configure() {
 }
 
 src_compile() {
-	EANT_GENTOO_CLASSPATH_EXTRA+=":$(java-pkg_getjar --build-only ant-core ant.jar)"
+	EANT_GENTOO_CLASSPATH_EXTRA+=":$(java-pkg_getjar --build-only ant-core ant.jar):$(java-pkg_getjars --build-only glassfish-xmlrpc-api)"
 	java-pkg-2_src_compile
 }
 
diff --git a/www-servers/tomcat/tomcat-9.0.37-r1.ebuild b/www-servers/tomcat/tomcat-9.0.40.ebuild
index 8ac1a2107bd5..41d3c02f7744 100644
--- a/www-servers/tomcat/tomcat-9.0.37-r1.ebuild
+++ b/www-servers/tomcat/tomcat-9.0.40.ebuild
@@ -15,7 +15,7 @@ BND_VERSION="5.1.1"
 BND="biz.aQute.bnd-${BND_VERSION}.jar"
 BNDLIB="biz.aQute.bndlib-${BND_VERSION}.jar"
 
-DESCRIPTION="Tomcat Servlet-4.0/JSP-2.4?/EL-3.1?/WebSocket-1.2?/JASPIC-1.1 Container"
+DESCRIPTION="Tomcat Servlet-4.0/JSP-2.3/EL-3.0/WebSocket-1.1/JASPIC-1.1 Container"
 HOMEPAGE="https://tomcat.apache.org/"
 SRC_URI="mirror://apache/${PN}/tomcat-9/v${PV}/src/${MY_P}.tar.gz
 	https://repo.maven.apache.org/maven2/biz/aQute/bnd/biz.aQute.bnd/${BND_VERSION}/${BND}
@@ -28,7 +28,7 @@ IUSE="extra-webapps"
 
 RESTRICT="test" # can we run them on a production system?
 
-ECJ_SLOT="4.13"
+ECJ_SLOT="4.15"
 SAPI_SLOT="4.0"
 
 COMMON_DEP="dev-java/eclipse-ecj:${ECJ_SLOT}
@@ -48,6 +48,10 @@ DEPEND="${COMMON_DEP}
 
 S=${WORKDIR}/${MY_P}
 
+PATCHES=(
+	"${FILESDIR}/${P}-insufficient-ecj.patch"
+)
+
 BND_HOME="${S}/tomcat-build-libs/bnd"
 BNDLIB_HOME="${S}/tomcat-build-libs/bndlib"
 BND_JAR="${BND_HOME}/${BND}"
@@ -88,7 +92,7 @@ src_prepare() {
 JAVA_ANT_REWRITE_CLASSPATH="true"
 
 EANT_BUILD_TARGET="deploy"
-EANT_GENTOO_CLASSPATH="eclipse-ecj-${ECJ_SLOT},tomcat-servlet-api-${SAPI_SLOT},glassfish-xmlrpc-api,wsdl4j"
+EANT_GENTOO_CLASSPATH="eclipse-ecj-${ECJ_SLOT},tomcat-servlet-api-${SAPI_SLOT},wsdl4j"
 EANT_TEST_GENTOO_CLASSPATH="easymock-3.2"
 EANT_GENTOO_CLASSPATH_EXTRA="${S}/output/classes"
 EANT_NEEDS_TOOLS="true"
@@ -101,11 +105,11 @@ INIT_REV="-r1"
 src_configure() {
 	java-ant-2_src_configure
 
-	eapply "${FILESDIR}/${P}-fix-build-rewrite.patch"
+	eapply "${FILESDIR}/${PN}-9.0.37-fix-build-rewrite.patch"
 }
 
 src_compile() {
-	EANT_GENTOO_CLASSPATH_EXTRA+=":$(java-pkg_getjar --build-only ant-core ant.jar)"
+	EANT_GENTOO_CLASSPATH_EXTRA+=":$(java-pkg_getjar --build-only ant-core ant.jar):$(java-pkg_getjars --build-only glassfish-xmlrpc-api)"
 	java-pkg-2_src_compile
 }
 
diff --git a/www-servers/uwsgi/Manifest b/www-servers/uwsgi/Manifest
index ddadd36171d9..87eb5c1f52eb 100644
--- a/www-servers/uwsgi/Manifest
+++ b/www-servers/uwsgi/Manifest
@@ -1,8 +1,6 @@
 AUX gentoo.buildconf 490 BLAKE2B 320b0471c0c76ab6c8ada7b034f612fc20398eb60e1edc3530be9d177bff755779251ea880d98addacf5476e3aae20145c95fad4d7baf594e58b9ebcaf2b0dde SHA512 d5bdc136374aed58ce206ea72cc45c72750f60117eef98960356b5cd64e2152c454af6b5aebb28f03ad46b42ea95a16fbf1e4a6f976ae78744550803ac775fe2
 AUX uwsgi.confd-r4 1849 BLAKE2B 80afdf7a5ebc520d887061aba9f7cd64b1bca06d3da478d8d1090a8b9cba973ac2d3dbcbc2ceb980415e98317bc55b07a9a7e6641fac593dc4dd5466bd8d67c9 SHA512 041d1bd694fad6f7c5e28944aab6d7ba53b3c7fc990ce6b7c2d97b9f3d6650c46dda8069e545c252a7400e1d825c8e46d7393a289757b1bd665e64241ca3789a
 AUX uwsgi.initd-r7 3746 BLAKE2B a56c5f4e32ccb415fab10f357e2a7404179285e656d9f886809da281b214e2110c76e2cf8826d8fd90aba01262a5edc7a941522ff59348972c5a4325c784b9b9 SHA512 81ed974fb2957e05c890cab29f5b5a75845e6b7de899d2695fb2fa5f49b4545daa437c81c8dc5c735b24a45655cf6320c9256bc8faa7e32ffd7a2d981922def5
-DIST uwsgi-2.0.18.tar.gz 801555 BLAKE2B d8008e751fd699474a1b7d6276c10b3d2f1ebd0ca325e45bfb3b13f81e88de20e4e7389cd6aa9c8b3daa964d9b11524ee71e93717ed9762bf021471f6a2c09fa SHA512 6561703279bcc4a81311d033810ac066d0f113bab13b0942f3eef86cac29c584a6641b52476840d6895151aee5ed064ae2d03b18932cf7f47e62f4eeed76da61
 DIST uwsgi-2.0.19.1.tar.gz 804398 BLAKE2B 73fc19990866eb1058a742b34a817b3bd87e00c838da055bece2bff5e13c161f53c642866ed591aa4afeb23ef924205502f2cb0a4cf9d303b5b63fb9a53f57e2 SHA512 34b55f7c7a77dc0b0dab34d1a9ca9a4cba8a9261969656c88435e7f32fe8a0c5654e1562706775f77e2f60c4ad0f5c6055257a23ab7d387c1579639e054807b5
-EBUILD uwsgi-2.0.18.ebuild 11515 BLAKE2B 28735e0d5ee86d4d66b5b7a286d8b74b6435101f7359edb90fee281ab60c718b49c03ea86aab146eea7e871733f89c13dd702785dfdda1b9a0f8ac0fd11d5733 SHA512 9d84926c814bcdb0c9fe9a534d0bd0320fade83acccc841003629a5d399bd225d96492d0faff9bf940f305dfc47afe8d7467ecb4014cf71940295dcb7cb183f9
-EBUILD uwsgi-2.0.19.1.ebuild 11519 BLAKE2B 8ede94e6f02082867e66090d4baa91c2dc7a189e43c619bcd044116665f4e6f29a5e8214cc2cbd293c9cde32852a5f115300a11a53fc54455e8c9f1d3683b0f1 SHA512 13795b6201f05d29720d3f846e35b040e76cb3f79ef90f49e540e0e99250bf3430cdc700ee58e666990c53df21a9b0237295d6f27b6807c7d26d3e052ce94778
+EBUILD uwsgi-2.0.19.1.ebuild 11517 BLAKE2B 86d9d2d1e2ff473dd91822b68636a5585f64875befc9f4bd5d37624578628cd6ce4c9e8a50979baa1f4e951eb5beb83fc5f7c257cc7d8becb7e4fd076a703991 SHA512 cdfb81ab640a10949d822ad44b4850ddce183f83fc77f1a243c6136a001bb7f60416b27c51e44d045e5169a896e289a5c84233489671ada1d5ecfd804b31c093
 MISC metadata.xml 1411 BLAKE2B 89114f75b2150f4340e30cd106115f0e9aa1a00389558f6f75aa86c0bf5a11d5df5ecb794c12f7bb39791d8edef40415cbca4403f8f2b65bd642ce52e95357a3 SHA512 33d3767a25dfca633e5149a20900d56998c40204a4c55e3814248574d0c8525883a842222ed5f8ac739a06cd09d806c189ff6f742d1277bcd3f8e8afdea84445
diff --git a/www-servers/uwsgi/uwsgi-2.0.18.ebuild b/www-servers/uwsgi/uwsgi-2.0.18.ebuild
deleted file mode 100644
index fe97b6c84932..000000000000
--- a/www-servers/uwsgi/uwsgi-2.0.18.ebuild
+++ /dev/null
@@ -1,377 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_{6,7} )
-PYTHON_REQ_USE="threads(+)"
-
-RUBY_OPTIONAL="yes"
-USE_RUBY="ruby23 ruby24 ruby25 ruby26"
-
-PHP_EXT_INI="no"
-PHP_EXT_NAME="dummy"
-PHP_EXT_OPTIONAL_USE="php"
-USE_PHP="php7-2 php7-3 php7-4" # deps must be registered separately below
-
-MY_P="${P/_/-}"
-
-inherit eapi7-ver eutils flag-o-matic multilib pax-utils php-ext-source-r3 python-r1 ruby-ng
-
-DESCRIPTION="uWSGI server for Python web applications"
-HOMEPAGE="http://projects.unbit.it/uwsgi/"
-SRC_URI="https://github.com/unbit/uwsgi/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 arm x86 ~amd64-linux"
-
-UWSGI_PLUGINS_STD=( ping cache carbon nagios rpc rrdtool
-	http ugreen signal syslog rsyslog
-	router_{uwsgi,redirect,basicauth,rewrite,http,cache,static,memcached,redis,hash,expires,metrics}
-	{core,fast,raw,ssl}router
-	redislog mongodblog log{file,socket}
-	spooler cheaper_busyness symcall
-	transformation_{chunked,gzip,offload,tofile}
-	zergpool )
-UWSGI_PLUGINS_OPT=( alarm_{curl,xmpp} clock_{monotonic,realtime} curl_cron
-	dumbloop echo emperor_{amqp,pg,zeromq} forkptyrouter
-	geoip graylog2 legion_cache_fetch ldap log{crypto,pipe} notfound pam
-	rados router_{access,radius,spnego,xmldir}
-	sqlite ssi stats_pusher_statsd
-	systemd_logger transformation_toupper tuntap webdav xattr xslt zabbix )
-
-LANG_SUPPORT_SIMPLE=( cgi mono perl ) # plugins which can be built in the main build process
-LANG_SUPPORT_EXTENDED=( go lua php python python-asyncio python-gevent ruby )
-
-# plugins to be ignored (for now):
-# cheaper_backlog2: example plugin
-# coroae: TODO
-# cplusplus: partially example code, needs explicit class
-# dummy: no idea
-# example: example plugin
-# exception_log: example plugin
-# *java*: TODO
-# v8: TODO
-# matheval: TODO
-IUSE="apache2 +caps debug +embedded expat jemalloc json libressl +pcre +routing selinux +ssl +xml yajl yaml zeromq"
-
-for plugin in ${UWSGI_PLUGINS_STD[@]}; do IUSE="${IUSE} +uwsgi_plugins_${plugin}"; done
-for plugin in ${UWSGI_PLUGINS_OPT[@]}; do IUSE="${IUSE} uwsgi_plugins_${plugin}"; done
-IUSE="${IUSE} ${LANG_SUPPORT_SIMPLE[@]} ${LANG_SUPPORT_EXTENDED[@]}"
-
-REQUIRED_USE="|| ( ${LANG_SUPPORT_SIMPLE[@]} ${LANG_SUPPORT_EXTENDED[@]} )
-	uwsgi_plugins_logcrypto? ( ssl )
-	uwsgi_plugins_sslrouter? ( ssl )
-	routing? ( pcre )
-	uwsgi_plugins_emperor_zeromq? ( zeromq )
-	uwsgi_plugins_forkptyrouter? ( uwsgi_plugins_corerouter )
-	uwsgi_plugins_router_xmldir? ( xml !expat )
-	python? ( ${PYTHON_REQUIRED_USE} )
-	python-asyncio? ( || ( $(python_gen_useflags -3) ) )
-	python-gevent? ( python )
-	expat? ( xml )"
-
-# util-linux is required for libuuid when requesting zeromq support
-# Order:
-# 1. Unconditional
-# 2. General features
-# 3. Plugins
-# 4. Language/app support
-CDEPEND="
-	sys-libs/zlib
-	caps? ( sys-libs/libcap )
-	json? (
-		!yajl? ( dev-libs/jansson )
-		yajl? ( dev-libs/yajl )
-	)
-	pcre? ( dev-libs/libpcre:3 )
-	ssl? (
-		!libressl? ( dev-libs/openssl:0= )
-		libressl? ( dev-libs/libressl )
-	)
-	xml? (
-		!expat? ( dev-libs/libxml2 )
-		expat? ( dev-libs/expat )
-	)
-	yaml? ( dev-libs/libyaml )
-	zeromq? ( net-libs/zeromq sys-apps/util-linux )
-	uwsgi_plugins_alarm_curl? ( net-misc/curl )
-	uwsgi_plugins_alarm_xmpp? ( net-libs/gloox )
-	uwsgi_plugins_curl_cron? ( net-misc/curl )
-	uwsgi_plugins_emperor_pg? ( dev-db/postgresql:= )
-	uwsgi_plugins_geoip? ( dev-libs/geoip )
-	uwsgi_plugins_ldap? ( net-nds/openldap )
-	uwsgi_plugins_pam? ( sys-libs/pam )
-	uwsgi_plugins_sqlite? ( dev-db/sqlite:3 )
-	uwsgi_plugins_rados? ( sys-cluster/ceph )
-	uwsgi_plugins_router_access? ( sys-apps/tcp-wrappers )
-	uwsgi_plugins_router_spnego? ( virtual/krb5 )
-	uwsgi_plugins_systemd_logger? ( sys-apps/systemd )
-	uwsgi_plugins_webdav? ( dev-libs/libxml2 )
-	uwsgi_plugins_xslt? ( dev-libs/libxslt )
-	go? ( sys-devel/gcc:=[go] )
-	lua? ( dev-lang/lua:= )
-	mono? ( dev-lang/mono:= )
-	perl? ( dev-lang/perl:= )
-	php? (
-		net-libs/libnsl
-		php_targets_php7-2? ( dev-lang/php:7.2[embed] )
-		php_targets_php7-3? ( dev-lang/php:7.3[embed] )
-		php_targets_php7-4? ( dev-lang/php:7.4[embed] )
-	)
-	python? ( ${PYTHON_DEPS} )
-	python-asyncio? ( virtual/python-greenlet[${PYTHON_USEDEP}] )
-	python-gevent? ( >=dev-python/gevent-1.3.5[${PYTHON_USEDEP}] )
-	ruby? ( $(ruby_implementations_depend) )"
-DEPEND="${CDEPEND}
-	virtual/pkgconfig"
-RDEPEND="${CDEPEND}
-	selinux? ( sec-policy/selinux-uwsgi )
-	uwsgi_plugins_rrdtool? ( net-analyzer/rrdtool )"
-
-S="${WORKDIR}/${MY_P}"
-
-src_unpack() {
-	echo ${PYTHON_USEDEP}
-	default
-}
-
-pkg_setup() {
-	python_setup
-	use ruby && ruby-ng_pkg_setup
-}
-
-src_prepare() {
-	default
-
-	sed -i \
-		-e "s|'-O2', ||" \
-		-e "s|'-Werror', ||" \
-		-e "s|uc.get('plugin_dir')|uc.get('plugin_build_dir')|" \
-		uwsgiconfig.py || die "sed failed"
-
-	sed -i \
-		-e "s|/lib|/$(get_libdir)|" \
-		plugins/php/uwsgiplugin.py || die "sed failed"
-}
-
-src_configure() {
-	local embedded_plugins=()
-	local plugins=()
-	local malloc_impl="libc"
-	local json="false"
-	local xml="false"
-
-	for p in ${UWSGI_PLUGINS_STD[@]} ${UWSGI_PLUGINS_OPT[@]} ; do
-		use uwsgi_plugins_${p} && embedded_plugins+=("${p}")
-	done
-	for p in ${LANG_SUPPORT_SIMPLE[@]} ; do
-		use ${p} && plugins+=("${p}")
-	done
-
-	# do not embed any plugins
-	if ! use embedded; then
-		plugins=( ${plugins[@]} ${embedded_plugins[@]} )
-		embedded_plugins=()
-	fi
-
-	# flatten the arrays
-	plugins=${plugins[@]}
-	embedded_plugins=${embedded_plugins[@]}
-
-	# rename some of the use flags, language plugins are always real plugins
-	plugins="${plugins/perl/psgi}"
-	plugins="${plugins/sqlite/sqlite3}"
-	embedded_plugins="${embedded_plugins/sqlite/sqlite3}"
-
-	# override defaults as requested by the user
-	if use xml; then
-		use expat && xml="expat" || xml="libxml2"
-	fi
-	if use json; then
-		use yajl && json="yajl" || json="jansson"
-	fi
-	use jemalloc && malloc_impl="jemalloc"
-
-	# prepare the buildconf for gentoo
-	cp "${FILESDIR}"/gentoo.buildconf buildconf/gentoo.ini || die
-	sed -i \
-		-e "s|VAR_XML|${xml}|" \
-		-e "s|VAR_YAML|$(usex yaml libyaml true)|" \
-		-e "s|VAR_JSON|${json}|" \
-		-e "s|VAR_SSL|$(usex ssl true false)|" \
-		-e "s|VAR_PCRE|$(usex pcre true false)|" \
-		-e "s|VAR_ZMQ|$(usex zeromq true false)|" \
-		-e "s|VAR_ROUTING|$(usex routing true false)|" \
-		-e "s|VAR_DEBUG|$(usex debug true false)|" \
-		-e "s|VAR_MALLOC|${malloc_impl}|" \
-		-e "s|VAR_PLUGINS|${plugins// /, }|" \
-		-e "s|VAR_PLUGIN_DIR|${EPREFIX}/usr/$(get_libdir)/uwsgi|" \
-		-e "s|VAR_BUILD_DIR|${T}/plugins|" \
-		-e "s|VAR_EMBEDDED|${embedded_plugins// /, }|" \
-		buildconf/gentoo.ini || die "sed failed"
-
-	if ! use caps; then
-		sed -i -e 's|sys/capability.h|DISABLED|' uwsgiconfig.py || die "sed failed"
-	fi
-
-	if ! use zeromq; then
-		sed -i -e 's|uuid/uuid.h|DISABLED|' uwsgiconfig.py || die "sed failed"
-	fi
-
-	if use uwsgi_plugins_emperor_pg ; then
-		PGPV="$(best_version dev-db/postgresql)"
-		PGSLOT="$(ver_cut 1-2 ${PGPV##dev-db/postgresql-})"
-		sed -i \
-			-e "s|pg_config|pg_config${PGSLOT/.}|" \
-			plugins/emperor_pg/uwsgiplugin.py || die "sed failed"
-	fi
-}
-
-each_ruby_compile() {
-	cd "${WORKDIR}/${MY_P}" || die "sed failed"
-
-	UWSGICONFIG_RUBYPATH="${RUBY}" python uwsgiconfig.py --plugin plugins/rack gentoo rack_${RUBY##*/} || die "building plugin for ${RUBY} failed"
-	UWSGICONFIG_RUBYPATH="${RUBY}" python uwsgiconfig.py --plugin plugins/fiber gentoo fiber_${RUBY##*/}|| die "building fiber plugin for ${RUBY} failed"
-	UWSGICONFIG_RUBYPATH="${RUBY}" python uwsgiconfig.py --plugin plugins/rbthreads gentoo rbthreads_${RUBY##*/}|| die "building rbthreads plugin for ${RUBY} failed"
-}
-
-python_compile_plugins() {
-	local EPYV
-	local PYV
-	EPYV=${EPYTHON/.}
-	PYV=${EPYV/python}
-
-	${PYTHON} uwsgiconfig.py --plugin plugins/python gentoo ${EPYV} || die "building plugin for ${EPYTHON} failed"
-
-	if use python-asyncio ; then
-		if [[ "${PYV}" != "27" ]] ; then
-			${PYTHON} uwsgiconfig.py --plugin plugins/asyncio gentoo asyncio${PYV} || die "building plugin for asyncio-support in ${EPYTHON} failed"
-		fi
-	fi
-
-	if use python-gevent ; then
-		${PYTHON} uwsgiconfig.py --plugin plugins/gevent gentoo gevent${PYV} || die "building plugin for gevent-support in ${EPYTHON} failed"
-	fi
-
-	if use python-gevent || use python-asyncio; then
-			${PYTHON} uwsgiconfig.py --plugin plugins/greenlet gentoo greenlet${PYV} || die "building plugin for greenlet-support in ${EPYTHON} failed"
-	fi
-}
-
-python_install_symlinks() {
-	dosym uwsgi /usr/bin/uwsgi_${EPYTHON/.}
-}
-
-src_compile() {
-	mkdir -p "${T}/plugins" || die
-
-	CPUCOUNT=1 python uwsgiconfig.py --build gentoo || die "building uwsgi failed"
-
-	if use go ; then
-		python uwsgiconfig.py --plugin plugins/gccgo gentoo || die "building plugin for go failed"
-	fi
-
-	if use lua ; then
-		# setting the name for the pkg-config file to lua, since we don't have
-		# slotted lua
-		UWSGICONFIG_LUAPC="lua" python uwsgiconfig.py --plugin plugins/lua gentoo || die "building plugin for lua failed"
-	fi
-
-	if use php ; then
-		for s in $(php_get_slots); do
-			UWSGICONFIG_PHPDIR="/usr/$(get_libdir)/${s}" python uwsgiconfig.py --plugin plugins/php gentoo ${s/.} || die "building plugin for ${s} failed"
-		done
-	fi
-
-	if use python ; then
-		python_foreach_impl python_compile_plugins
-	fi
-
-	if use ruby ; then
-		ruby-ng_src_compile
-	fi
-}
-
-src_install() {
-	dobin uwsgi
-	pax-mark m "${D}"/usr/bin/uwsgi
-
-	insinto /usr/$(get_libdir)/uwsgi
-	doins "${T}/plugins"/*.so
-
-	use cgi && dosym uwsgi /usr/bin/uwsgi_cgi
-	use go && dosym uwsgi /usr/bin/uwsgi_go
-	use lua && dosym uwsgi /usr/bin/uwsgi_lua
-	use mono && dosym uwsgi /usr/bin/uwsgi_mono
-	use perl && dosym uwsgi /usr/bin/uwsgi_psgi
-
-	if use php ; then
-		for s in $(php_get_slots); do
-			dosym uwsgi /usr/bin/uwsgi_${s/.}
-		done
-	fi
-
-	if use python ; then
-		python_foreach_impl python_install_symlinks
-		python_foreach_impl python_domodule uwsgidecorators.py
-	fi
-
-	newinitd "${FILESDIR}"/uwsgi.initd-r7 uwsgi
-	newconfd "${FILESDIR}"/uwsgi.confd-r4 uwsgi
-	keepdir /etc/"${PN}".d
-	use uwsgi_plugins_spooler && keepdir /var/spool/"${PN}"
-}
-
-pkg_postinst() {
-	if use apache2 ; then
-		ewarn "As reported on bug #650776 [1], Apache module mod_proxy_uwsgi"
-		ewarn "is being transferred to upstream Apache since 2.4.30, see [2]."
-		ewarn "We therefore do not build them any more."
-		ewarn "    [1] https://bugs.gentoo.org/650776"
-		ewarn "    [2] https://github.com/unbit/uwsgi/issues/1636"
-	fi
-
-	elog "Append the following options to the uwsgi call to load the respective language plugin:"
-	use cgi    && elog "  '--plugins cgi' for cgi"
-	use lua    && elog "  '--plugins lua' for lua"
-	use mono   && elog "  '--plugins mono' for mono"
-	use perl   && elog "  '--plugins psgi' for perl"
-
-	if use php ; then
-		for s in $(php_get_slots); do
-			elog "  '--plugins ${s/.}' for ${s}"
-		done
-	fi
-
-	python_pkg_postinst() {
-		local EPYV
-		local PYV
-		EPYV=${EPYTHON/.}
-		PYV=${EPYV/python}
-
-		elog " "
-		elog "  '--plugins ${EPYV}' for ${EPYTHON}"
-		if use python-asyncio ; then
-			if [[ ${EPYV} == python34 ]] ; then
-				elog "  '--plugins ${EPYV},asyncio${PYV}' for asyncio support in ${EPYTHON}"
-			else
-				elog "  (asyncio is only supported in python3.4)"
-			fi
-		fi
-		if use python-gevent ; then
-			elog "  '--plugins ${EPYV},gevent${PYV}' for gevent support in ${EPYTHON}"
-		fi
-	}
-
-	use python && python_foreach_impl python_pkg_postinst
-
-	if use ruby ; then
-		for ruby in $(ruby_get_use_implementations) ; do
-			elog "  '--plugins rack_${ruby/.}' for ${ruby}"
-			elog "  '--plugins fiber_${ruby/.}' for ${ruby} fibers"
-			elog "  '--plugins rbthreads_${ruby/.}' for ${ruby} rbthreads"
-		done
-	fi
-}
diff --git a/www-servers/uwsgi/uwsgi-2.0.19.1.ebuild b/www-servers/uwsgi/uwsgi-2.0.19.1.ebuild
index 10a502157c1d..293b7cddf51f 100644
--- a/www-servers/uwsgi/uwsgi-2.0.19.1.ebuild
+++ b/www-servers/uwsgi/uwsgi-2.0.19.1.ebuild
@@ -24,7 +24,7 @@ SRC_URI="https://github.com/unbit/uwsgi/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm x86 ~amd64-linux"
+KEYWORDS="amd64 arm x86 ~amd64-linux"
 
 UWSGI_PLUGINS_STD=( ping cache carbon nagios rpc rrdtool
 	http ugreen signal syslog rsyslog
diff --git a/www-servers/varnish/Manifest b/www-servers/varnish/Manifest
index e480b1ca326f..2b84b01163eb 100644
--- a/www-servers/varnish/Manifest
+++ b/www-servers/varnish/Manifest
@@ -9,7 +9,9 @@ AUX varnishncsa.initd 716 BLAKE2B 33fd6b044ab50aef629fa4501eb4a78bd3d690db52b86a
 DIST varnish-6.0.6.tgz 3136931 BLAKE2B 2ce379622b20a939a977a426cb842ba62e4fd5fd3ba785ec21888956b6a8c16e95bd834962a7ba05dc426dfc36067cabb4f8ade2bee7fe2a094a1f2c4c4c9e06 SHA512 c0881ab051bca928c12f35494c5e2a8109390abdf3acf368da404c5537d1ee0f1153b6e329058a7e1168eacf5af9b86ccf9a6e58cd89dd7d51b8b71d25aa7ba0
 DIST varnish-6.3.2.tgz 3323908 BLAKE2B 5bde1b2ececeb8aed884db22ed75bfd74f82d68416e71400a4c0d27483fcceb029fe8e724e30754899c872d7028da5cb759545f0743a11d0e90b0fd604af0ad7 SHA512 0f476c642df834737d446b3bc6ac8afa5981d1de5810dc6e8556eb22b2ca26d64eb531f4ad3332eb86e231a7443fe35393177ec6dbee97a837f405d1aa9d03cd
 DIST varnish-6.4.0.tgz 3404617 BLAKE2B 0ef0f7303f5c926bb1b80ec14cdd9755d65c1938fa8645240800ac2997f954022133625a74dd9c30ce21850674c3b00777fcc896309f528e6ba90d347333d7f7 SHA512 cda8f9e1d301a2b79db14685a23e25e36225f37065a1b7f37c5ae12fbb0483be51be9ffcc8ba72c1f65f5a022d1e408825694daed6780e206b9ba91feb2a07a1
+DIST varnish-6.5.0.tgz 3476969 BLAKE2B bafa8704f28dfa96f681805cc053dd6415e143016b1bbff7f8962f2c3ac5cd07be6dc2f4129a423ddfcbf9f9f8afc57388930685d0ed400f3c06ba03bd667d87 SHA512 43f8cd6429a903a353ac4448b6e9aff445b0d52178141a148d3b29b987c0974841820af0da4917731775b46899c12b0327d64d12e3ddbb8fd438e2802ac66a1c
 EBUILD varnish-6.0.6.ebuild 2230 BLAKE2B a3138959a81d665d620573d00a99c3b2f3c2ae1ef1f3859c6252135800c1ae57b6e581659afa2f299ded295fae57e5d4c8670a6083013ee1cbd47174099377b4 SHA512 fa82538ed6c1522e30c8256c7e60001c5a2143ed603ef89b4462fbbe74ed8cd9407b6d6d0ac0c2c1281cdf9021a0a754bf2bdad31a4e85e0a07f56cc3a91973f
 EBUILD varnish-6.3.2.ebuild 2147 BLAKE2B a9d41a75096d9567bec7eb2ecb232e06e4d9346816ede8a6327482bc1adc22db5b810468d2b45676ea65b8b098d49c0a784796fb3c6d1b40475efbf31ada6863 SHA512 9d5543eb22aed1a154355ef127f5cc553ccf54e77bd535cef9e52dfe843cc02de3feb6dce2766568fda5256d2c65aa025570c241db1a28e508caeba412b0a854
 EBUILD varnish-6.4.0.ebuild 2145 BLAKE2B 2f0aec0428b1fe2ebf852edb16c1b10ec0f9c7c7839188a54dfe1412e43ae65f0425d198f14e13fdd4d5e2a13a66da1c7e4fe2a4ebdfc87e560ef4eb27d9975d SHA512 90df906ce9a8d51a432d3077a86f14f103b44853eda277a27762a9c6e07c61f5f01ae13a0dff82b82181022aa53bf2040f48e292fbc4dc5d2cf4606bc8714ace
+EBUILD varnish-6.5.0.ebuild 2149 BLAKE2B f5679b3234678d5ef71f2133a01887f4e737018442feae869b2efc92c31c00352075ec3772dd5c39f5287a72f923e42b89436e05ef11ba125fc3ab36334f7f0d SHA512 18e5865e99e757782b0e3c387356739e230e53ec164906eca3e2d31eaeefa3ae0beac405630edff1b3b170991552c1bead11d425a488805373c5a4d5d444007c
 MISC metadata.xml 1154 BLAKE2B eef29e16772e06a4b08bb7c2de3c02570a698eafe1eb9f3d1d6708cbf4ea3ef2644642b3040ebea108477e331aff164e4e540dc7f5620f15643b385d1523fd7f SHA512 a429d2e7604fb1e1f1d3ef48c13ab2151f7e2adab6a81021f473d7b56bdc9fc8d7700370125908b0278c2b0621afb3cccb73c4f3284b288cbceac05294e70f99
diff --git a/www-servers/varnish/varnish-6.5.0.ebuild b/www-servers/varnish/varnish-6.5.0.ebuild
new file mode 100644
index 000000000000..cd7753a43dbf
--- /dev/null
+++ b/www-servers/varnish/varnish-6.5.0.ebuild
@@ -0,0 +1,98 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+PYTHON_COMPAT=( python{3_6,3_7} )
+
+inherit autotools systemd python-r1
+
+DESCRIPTION="Varnish is a state-of-the-art, high-performance HTTP accelerator"
+HOMEPAGE="https://varnish-cache.org/"
+SRC_URI="http://varnish-cache.org/_downloads/${P}.tgz"
+
+LICENSE="BSD-2 GPL-2"
+SLOT="0/2"
+KEYWORDS="~amd64 ~mips ~ppc ~ppc64 ~x86"
+IUSE="jemalloc jit static-libs"
+
+CDEPEND="
+	sys-libs/readline:0=
+	dev-libs/libpcre[jit?]
+	jemalloc? ( dev-libs/jemalloc )
+	sys-libs/ncurses:0="
+
+#varnish compiles stuff at run time
+RDEPEND="
+	${PYTHON_DEPS}
+	${CDEPEND}
+	acct-user/varnish
+	acct-group/varnish
+	sys-devel/gcc"
+
+DEPEND="
+	${CDEPEND}
+	dev-python/docutils
+	dev-python/sphinx
+	virtual/pkgconfig"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RESTRICT="test" #315725
+
+src_prepare() {
+	# Remove -Werror bug #528354
+	sed -i -e 's/-Werror\([^=]\)/\1/g' configure.ac
+
+	# Upstream doesn't put varnish.m4 in the m4/ directory
+	# We link because the Makefiles look for the file in
+	# the original location
+	ln -sf ../varnish.m4 m4/varnish.m4
+
+	eapply_user
+
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		$(use_enable static-libs static) \
+		$(use_enable jit pcre-jit ) \
+		$(use_with jemalloc)
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+
+	python_replicate_script "${D}/usr/share/varnish/vmodtool.py"
+
+	newinitd "${FILESDIR}"/varnishlog.initd varnishlog
+	newconfd "${FILESDIR}"/varnishlog.confd varnishlog
+
+	newinitd "${FILESDIR}"/varnishncsa.initd varnishncsa
+	newconfd "${FILESDIR}"/varnishncsa.confd varnishncsa
+
+	newinitd "${FILESDIR}"/varnishd.initd-r4 varnishd
+	newconfd "${FILESDIR}"/varnishd.confd-r4 varnishd
+
+	insinto /etc/logrotate.d/
+	newins "${FILESDIR}/varnishd.logrotate-r2" varnishd
+
+	diropts -m750
+
+	keepdir /var/lib/varnish
+	keepdir /var/log/varnish
+
+	systemd_dounit "${FILESDIR}/${PN}d.service"
+
+	insinto /etc/varnish/
+	doins lib/libvmod_std/vmod_std.vcc
+	doins etc/example.vcl
+
+	dodoc README.rst
+	dodoc doc/changes.rst
+
+	fowners root:varnish /etc/varnish/
+	fowners varnish:varnish /var/lib/varnish/
+	fperms 0750 /var/lib/varnish/ /etc/varnish/
+}