gentoo resync : 28.04.2021

74 files changed, 3705 insertions, 9239 deletions

diff --git a/www-servers/Manifest.gz b/www-servers/Manifest.gz
index 395af61ab4d5..e7b198e67d29 100644
--- a/www-servers/Manifest.gz
+++ b/www-servers/Manifest.gz
diff --git a/www-servers/apache/Manifest b/www-servers/apache/Manifest
index cd71efccdbb5..0ab5bf892063 100644
--- a/www-servers/apache/Manifest
+++ b/www-servers/apache/Manifest
@@ -9,4 +9,4 @@ DIST httpd-2.4.46.tar.bz2 7187805 BLAKE2B 2cd8a40be0b7b60ae5b06a286aa6dd801b8615
 EBUILD apache-2.4.46-r5.ebuild 8034 BLAKE2B 2122bc1b9ca03744b401d91c491c79970f1617268f84e24eb7e0454aa002c3b8242f79923e237322bf8dba61d468d2fd3822752a57523b0d2d668b4247118f75 SHA512 461598cb3338aff2af550dc0310821a8aa0cc0c30faaa5945d4847bb64c1b129249e7274b2696f756ad64b9cf82699e5810a82fad7ef44ece4cffcce541425eb
 EBUILD apache-2.4.46-r6.ebuild 8034 BLAKE2B e78751a46d26cfc1d71ea4959bcddafa74697285cdc5d79df8c0caf07c3c1f3eda0f5f8eb1942a645855ca42a497830d35f9e64502c6759340829fbf39e863ed SHA512 f755b461be53638aa2c07a04b4a7d2cf766ccea6c28e75756f6aa5a98f2ef601a8886a222d2edfca865ae376001c1b390e4d88adf115c883316584bef987e258
 EBUILD apache-2.4.46.ebuild 7781 BLAKE2B d0e70858edc5aaa5ced5732d0542d8759a2b453d904ad38ebee006e70b07a3f00f179d2038c29ba44c87f535a32ed43028122153cf9fcbb3195ae69a85137bf7 SHA512 a091f71aecb5875eaa55d0a01aa86fbebfd70da549cfac97918e4147ec428135e4fd37be6b20d161d376a88626322e093b7c0ce73fca3a1e8f3076bf6ba15053
-MISC metadata.xml 1012 BLAKE2B ca2238f428144240f64b5c9e48087a07a3f77278958efb240edeb864050ca01d1e042a37fb304fde76925fb651d7d97755d354a45aff34ac0589b7405b848d54 SHA512 a4e903bb75740c54256fa96359f6a97cd75008ffeeadfd6353648f5bfa2295fb108ec9de398956c79633bc465475f5db365d20d71caa34fc14a07c4715cc8683
+MISC metadata.xml 900 BLAKE2B bc278df7a16090cb248b55179c0228b3c9ab846d918799e7b74b21d55f6410556909016ba6960cc77909fd4f8f85b8ebf25ba261553b8c5d42803d750a462cac SHA512 f98af69b59e4403ff194387781e92fe825df71a5d2f8d1c8a960b222eb548e1723335e13479b6e225e62b92b9af09cbd418fa95ddb676a5f039445945d5ae686
diff --git a/www-servers/apache/metadata.xml b/www-servers/apache/metadata.xml
index 9327ed014ad3..0b3de370059b 100644
--- a/www-servers/apache/metadata.xml
+++ b/www-servers/apache/metadata.xml
@@ -1,10 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>polynomial-c@gentoo.org</email>
-		<name>Lars Wendler</name>
-	</maintainer>
 	<maintainer type="project">
 		<email>apache-bugs@gentoo.org</email>
 		<name>Apache project</name>
diff --git a/www-servers/caddy/Manifest b/www-servers/caddy/Manifest
index 28dbb6b4325b..33c845660e24 100644
--- a/www-servers/caddy/Manifest
+++ b/www-servers/caddy/Manifest
@@ -1,6 +1,11 @@
+AUX caddy.service 370 BLAKE2B 004bc9b9cec8217aa2cc173c65ef69bb804a7d0ab1d61375c23fee92f755d03726a708591cd8d7b7a5741ab756f1383860c3a5bf5374c3db445a0341df62a74f SHA512 2911f3b9b57fb02398c08d661693d3268968f4a8176e18fee921c1d87ec515121f412901966811ef477ede73130adfe5842b8ceea1b691830b31f22eb41e14d3
+AUX caddy_config.json 603 BLAKE2B e4d4cacdd947f0266da8017c1872897aa53a5bd74f4e26de6a6432606b532760e7db85f442f2638675b015d37336adbea0acec9474dbbbb511ab05705c50a21d SHA512 0801dc5e3fce02ba3562eb5a8a3adeac7b8f0534847a70b5c3d531d1a8c56e923a78598fe357860a638e7112fc32e24e95c5997557910b87f7d131264079214d
+AUX confd 86 BLAKE2B f75f8a9440b90a66fc4f56d5ed2f97ff428bc061a555c48b8c51c822050de6af6b7c81afc92f01c38ab90f16c863fed3ed49a312d04582952f4292ed7bc9dc62 SHA512 24e6eb385c739c470ea7a896c80340de5d3857f829a665edf17a82e44ea5580fd28b1678a68c72a528174e63be2a08fa1dc376163394d6db822f67e3e169c9e8
+AUX initd 736 BLAKE2B 67baedfce797cb3aa51a953b9762f44a5fc0605152c124ed723607a93c01ec83fad1aa22d2b4faa9e4d38d8f74fcd1bf4da0fa34f2411259dd0f333649e3c3ce SHA512 e79a77050ac127f7416137eee8247b8bf455fb80616b4efd53b331ea4dba08f984c150b546ec075c8bd99bce8e1d1dea45c1646f8d20eaaf8e92314a1d8267c1
+AUX logrotated 39 BLAKE2B 2801a25d70fe62aa7487da24561fe9d0efd96c0c76764edcbb2332dfb7f9e9ae7a2dee2abf0f5877a378618ac6a56ca8494800465cdfae839af84606db0f920e SHA512 2aa59645a23d8a7a8566532830883393b4b5ead245fe2fd2d752603bbdbe5beddcce522a22add725899995b87be44f801d0bfa721e5da1ac18273f1119e73d26
 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 caddy-2.2.3.tar.gz 390149 BLAKE2B e8329947f8a08e0ebe59d6eacad20063e3cd923a98fe5380d7835f67e40fa32d1a981bedba845c0a1743479c8ea213153c7f8ff940c69125333ff66f4a02d864 SHA512 7fdb15d470cb91c29ac38c168f746c40e00c6a9e66474a92b5e0d3ca4fd3b5b86cbf452745d2735cf6be5a721b5ea905144648c059cfaa78a928d08f624792e6
+DIST caddy-2.3.0.tar.gz 412978 BLAKE2B 332c5039041ade93bf21d1e767bba4e24366f45654e039d4c21e58f7c6b225712c5005868ed5b385f6299413373653077b8e1dc921603065dcd055fe09c0ae94 SHA512 5416129f7152a0e2617cef0e32be27188d9248fff316fff9dc1ecaa13ec1287e11deb22eb84fe3dc88c234a8e8e8ff8e40b3ba23bcc60a7418c60b7c4fa24a1a
 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
@@ -71,6 +76,7 @@ DIST github.com%2F!data!dog%2Fzstd%2F@v%2Fv1.4.1.mod 31 BLAKE2B 3f699ae120e91b47
 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!knetic%2Fgovaluate%2F@v%2Fv3.0.1-0.20171022003610-9aa49832a739+incompatible.mod 35 BLAKE2B 68297267e33add40ca12e681b6b4461ef8a3dd23eb205a365b13b158d0e055e3650fa9539eae43bbbf4ddb559c872b95ed541a3f4330a0ad3395089c4cb9c9f8 SHA512 73bd53e14c96c10e3288cd859b5d7758e6d2897369060b1581b6a4290e233877e408c9dc6350b763c2ab678a2e8f3e8f7f3bf563928b43ad37a48187ccc0ee7b
 DIST github.com%2F!masterminds%2Fglide%2F@v%2Fv0.13.2.mod 36 BLAKE2B 90eea1d6bfb78f872b781706703178c3c010c549c94e28eac0b3ca2ca2ee4bf126bb5320fa8bc0c22aa2aeebb2361572081014253d12a0a8dcfcf28ee607a554 SHA512 37cffb84d5a0e51f4306f042f62a549cbac31f714b497a590149c78d1a16d9b9fb7c3ea9c4c89856dc38b1548fe18afbb537628f0c511faab6a4eb631bcbf43f
 DIST github.com%2F!masterminds%2Fgoutils%2F@v%2Fv1.1.0.mod 38 BLAKE2B 6bb3112d9b8ba6f9cf4d0c4ee376da93bf21b139563a211c51ee44a302caf9670181cd27f7e21c6fd05bf87c9273daa726c942749ffb18b623d17c7170aba6b1 SHA512 a3c38d1db1472c71e1c47b936d47ac2ecfb49519c2e78dd453d234f1a6153bf007eb96fabe0be7dcbd868160a3869e854ec6776356b9011fe7ef51a634b30aad
 DIST github.com%2F!masterminds%2Fgoutils%2F@v%2Fv1.1.0.zip 21259 BLAKE2B 6ebd8152517cfcd5e883bc56dbb3d347fce7ac09589e8ad5a96af8d39c5e18b284e616cb1a6f6641084a34c07e59d4ded65b600dcc9041c9af59d26afd368993 SHA512 5800ddecf3717ea31dd991068c785053b9c6cb5ffdbc97b681bcce4219634362acc7811eec766117f0087536abaf0eaa22b8d66a44103a1644e5907e3174dfae
@@ -100,6 +106,8 @@ DIST github.com%2F!shopify%2Fsarama%2F@v%2Fv1.19.0.mod 33 BLAKE2B 7013f44d03c22c
 DIST github.com%2F!shopify%2Ftoxiproxy%2F@v%2Fv2.1.4+incompatible.mod 36 BLAKE2B af7b84d9f1cd163555b32bcf960b28b64a5689a1c9694f430af310f5041cd967fcf0d6c1a6c4020478544d347e4ba5b2fd16a6ef54258d33314ee0ad9239752c SHA512 917ada7ac198a013d2b090dfc59a45bd2619dcb7227df1521ca38a0d822fab12ea8c158c526257fef4ef506af29d9fa678e8dc2a73fc13c8dfeb57b398801744
 DIST github.com%2F!stack!exchange%2Fwmi%2F@v%2Fv0.0.0-20180116203802-5d049714c4a6.mod 36 BLAKE2B e15c1ef74374320cc49b3509a1fa8d7f63c8566920ba56f8b6f293e3d331f5587d45b35284af52b40f329e116f570543a7df50ab1888c4238b28c2ea583d2fda SHA512 83f296ee872570bab84dc3e3f7984f155f5a9a4f95ca7b23a5f39dd47b54eb87ceb2eaa4db00a3966def5b41fb0250de18bcde32610c350206b6d0e744353fd7
 DIST github.com%2F!thomas!rooney%2Fgexpect%2F@v%2Fv0.0.0-20161231170123-5482f0350944.mod 39 BLAKE2B b49daff3c8e735878c317b277419f4397f3939e23d325fa4d04227d3cbc35c1804ec51ad606cfc35ae7476a53c5d225c0ee7af332a802651106bfdac51469f64 SHA512 62e6c0d8e5e81152343265c96c3eb5cb85585e809d89c834c3b591fbc7f18b97165c4c96172e8b66a7dd699dbd54573453142f0d37fe250033986390e2ed3a75
+DIST github.com%2F!vivid!cortex%2Fgohistogram%2F@v%2Fv1.0.0.mod 42 BLAKE2B 8afd8d85fc5969d9c4b82c26f852d82fcdb08677ccf0d54d8d65b89af3ed5897125aa0d1f5fa6adca14e8b47850da8d5a70b5b3fb2f42a83ee84576137a2fc6a SHA512 e25b80b5e74a374b055238fc017a8c64ea89180ca07417abe673ad5eb0b53c9489b9d93f638da5b5cec250fe9a478345093dd2d1bf0b82fdfffe938ec1aa874d
+DIST github.com%2Fafex%2Fhystrix-go%2F@v%2Fv0.0.0-20180502004556-fa1af6a1f4f5.mod 34 BLAKE2B 325996884246cd840e22801dc089388410afc2bd8ab7c5c1f4bac6aa6ac035f387e1b896a91702386edde85ba82efde16aa8d7bb55a7644fc3f530a36eabe89d SHA512 dcf507ac7e50307fec43fdc5e5dd93f0c8509ac99033500d1ff3414ac0a2419ddb10a688b17cd9d0035c36814a25ac68b771285ae21415eba7a55586b91fed7c
 DIST github.com%2Fakamai%2F!akamai!o!p!e!n-edgegrid-golang%2F@v%2Fv0.9.0.mod 634 BLAKE2B e7ff0f70c7650f9d57e0fb79eba9b50f7ea9e352cd18a2561d1b62ac94310360b43a90ebb4086d52af1927e6b869f4570d6cc1fe4b8646b3f5d8a69df8c27e34 SHA512 724da9b6712efe9c87715625ac19bbe4e0871b4d33834f9024897cea872120a0f5e30d09e4adc49541b084880d6e48f3c7029ae4c7c48e9204c8ab2f29b0355e
 DIST github.com%2Fakamai%2F!akamai!o!p!e!n-edgegrid-golang%2F@v%2Fv0.9.8.mod 408 BLAKE2B 11e7723e9fb19e41ce67038a676a8d310b131b5046bc363f5c473c1c6f7317cc8cc331d28bdd75f4cd50a9b701f78c7da3d4f964002aa6bc5acd489278bda289 SHA512 ad1abc2d3e3cd6be0791fd7e3a094c338dfa9cac062d8027170abbab8a7f88f910f4911d2cafe5f67d3544b996e6558b7aa02351204b1a97eb7040eb95e50a2c
 DIST github.com%2Fakamai%2F!akamai!o!p!e!n-edgegrid-golang%2F@v%2Fv0.9.8.zip 203136 BLAKE2B 0a8cd87892ce10a1460ca56698506109cd897fc2f3a53323394ebfd065e50686905f8f93e1726d4d778915979a9d87786d9062776bd1d8e22abb03d59090bae7 SHA512 8da03528a9909c411144715ac5c3f843b0b660223dd2caec7e50bd2c98989aa610933d76bafacdffe745310081c42bcfdaf3295b050ea91024260bd33ddcb1bf
@@ -114,6 +122,8 @@ DIST github.com%2Falecthomas%2Fchroma%2F@v%2Fv0.7.2.mod 674 BLAKE2B 41eb6ab1deda
 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%2Fchroma%2F@v%2Fv0.8.2.mod 687 BLAKE2B b987855d98e0e6181e8f28c12976081b5e0699cffc79b0721c811eaf6962e6edc5a01135519f787eac6d38e742517aa4d6e061ac4e5ba986e5c5e0cbd2a19177 SHA512 bf5c7b4933d685d90882099aa8c5bc33f8ec58e5a35138180b58771185306b6119cfaab319a43ade929b4560be9746f9155c8d55d1755df12b177613982c7617
+DIST github.com%2Falecthomas%2Fchroma%2F@v%2Fv0.8.2.zip 816641 BLAKE2B 5ca6160412d4760ff0d7cbe7a5805bf2af26402dedeb3ee46cff993db6c7d88dff20d21e69f4959798515531bb7cc21ec3383963cd310efabb97a7b8bdcc79cc SHA512 431e8a1e183f2bd140fdfcca245fa4fe7c7ab096f17ae3b91f66e0198bc3d58b6242d68cc784d307333b6746d72ea58d6f46ec2611913f8babac92f83ece755e
 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
@@ -126,6 +136,7 @@ DIST github.com%2Falecthomas%2Ftemplate%2F@v%2Fv0.0.0-20160405071501-a0175ee3bcc
 DIST github.com%2Falecthomas%2Ftemplate%2F@v%2Fv0.0.0-20190718012654-fb15b899a751.mod 38 BLAKE2B 2e1a897393e3527f0f82e6ab9baf62558d9cf54b56ada5d79aa1b206128de30395d9082bc600c4aa2a17e81095e429cc5874de95047854531cccc9ea0b867de7 SHA512 072ca7ba3d5ca815f58848db201002cc572d95334aeacfe44cb226505ad20d82ce06eb2ee059650912ae499db6291822c583296cb65a66e54adce62d6d850929
 DIST github.com%2Falecthomas%2Funits%2F@v%2Fv0.0.0-20151022065526-2efee857e7cf.mod 35 BLAKE2B 873b4b9c8491117a0b99bcc183ae96fc7e392c68d7271b73b5d7876574a5c7d67580425b35445ff2fff326c5cc7f328326d5d11946699c213cb2b84e8a9a0aad SHA512 7f23b8c5622c02b295646c7baf6f2ea3dd01e11e18ac9c263b853c7f771f5d098d8bcb75971f0cdc33d1c4765b563f3382ec5dc4bf20010065c3f1bc94e93175
 DIST github.com%2Falecthomas%2Funits%2F@v%2Fv0.0.0-20190717042225-c3de453c63f4.mod 35 BLAKE2B 873b4b9c8491117a0b99bcc183ae96fc7e392c68d7271b73b5d7876574a5c7d67580425b35445ff2fff326c5cc7f328326d5d11946699c213cb2b84e8a9a0aad SHA512 7f23b8c5622c02b295646c7baf6f2ea3dd01e11e18ac9c263b853c7f771f5d098d8bcb75971f0cdc33d1c4765b563f3382ec5dc4bf20010065c3f1bc94e93175
+DIST github.com%2Falecthomas%2Funits%2F@v%2Fv0.0.0-20190924025748-f65c72e2690d.mod 79 BLAKE2B 51cb1c2c33300626f74f843ce56c333b194b9a46230d3befe94343fe9daa62314a59b74a6d78c97415f839997fb42700c762fe02ef76240924ba52d18f723ad6 SHA512 df2dd357e057bb1fc65ef4869f64149f6446257406886e89a39f7dbc7e6c9da25a8c17567b14c8d3adefaf21fba98e0f2663924c7d32a4f82d30377ab4032162
 DIST github.com%2Faliyun%2Falibaba-cloud-sdk-go%2F@v%2Fv0.0.0-20190808125512-07798873deee.mod 937 BLAKE2B a4f614d4bf6feeca480ca90d6f581e0b96b99d32fbdf7eaa1907ec8bbebf468c22b989dbeafaabb6bc735273ac0540a8f1ca75c9e02e204efccbb6b9c22d89fc SHA512 dbe74e04b1eb2c7c15f5cf1042de37b0ef9ddd0588eacfd0c68bc361e5d4940c7a5e275f29e8983865730135fa13f0dc6114f877c370fed1bb95afb6db1cdcc2
 DIST github.com%2Faliyun%2Falibaba-cloud-sdk-go%2F@v%2Fv0.0.0-20190808125512-07798873deee.zip 14175006 BLAKE2B 015f2c3738d2112b073fd1fd2a00f9ca730ea7e3fc933eed30361e9652778e8e6b38f80fd611b0ced63074ca14c4d76c3648c35815347599d42d042ced0ee689 SHA512 eb3ef6cf81f9d6e0752b3d46913dce3bd40d750068c705de49bc800c6a841e3e19e0912aaab1c160486c5ff52286252c8dda7b983a66792454f14afbf828761f
 DIST github.com%2Faliyun%2Falibaba-cloud-sdk-go%2F@v%2Fv1.61.112.mod 569 BLAKE2B 7d4cb5297389948fc8fb3a376786538f817b646bcc7401fdc548c4f7b1893e0d9d2df0d17d1957d01a582f6d4125123856124cfe681cd4a62cdec04a97bc3799 SHA512 e45651c05354ad34041809da05b64990a41d3e444231bd48a0dc1261c845fbeefca0813d1f1dfc69cbb675d76d64239a6da043730ef87fec652d95a37efeceb9
@@ -138,15 +149,22 @@ DIST github.com%2Fantlr%2Fantlr4%2F@v%2Fv0.0.0-20190819145818-b43a4c3a8015.zip 5
 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%2Fapache%2Fthrift%2F@v%2Fv0.13.0.mod 32 BLAKE2B f5b7273a6c32fd9eb6e4a8956477bac6cdc2a5415eb1dd5dfa5dbafb28f5f8d1cc477196a4c3347025d9c184bb68ab269f4622ae03a01516f5e9c67124a10776 SHA512 190c3c9b3fe9e247246976b3c916c2ff41da6cfc04091de1d050eb78badedb067d9e960c2295a17b167ceeaf27fa62d149b33a8794ff2bddacf93e9731660564
+DIST github.com%2Farmon%2Fcircbuf%2F@v%2Fv0.0.0-20150827004946-bbbad097214e.mod 32 BLAKE2B f5b653f20e85bc44cbd3882fdd8f425c0b71733eae4bcdf2623952f1ed2524e8067a169f1cc0025f6570aaa4653969baa7d4626db6cf0dccb0d7378cc36da6b2 SHA512 a201f9c169bba0d962c2595ee8c625a2b7e39873e4bb3eb1ca646340638917dabb2309f1ba4b71d9fca4cf2da2d3684076c67ba362dd07a39538a45240f7f987
 DIST github.com%2Farmon%2Fconsul-api%2F@v%2Fv0.0.0-20180202201655-eb2c6b5be1b6.mod 35 BLAKE2B e9ca430f98cfcfdc5bc1e50ef421253011f21fe2a9a06b15b4b818f336c64a544ede9a8d1552740e85358fcb16a588345124b06fb2788951c24c9dd92c3b1cda SHA512 a0c76da94f068f583607520b728036f45ea071b727d3aee601eee712bd952b5f6c8cd5df1e1484195b07bb4c3b224771dda1fc7848dcd086a6dc93ada3ff2ce8
+DIST github.com%2Farmon%2Fgo-metrics%2F@v%2Fv0.0.0-20180917152333-f0300d1749da.mod 35 BLAKE2B 97d3ccde6ba4ad06a5344183f954cd6dfea580673607a6d54f1c0f3a643aee512bbe5fe7bdbc22629e6ffeb58f70422b9b80577d70fb58db9b03ababc0552ba5 SHA512 fe8dfbec1d09d7da5829af43760a4ddb5495b6a63eeb76fb3758aeb2fcf83d83ea443a15789d7042a0f5e637664babc9c388dbebc63ff7d35fb9545c7c7da991
+DIST github.com%2Farmon%2Fgo-radix%2F@v%2Fv0.0.0-20180808171621-7fddfc383310.mod 33 BLAKE2B f9ad41153ccea8eeb725d791dd7f44f2c5d8c997d85a091c0091ebc2ae38601928fcf13cfc0e326ab459538d16a3147f762c6b1d9b2abccbaebeb35691b0e5dc SHA512 98f0f51365ecedecd1abe944a765160f99ccde69abe92a44d4f0e30f72a664b828cddb085886d8460ea7faabd0cbe7abdbde905ac758be0a3752c9a8f3600b6f
 DIST github.com%2Faryann%2Fdifflib%2F@v%2Fv0.0.0-20170710044230-e206f873d14a.mod 33 BLAKE2B c5557c9c02300d9fc6ecaac5694461cd440f5a1f5cf9ddcdb38e6fc51d9a55d9ca1e98bfabecb6c83fce81e87979e66e56c585760ef61fdf1866480c0e32eab3 SHA512 15b2cb1fba3e5103879548ffdad032ae30f0e723cfd26fa6bcf69afff14b18c2cf3373f511702b3690fbdb7040996c437f9cd0253bdfbf211b665ff14e97aafd
 DIST github.com%2Faryann%2Fdifflib%2F@v%2Fv0.0.0-20170710044230-e206f873d14a.zip 7602 BLAKE2B 2fc27b391e078d69ed74a5591b56a0cc68b868dddce7661671ff67625de752908701ab3cc8103a0f1764ea4197044fc338588e60f403215ed37fc4b1c4e7e971 SHA512 8dba6631336679777643a784662faf6468f6d6f5332a32a3b5b3768925c5dbe2a6865ee55999549d34748b7d7fb7fe9f13eef43884276564618f8c5ff315a1fc
 DIST github.com%2Fasaskevich%2Fgovalidator%2F@v%2Fv0.0.0-20180720115003-f9ffefc3facf.mod 41 BLAKE2B 48814730032a11998c9da84351b2ed6e2a6aae70d2666dde457814f07c5348b067fe1832743d216272f2bc058d87eb4be2e926733e1934b163ffada3b6a4a13c SHA512 dcbb60f73a4fc4ef5c571978543be889675d86be078f19fc715baea2aed99de0243e8d8c3a968f047f648a883bed366a909a0c56f2ebc44780d5236868543618
+DIST github.com%2Faws%2Faws-lambda-go%2F@v%2Fv1.13.3.mod 125 BLAKE2B bee4d59ba1392d0211558f6ce3511c887a474463f784cd92069df7be6de5281079d579613f0e5988ad1f3355bc8ccbecdae7f1fd551fb122f7a0e8ef11523e1d SHA512 7e6ec3815d053e7d49d2b0a3d4fdde6c6eeac6048ad0eb681da1305f6d9d5bb6671e31834ff6e5d840d9a7944efa52707d40fa737fa9ec3d3ed9d130b589f9c6
 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.27.0.mod 109 BLAKE2B 70ae989bab9ef295dcf17e421481a371312fed6b07d1dd5e8892419c3dedea91dccd0aa0fc63fb728c24863b15ac24677261624ff16e75605678ceb39576b3d9 SHA512 89b17b1155f12c8a75fe85d815ef7724b96a009485b73e4df937990dbd6958b58cdaf8346610d5a614a3122450dcbea2687a510fba556b980d079cd3b1bee801
 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%2Faws%2Faws-sdk-go-v2%2F@v%2Fv0.18.0.mod 444 BLAKE2B 330419975445f724ee7b9a3ef8395fc7a153f189012dbe70e982865f5f556c2ab0d41a3465ec5cfddad034f12f226f77fcee9e3c1024693a0f9b13ee26f18092 SHA512 bfdf66b04b9c41824815a5a2707acce5c3f74aecf15a510d45adc84b732367885a18920d3dc50d968d0bc5e8a4fe3d519f7212de80baad4656c6867357c8fca7
 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
@@ -161,6 +179,10 @@ DIST github.com%2Fcaddyserver%2Fcertmagic%2F@v%2Fv0.10.12.mod 188 BLAKE2B 42c2a9
 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%2Fcaddyserver%2Fcertmagic%2F@v%2Fv0.12.1-0.20201215190346-201f83a06067.mod 272 BLAKE2B 9f8c531b8295fd85925b5bb45b9be0a30fcb329ec0062867d4e9c0b5a8c22973e30a2f090bbd1329252f2ac3e90739cf5c6079d0f6cf5eebb78b200c86832936 SHA512 aceac486e795d9ca300ac2baca3ed5c14ba7ec5c3a77f2b3361cd1b9b21d0ab68df1f13ec4e2e6b408563291a2b00de62eaedae0a33c1eab5afdce419b9ff4d9
+DIST github.com%2Fcaddyserver%2Fcertmagic%2F@v%2Fv0.12.1-0.20201215190346-201f83a06067.zip 127776 BLAKE2B 66af16d56fef206b50855ba5fb71b48436db7c9653437dc268f0d48a38a05ba8c5ccaf1ff68ca64b90dd36243ab4da394d219cae947e56a56cda276db3db8855 SHA512 4e01d3de1095ed35f61ae14faa7659182fefd6624a8038b059bbd7a304e4f08d646c8dfdf3661efeba1afbf402c0f2f062b93dcc18922901b9fb0dc15b566b16
+DIST github.com%2Fcasbin%2Fcasbin%2Fv2%2F@v%2Fv2.1.2.mod 122 BLAKE2B 47d561554f8fc26402a1aff96895741d9d50e201237346d2d147eff3e5977f356a3dbadee8c8b3c492bba7f6be33d48ad89dbd8a02e710dd96a4b29b1f3c1fd6 SHA512 1f9d455792a66a48351a4ca57810d37306ff60474da6e8e308f983fcaca4326f6f64bab9c677900e014271b52333d1588e287493c2fa853bc7fa40717556a670
+DIST github.com%2Fcenkalti%2Fbackoff%2F@v%2Fv2.2.1+incompatible.mod 35 BLAKE2B 6b99dc9054d6616c7f66e1f0a76a11cadf095b8661aa92aaa97aaac4c2fd943a972f9947fa64167241747f633ca9f2a74e9ddd122dc39a083223912886e04b24 SHA512 b21cab6683819e3029097ac203e35963aa69e47c32cd88017f640f976da0fb64dae5a62d9c76f64868618be6df14603c9a72f24333d1639e654eedb5125421ab
 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
@@ -178,9 +200,12 @@ DIST github.com%2Fchzyer%2Freadline%2F@v%2Fv0.0.0-20180603132655-2972be24d48e.mo
 DIST github.com%2Fchzyer%2Freadline%2F@v%2Fv0.0.0-20180603132655-2972be24d48e.zip 56640 BLAKE2B 4a31c288981856d09a5a4fcf4f0b8223502952284ec1e2ae698214e2f950cbf618c3a938096bba4f8f3531b8b75d62c17396ae7a5b7a29304c138e32f4529978 SHA512 e63fa5b49cd41a7166b01167bab86540635ea079a36763e559da108046923897adc43b0ff7e19faa7060e0580b2042981c9a32d10ffcdcf6fea1f22eaf32313c
 DIST github.com%2Fchzyer%2Ftest%2F@v%2Fv0.0.0-20180213035817-a1ea475d72b1.mod 30 BLAKE2B 9ec507e8410331513ba11ed5432f95b9141e41125975204c2dcb50b5fbe6f7117430ed9b1b0df44fcb45843f75ca862070f85cb40a5c4f6a8d13c066d2d6741a SHA512 528f23910ca94ddf6f811331dc7ed615b2949b2cb04c630e4e2b0ba4a6dadac1396268c4c3251a77af25db3e94dc8b0a0a66d365a8d3feaa78f31192a40e2556
 DIST github.com%2Fchzyer%2Ftest%2F@v%2Fv0.0.0-20180213035817-a1ea475d72b1.zip 5024 BLAKE2B debe8a3f8f81708baa936e0b9c2acca92d41e718efd59a605a5352d8eea7918211c89dce1a093755bd6b051e78eaff1036c86ad48c7700d1e332c4b83a8a44f1 SHA512 05859e1e715542b64c7d63789b447f971f7cceb6fd01bd78e661891acdd94da873ae6d3f612748fefaf9507d374b62526fcfe7db5655cc297c07208bc9f22bc2
+DIST github.com%2Fclbanning%2Fx2j%2F@v%2Fv0.0.0-20191024224557-825249438eec.mod 32 BLAKE2B 5483978ddce5f57e08f1358c34e5ea6b26a234e017b2e3a9af91296de3c79756f73f8cd9629b7d04c88e2135f30781cd0f43fbf9eceacebf26f141bb297f376a SHA512 865b4cc3ac91138e9b4581be778685f89bb93cdaf2372bb7b5db6227e249a2be89d5d14c89bd0e874e01d744aafc08b30b3ccee18a472981bed0e7740d892da0
 DIST github.com%2Fclient9%2Fmisspell%2F@v%2Fv0.3.4.mod 35 BLAKE2B 45d27e6bbd9255a355b6bd14ac839c7d87fabb393693a8b862ad974017af01309e5d36fa99d4925905c1617c0d90b5263b54cd95af2dbab186e293936dc86459 SHA512 ca8192c6321468b4332eb63c765a5798150dce9312873123b48d9ec67ebb4229cffc7b7e8054b8b0a6f45611f08130008031edf33da3468bb9a4ee9455fa02a5
 DIST github.com%2Fcloudflare%2Fcloudflare-go%2F@v%2Fv0.10.2.mod 408 BLAKE2B 8c4d31b483fedfaf21fe1f10730416f94739ff5aceb3133d39c9bcfc057d4f8d300b25714f81f9b06cfaf860caab45adc8ca5d2a97aa23b5e904dfb7948e3041 SHA512 0ee3b4c95d76249bcb53fd29a22f7185c1f4af4f9201ef53935b7db77f713a1e1e8c4c5b3170aefb821fe00ac65e58fe0436e0a6eed026aec94f61b5110bc801
 DIST github.com%2Fcloudflare%2Fcloudflare-go%2F@v%2Fv0.10.2.zip 155576 BLAKE2B 769d17e59fe56acc483a007219558f6332a82bf394afc77337fb9817a7f71037e02706b2030f8cfa65f525f5475fb158282bef47a429bfa6921048c8acfbc055 SHA512 55b52174748cf6d5e15057fa43b6b2e6c2069f2c8282172ce7fd340d0e72fb79234f811b504a5899c032116e5968a7a1e640bf3f0fc36d889bd13e905d88c492
+DIST github.com%2Fcockroachdb%2Fdatadriven%2F@v%2Fv0.0.0-20190809214429-80d97fb3cbaa.mod 41 BLAKE2B fce07437afe34fbb38dc2b3c8695440413610213aa82b910471dfdd37a5dfabd332513dff18fbef7b84469c0c137530e821e2a5adf0e660a96bb78446a084cc6 SHA512 180a8be6b0f3596aa376ec5f264ee545a082328067b3ffa5523634cc95b106328fbc6330fffcada0a1cf250c3a988971073441184b9194fe0d05fd62a33901fa
+DIST github.com%2Fcodahale%2Fhdrhistogram%2F@v%2Fv0.0.0-20161010025455-3a0bb77429bd.mod 40 BLAKE2B 58aa150182b5b43107154bd337eb024049bc2c7e2d26cf4344c97d554e03d4175862ecbd1b65527aecc85b9824c474c3e5a49eacaad18e253cec50785963b18c SHA512 8a0be9bb45924e5d384fa68dc2e990a4705b46e8878558d4db10fb794c8e20b13ec54831e7387cf425613f3f33b5952702deed074bee5818fed3fb9cff7b4259
 DIST github.com%2Fcodegangsta%2Fcli%2F@v%2Fv1.20.0.mod 34 BLAKE2B 7a0262643eb160a5f679f4599cf391a7c76ec183874b69c64483d3255a0baf8a68578d1a1d160b5b947c28b124785a2209e9f1b25dbb8cea15cd58e0df481560 SHA512 ee383b82e3fcc05ecc8b39399b1dacbacf3ea7e89e00569c682d565da000a46e79d8cb330d1eb7e483508c0d0f152033df9d21f6f71f5fb6fc3834d50655111e
 DIST github.com%2Fcoreos%2Fbbolt%2F@v%2Fv1.3.2.mod 31 BLAKE2B 7bbb809c199d39bac173751c3dc21b23ee8b020f20b4447c33681469b5083c64e74f699fa8d3dd55446b76ed44fc0949337303a776efeed90a764af1d751c8a4 SHA512 12f6b0e7090b257656ee9068083207fdd1b6d9f0b27546cb5b3a5a520e5944f3eccb8f6dd644a17e1089bbf787fd26b3e83eb0f0353071c8c4ef23ca99bc6251
 DIST github.com%2Fcoreos%2Fbbolt%2F@v%2Fv1.3.3.mod 31 BLAKE2B 7bbb809c199d39bac173751c3dc21b23ee8b020f20b4447c33681469b5083c64e74f699fa8d3dd55446b76ed44fc0949337303a776efeed90a764af1d751c8a4 SHA512 12f6b0e7090b257656ee9068083207fdd1b6d9f0b27546cb5b3a5a520e5944f3eccb8f6dd644a17e1089bbf787fd26b3e83eb0f0353071c8c4ef23ca99bc6251
@@ -190,8 +215,10 @@ DIST github.com%2Fcoreos%2Fetcd%2F@v%2Fv3.3.18+incompatible.mod 30 BLAKE2B d511b
 DIST github.com%2Fcoreos%2Fgo-etcd%2F@v%2Fv2.0.0+incompatible.mod 33 BLAKE2B 1ce5b6fdaf9b07e47e53896873b9ee4e96fa51c66a7a5afb3f48f34bf1b28addc5a5faa14832c24232a048b5d2b5ec0fd9af57997f0360105479550670b7272e SHA512 4fddb273aae34ba148c277266e98d174e04f5e888a1f59d44a86f7ec80168fbee85f245cea2e2fca44b29cf83f7a417e43b885438d7e3231c89604bb9f0a30c6
 DIST github.com%2Fcoreos%2Fgo-semver%2F@v%2Fv0.2.0.mod 35 BLAKE2B 931ceb7bcae15a876b79910a59b0f4ec67ae8f0ac5fbd401e80233107e7683d9cc4a947548c4d08b26f2d47ad6bfe4916f99ffd2a98abe26e8161af87eb49c64 SHA512 58d88566898778823c24b5f4ff7ac50384075312e3eb332aa01233ada3ff385cd8a0e3b8727a77ecf068f13b52a304fbdb5f47a27957333dbd5a8fb1448956c2
 DIST github.com%2Fcoreos%2Fgo-semver%2F@v%2Fv0.3.0.mod 35 BLAKE2B 931ceb7bcae15a876b79910a59b0f4ec67ae8f0ac5fbd401e80233107e7683d9cc4a947548c4d08b26f2d47ad6bfe4916f99ffd2a98abe26e8161af87eb49c64 SHA512 58d88566898778823c24b5f4ff7ac50384075312e3eb332aa01233ada3ff385cd8a0e3b8727a77ecf068f13b52a304fbdb5f47a27957333dbd5a8fb1448956c2
+DIST github.com%2Fcoreos%2Fgo-systemd%2F@v%2Fv0.0.0-20180511133405-39ca1b05acc7.mod 36 BLAKE2B bec7662666b7a5313f4b7ed0789ca75f07dcebed3b4498cced2b75b3622bc4c8c7d624066338fc6d77adea4b778c89f0a1218fad524c6804ef350deae2f24d68 SHA512 00ccb440abed145db781cbc7bc12695057b7dfa034c8ebd7ab1aaf5ea509fafc0be7147328dd9654e3fc2623bbbf91fd3992a86ff29e78bfa3e868d994b47e7d
 DIST github.com%2Fcoreos%2Fgo-systemd%2F@v%2Fv0.0.0-20181012123002-c6f51f82210d.mod 36 BLAKE2B bec7662666b7a5313f4b7ed0789ca75f07dcebed3b4498cced2b75b3622bc4c8c7d624066338fc6d77adea4b778c89f0a1218fad524c6804ef350deae2f24d68 SHA512 00ccb440abed145db781cbc7bc12695057b7dfa034c8ebd7ab1aaf5ea509fafc0be7147328dd9654e3fc2623bbbf91fd3992a86ff29e78bfa3e868d994b47e7d
 DIST github.com%2Fcoreos%2Fgo-systemd%2F@v%2Fv0.0.0-20190321100706-95778dfbb74e.mod 36 BLAKE2B bec7662666b7a5313f4b7ed0789ca75f07dcebed3b4498cced2b75b3622bc4c8c7d624066338fc6d77adea4b778c89f0a1218fad524c6804ef350deae2f24d68 SHA512 00ccb440abed145db781cbc7bc12695057b7dfa034c8ebd7ab1aaf5ea509fafc0be7147328dd9654e3fc2623bbbf91fd3992a86ff29e78bfa3e868d994b47e7d
+DIST github.com%2Fcoreos%2Fpkg%2F@v%2Fv0.0.0-20160727233714-3ac0863d7acf.mod 29 BLAKE2B db9b03b0adf02e3b379eb06d67988a60f2e2034d1217e56b40ebafc1262cb4803500b73a3e697a5a73418615c84310bd7f7aeca6db56f6ddbcf6c044cce0e9f3 SHA512 ea629c85891049bdff24f75a4dbce34f048a9627fc126b44f497b3ae65602045ca4fe0856e1b3d7ba050bb867226b90c25912565867c696bc370697341681c33
 DIST github.com%2Fcoreos%2Fpkg%2F@v%2Fv0.0.0-20180928190104-399ea9e2e55f.mod 29 BLAKE2B db9b03b0adf02e3b379eb06d67988a60f2e2034d1217e56b40ebafc1262cb4803500b73a3e697a5a73418615c84310bd7f7aeca6db56f6ddbcf6c044cce0e9f3 SHA512 ea629c85891049bdff24f75a4dbce34f048a9627fc126b44f497b3ae65602045ca4fe0856e1b3d7ba050bb867226b90c25912565867c696bc370697341681c33
 DIST github.com%2Fcorpix%2Fuarand%2F@v%2Fv0.1.1.mod 431 BLAKE2B f58dc1f8ced55fc31d771894000b6b8f7704b78a73a256c0a44ca6e81f82972cd8030f072319b9e6b8ed85853821a6cb82e0183cd9af9e7cd22263b1d66fe91c SHA512 5317b51f8fc23e83f415e5fc39a4202e6d2550ebe22c20140551265f8d3a538b2d4ff38cec62f81d2dda00415a4690d157fafcafc81ff1c00aa7db1622a19c1e
 DIST github.com%2Fcpu%2Fgoacmedns%2F@v%2Fv0.0.1.mod 32 BLAKE2B 24419811deb7b63bf17f50bb4808d8743ba441592d8f0024bae6943c518c675394e76328d13a32c4524156c87bdea8d8ed51647ac492cc274535411aa08173f2 SHA512 3684b8287ec51547ba7a616e1a2d0e199652e8c5247ae8e1e7366fded4ef22383c14a0bbd9b49911db99a6ea8b101596fe6a7e5baf2c49c1d04b89f18c78a292
@@ -231,6 +258,7 @@ DIST github.com%2Fdnaeon%2Fgo-vcr%2F@v%2Fv0.0.0-20180814043457-aafff18a5cc2.mod
 DIST github.com%2Fdnaeon%2Fgo-vcr%2F@v%2Fv0.0.0-20180814043457-aafff18a5cc2.zip 25432 BLAKE2B 18a910f8a2bc0109189756a53da47691beac857a6783e39bf45fb1c02f8ecb85442d652c50717135613f634a8d17a7950309d3f0f2621714b5bef624482ab457 SHA512 80e1f1ecd3d37989f4f2d5d0d168cfa8fdf9e11698abad1f462861d0104ee0095be8a747ab16fa46521ff73772e091478ba56179f4b3d4e9db5155489530cdbf
 DIST github.com%2Fdnsimple%2Fdnsimple-go%2F@v%2Fv0.30.0.mod 158 BLAKE2B 78d955281e8ff9058f06cd1f5b91f3f6f87fb5d50f0b73a9f1862d92f720bd9cabff9445d85be48a30b49b4e933c1ab710a6cf183274b8e8f90580240ce98aff SHA512 ccc2fa12e825ffe4296e4a8354544b653b0ae662343a0464cd4fcecd3fec8f9ab6ad0a90fd061b376747e2730f6ce13f070a35546fdd0e25b422c67dddd5a94a
 DIST github.com%2Fdnsimple%2Fdnsimple-go%2F@v%2Fv0.30.0.zip 215561 BLAKE2B 7b277aeabd21d951c3bdc6b1888e8abf64dd11aafcec3214ade932a272dd6cf35b95c855bd3624ccc11681a28cf0117253d8b2298e2a00317365361460c6d356 SHA512 c020d2943285537524f46ba7208661498a6ce8366171a6cddc9334ca222425ab6f6aadd56f1d4b021c42fe7aa21bae99395915bb9d830cc9348894a02f88207e
+DIST github.com%2Fdustin%2Fgo-humanize%2F@v%2Fv0.0.0-20171111073723-bb3d318650d4.mod 37 BLAKE2B f097ba062c5ae93b06edbf7827cc21a40d6bf6d2130c44fc8002344e860b3471742cf930e505a74a6a2af3a77a6dcc7d01b103d01f6f208c96dd9ca713c96344 SHA512 be96d9da23cc31932c1001e2ed367e55d06ccf2af41cc106e83b92fb866b61110d06ff224797c942b9ab6104bdcba4542f2214b9fb2d88df63e69be8158c6e2b
 DIST github.com%2Fdustin%2Fgo-humanize%2F@v%2Fv1.0.0.mod 37 BLAKE2B f097ba062c5ae93b06edbf7827cc21a40d6bf6d2130c44fc8002344e860b3471742cf930e505a74a6a2af3a77a6dcc7d01b103d01f6f208c96dd9ca713c96344 SHA512 be96d9da23cc31932c1001e2ed367e55d06ccf2af41cc106e83b92fb866b61110d06ff224797c942b9ab6104bdcba4542f2214b9fb2d88df63e69be8158c6e2b
 DIST github.com%2Fdustin%2Fgo-humanize%2F@v%2Fv1.0.0.zip 26356 BLAKE2B 665fb778605fc05dc686b59a3ad82a6df9020017243cc84498e4113c7b18343507a0084cd67febc329fa6b44e675696f99f632cd282ead5bb06f93ff3bd50bea SHA512 88e19d0139de7de602272e14586a99eda26b2867ea60ef56b517d13b37c0d28b1ab62c05b2f9cf1a9b8dcc8e5afa9c915baf7a30b0f17c4fbd47d5c71d0a3965
 DIST github.com%2Fdustin%2Fgo-humanize%2F@v%2Fv1.0.1-0.20200219035652-afde56e7acac.mod 37 BLAKE2B f097ba062c5ae93b06edbf7827cc21a40d6bf6d2130c44fc8002344e860b3471742cf930e505a74a6a2af3a77a6dcc7d01b103d01f6f208c96dd9ca713c96344 SHA512 be96d9da23cc31932c1001e2ed367e55d06ccf2af41cc106e83b92fb866b61110d06ff224797c942b9ab6104bdcba4542f2214b9fb2d88df63e69be8158c6e2b
@@ -238,6 +266,8 @@ DIST github.com%2Fdustin%2Fgo-humanize%2F@v%2Fv1.0.1-0.20200219035652-afde56e7ac
 DIST github.com%2Feapache%2Fgo-resiliency%2F@v%2Fv1.1.0.mod 40 BLAKE2B 9300f3006801602e05416487e6021123ff345e36835b5f4841158bc87556afa086470218c3f2178d125baae065c1af3cb27e210a50173a5bc9a469c592758eb6 SHA512 fb616884898669f21d53576f0fb70c8babc38bb98da066a2cb77fa85ceab6bcc8775feea3d3bcec19ea3b25544c776b8d55ad82f8876da5d0ed5176768da735f
 DIST github.com%2Feapache%2Fgo-xerial-snappy%2F@v%2Fv0.0.0-20180814174437-776d5712da21.mod 43 BLAKE2B 500b3a85f43db1d61f037f437b3290888204aef8b80aabf42d70c37607fdac86e8b1f7f4e41ad3709ad7015a78b934ed7d6d254522eb3e2baba4ae24619ea4d2 SHA512 da87f8eea5497796badaa6bdd1c67ae04e75deb7595f10739f30f20364f22e588a449aacf603f2c8d738b365ac14211c7cfe8e1bfb91f220f5c9d547007ad453
 DIST github.com%2Feapache%2Fqueue%2F@v%2Fv1.1.0.mod 32 BLAKE2B 51c322074fb7a69418dcdfd2e54b187fbfe541c21a979c8bf8b155a6264cc670eeaa95c2949f2b760b187fa582e86688a045f3f022cb45f053a58e00ec2c0c60 SHA512 bc43f85d5a21cbdf4b3821e707c845d08f8a6d8f2c6ef0f6ec76f7711c53bb4407f2a356c79bbbda438fe138a3cf74a4b279e8757cec7aa134a93f2173b931a0
+DIST github.com%2Fedsrzf%2Fmmap-go%2F@v%2Fv1.0.0.mod 33 BLAKE2B 52211e27792f060734989af8b47b48f3f9edbdc94b49917d715bd8853a3f05ac714cfbf752d3171b4c223a8787497df16e1ee46b07203a6d2c4cae3540c66af1 SHA512 ddf8e796d04c0741342eae18ad343861ad7a76d030a5dd9a27b1a68b2944a0f94ec21b1513640179c73c16d79ac309b8552dae42d6e45bc0f03d33269666bbf6
+DIST github.com%2Fenvoyproxy%2Fgo-control-plane%2F@v%2Fv0.6.9.mod 46 BLAKE2B 26844d83faf5b29bc13a3a48ccf6a3648324503647617e8ff13baeabe4d95ebc0e4f2ca5014b553148964625323dc1a11bbc0a4fb5357be97770a3b6cf808bc5 SHA512 5ec3e01429b0c86caa7ee04de7fd70505cacce1ed540081ce4c40143c8776cbb75443dbaa47642da02e263c02c7e3557d6425c3cb60f03a5bc296a1cc3b6541d
 DIST github.com%2Fenvoyproxy%2Fgo-control-plane%2F@v%2Fv0.9.1-0.20191026205805-5f8ba28d4473.mod 378 BLAKE2B 571b914afee85b0d13a567132dd40a80f60224e20685279cfaa1e5e875897c8e0fc94d7097992881495f4c0c090b27c87f6d95db0161e1064434ca0434ae06dd SHA512 f0135b61ef0638fe384c875786abbf8ed9a93836f6ed29d19a2e9a626cf6d6c6a252146352eb32298b826e93bb61b8c733f8a6aa683e5856ebec37cccc64ce58
 DIST github.com%2Fenvoyproxy%2Fprotoc-gen-validate%2F@v%2Fv0.1.0.mod 49 BLAKE2B d910253a9c976078b790d134a9d75e53cbde427e7733ab9e09c9060b312a5749aa083fc48263501e3339a580cc409b5859dafb820a4465827e7fba4eaca31ecd SHA512 755a3d173d43e70ca40fde2d5ce16c405365da90ff595003ef64598c9b9734b7200fe07a16fd555e4209f83e5e17561d18227c46a5f25a41976ff7ac024cb9aa
 DIST github.com%2Fexoscale%2Fegoscale%2F@v%2Fv0.18.1.mod 87 BLAKE2B 9a3f9327dfa69321abfd93dd5e501d8faafdba4d5283ea9eaad6c74e00e2a17e3d078316367e96861db3a53400e3b5184afa6c20d8c8991f53803764b02ef2cf SHA512 462c3ad73b14ace4121bb97a0ab5fec0aa0c212a2561b89fe5c78da34df25c8d969f3031eae1e23122c0aff0d234f69593bd8633e37897264a6b02c17b580a9f
@@ -250,6 +280,8 @@ DIST github.com%2Ffatih%2Fstructs%2F@v%2Fv1.1.0.zip 17890 BLAKE2B 663ee535dd3ddf
 DIST github.com%2Fflynn%2Fgo-shlex%2F@v%2Fv0.0.0-20150515145356-3f9db97f8568.mod 33 BLAKE2B 2c279a40bce4e61e5aad9d25a1c374b6c154586c296cfdfd56f52435c7739c8d9a8958e19d6da8026c2a03b728e0cb9bb512d5c094aa6111f9b10af24ab894ee SHA512 2bb0f125a91c8f92dc1cb5ec16441b27027585606a3862c216434b76324f3069941055c4bdc98372547543b095a4014155446de1be98264842504450121c941c
 DIST github.com%2Ffrancoispqt%2Fgojay%2F@v%2Fv1.2.13.mod 962 BLAKE2B 4e010a5ff246d4e834d72b522e958d6f8063778261deb3abb11a5781a5d79c90e9697d43388158b4d80f811111eee0e86767d51ec58570d02ad4d7c8c9a31ba7 SHA512 c2b2b6ef8de68569c73aa8ce8c778dedd764f8204c8bc8a78b335d0138c49851af585da65e0ab9b2e561500f1eb0521a6f77d92794e38fcc22e6dec12113c959
 DIST github.com%2Ffrancoispqt%2Fgojay%2F@v%2Fv1.2.13.zip 231306 BLAKE2B 8db056d6fc6796e16bfc456d00ec08eeb0884fb7cf6e234193862453406a300e5bbfc23f0910bace51fc66e5c3801a14078aa8846dbf6b03a64c79414e350892 SHA512 822d1395436aee93d26cf53cdf65163247e8620b4f1bd3151270b9a9e2066012e9397158a10f433c0d0512dd8c4b6d53ec76b5e5d3f169be3e5970e3912dcccf
+DIST github.com%2Ffranela%2Fgoblin%2F@v%2Fv0.0.0-20200105215937-c9ffbefa60db.mod 33 BLAKE2B 69d161a91f7a47f08054ac8715154885a3615d8366b32d226a08f3bc975f6c87d168006620ab53fff5ca938232f06ac9eccb1b7c0621c91f9d7368b38cf29bf4 SHA512 9376e6913b3d764bcf0de41f4d6cffec4da5a8d387488cf531113e1597371b838fc398020bc85fdbb0583fcd9fbc2fbcb23b246c3d8147a6c606bee3f0974882
+DIST github.com%2Ffranela%2Fgoreq%2F@v%2Fv0.0.0-20171204163338-bcd34c9993f8.mod 32 BLAKE2B a4dc1d6fd70150916e3bab8b310fe7ba5c26aacb90241b18ddb51f2608ebcf4e82f29495e663181f5a7b1f0f09e0659607eae17850dd0bd3ea8dbdc0f4fa6ad1 SHA512 1e3cd7f2ca465a9930734e27984262e81d563551917c8af55c521f15cfbf56a423ef918fbd282b4947c81a65ffa1c17294d4cc83aae639d9432dd3a52fbe8e83
 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
@@ -272,13 +304,16 @@ DIST github.com%2Fgo-gl%2Fglfw%2F@v%2Fv0.0.0-20190409004039-e6da0acd62b1.mod 29
 DIST github.com%2Fgo-gl%2Fglfw%2Fv3.3%2Fglfw%2F@v%2Fv0.0.0-20191125211704-12ad95a8df72.mod 48 BLAKE2B 7d441b7bef1f34bd7065c63630add910d504ba5a2897d6a0b7cf9c9456337b8e55e1ffd9e12cb3fb8c7f021e51cc045ea41cdf62f2c33555f4b61aeda07c332b SHA512 06dd140361d7cc1af9e37de85402631a5310d34198e20d6ce1521dca15d1fba1dc9e40b512a30b8e850e105e9fbcfe0691b298d092eb92b79da564532dba721e
 DIST github.com%2Fgo-gl%2Fglfw%2Fv3.3%2Fglfw%2F@v%2Fv0.0.0-20200222043503-6f7a984d4dc4.mod 48 BLAKE2B 7d441b7bef1f34bd7065c63630add910d504ba5a2897d6a0b7cf9c9456337b8e55e1ffd9e12cb3fb8c7f021e51cc045ea41cdf62f2c33555f4b61aeda07c332b SHA512 06dd140361d7cc1af9e37de85402631a5310d34198e20d6ce1521dca15d1fba1dc9e40b512a30b8e850e105e9fbcfe0691b298d092eb92b79da564532dba721e
 DIST github.com%2Fgo-ini%2Fini%2F@v%2Fv1.44.0.mod 29 BLAKE2B ec6988d536e1cfabecc7e1ee6070c6429c88de9bd970b3ecb35bf8e42ac3d2dfa08beefbd3741ef7a039020e6d41332039c6bc0e13d5e79bca84cf669e4f552f SHA512 67077f6e3f3c2571d6df326aa1d6351c3f7950337a23c548ff69e73df265db516eee559ee4afff17868068f2754c7ef272e46bc3dd5ac324ed002b749116794f
+DIST github.com%2Fgo-kit%2Fkit%2F@v%2Fv0.10.0.mod 2670 BLAKE2B 211a6d7642da991f148a7998fd35875f316a143c62337214ff428b4eecc7dee7db044e42f337edf531edc70b9aa99f46e349821864a63d384c7d050e414a608a SHA512 fdfed8273d2014838eaed6d4d2b0d92ae905fd796a0fec6c5a0eb27d15ec31c72e1e79973d909a1ac01df1a2e5afac99bf17d5cc7d08f507474c8e8e7ea88ef8
 DIST github.com%2Fgo-kit%2Fkit%2F@v%2Fv0.8.0.mod 29 BLAKE2B e43df3e551bcfb1d4a4843ddf00f1a9432cf768420f49943ee2936fcf3e890e59734b71ecbfcb85a70212122df3f03582335e37ca7330df9e335214e75a849d6 SHA512 2ace9d4bc029947991eb7237e7343fa31c5192d63927de1701434c305a659cb88fdae12e9b604f06ab318f1c26b207821edbe11e8d9382a0447544b782630c6c
 DIST github.com%2Fgo-kit%2Fkit%2F@v%2Fv0.9.0.mod 29 BLAKE2B e43df3e551bcfb1d4a4843ddf00f1a9432cf768420f49943ee2936fcf3e890e59734b71ecbfcb85a70212122df3f03582335e37ca7330df9e335214e75a849d6 SHA512 2ace9d4bc029947991eb7237e7343fa31c5192d63927de1701434c305a659cb88fdae12e9b604f06ab318f1c26b207821edbe11e8d9382a0447544b782630c6c
 DIST github.com%2Fgo-lintpack%2Flintpack%2F@v%2Fv0.5.2.mod 475 BLAKE2B a6ee9f4b83cd2eece5006f2bdb2224b483372058c70a2374b0f8ef6e01625874653e93f804d6c95431c0d522d775f40e799704dc31a07e69aab07b690e0f9545 SHA512 bc80cc006c40939066739019c1573f78b9da54efa1f8bbc606865ca6355aa26deddb06f2c80e754ef74b9a7e804d5f45c50bca4870d9b7b995367aba2ff95281
 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-logfmt%2Flogfmt%2F@v%2Fv0.5.0.mod 44 BLAKE2B 0122d72cea88331beb9500849a0936a966e7a48abdd2e76363151bbb124e35481e7248fd896523eba3c51c5f4575dbc13304c2471477757c1eb2f8fb2eee9cc1 SHA512 bfebb8d865586729abcb0dcf4c19a8938f06f9b502c78bed92d01c18d1d037f7df44cc1a1fbd4ca094b1835b8aefbd48fb5988e2884656ca44be0aa83206aadd
 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.0.mod 38 BLAKE2B 198f3a6fb7348bf50286e1dbb067e72ff854b1daedf1d181b643872aab377b930029feeb95d5d6ca21109facde089527a06922b9ea52cdd59ef553d69b984e06 SHA512 21ac6d6f8fd92ccbe09cb30d0dd6a37142907048cc5f9d0574824765918dfd8ccef96b7ceab9dd259f9a95f5c5be566ac00ff4eb3e37ba7c7c98f25b3185baef
 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
@@ -301,6 +336,7 @@ DIST github.com%2Fgobwas%2Fglob%2F@v%2Fv0.2.3.mod 30 BLAKE2B c4b58079c7f353b0112
 DIST github.com%2Fgofrs%2Fflock%2F@v%2Fv0.0.0-20190320160742-5135e617513b.mod 30 BLAKE2B fda15fb36702083cc063889e1e180403d555d81b02cf93e32d96826df51a2fd251c338ad21fa147a06c7107831f7a30cad1131935cb61a2ca58c65592400c174 SHA512 baa937326b26fe8c673b8e230200289591c55f2305258135a421996d9c97a9a12965bc5aefbfd7cb25db266c9c7777dee8d414044129e2cfcd1591a640d782cb
 DIST github.com%2Fgofrs%2Fuuid%2F@v%2Fv3.2.0+incompatible.mod 29 BLAKE2B 5311a22dbbbedd78a98e34293e79fb5443c57774fa9049665943e377fd07984a9316f3ec5c8fb70da9b133c6390d32ab28b97e939f938bfeeef78883cca6fba2 SHA512 8a1ab67bf3555ca17b7efb1042fb6a7d58b225b4186302b0cf289e7b60f9aeaf23e36ff6d4e8da2ed728dcd676cb2f30f0625c430c0b6943dd25ee02d2c27247
 DIST github.com%2Fgofrs%2Fuuid%2F@v%2Fv3.2.0+incompatible.zip 36892 BLAKE2B 86fda2a386b182044a4482b9cbb90fdca1c07b45b6c0f0a6f2c63468263840ea99f22140a3d7a9f68836674f884c425d8d44c6583df554ea6bbd1b7b84add874 SHA512 c8c217d61335e9b4c9ebad513fea36f7bc529d398ee7bf6f538bdc355ef62f0597aa7aa3d78b57e6571198cd43e53ef032e8ffb66650fdfd25fe49e17c7ce84d
+DIST github.com%2Fgogo%2Fgoogleapis%2F@v%2Fv1.1.0.mod 34 BLAKE2B 92cad2efe22c009b9447a03343841c211ee06e0a78939c6ecf3e367dbd50c725562f6c09705f8fdf8131a9264a814d6822d3724a15682f446ed869b97febe388 SHA512 38d3341ba73f1537bc4df9c5a3938d1e0effb065122b4b1ebb3277a33c3e70674b28a32ffe8a79ee8b6a353233c6ead616b7749244a3af10306bcaac678aca8a
 DIST github.com%2Fgogo%2Fprotobuf%2F@v%2Fv1.1.1.mod 32 BLAKE2B 939b72a591bc5fbb649c21a95b2c4b3f5d3ade273377f1f89407e55f436e7a863f15d708aabfc5435334500c8cb1e3ba057439c8ec81cfde68c1ec6794c6de6e SHA512 ab6c57ada3b0d1e36c91f3e0f45e573b91a4869f230f02a7e5e3e5a8f7e020bf56c63df1cbdc5b552ef9a4229ab739cf76df7f799091a2efa148ab9e5c12b1c5
 DIST github.com%2Fgogo%2Fprotobuf%2F@v%2Fv1.2.0.mod 32 BLAKE2B 939b72a591bc5fbb649c21a95b2c4b3f5d3ade273377f1f89407e55f436e7a863f15d708aabfc5435334500c8cb1e3ba057439c8ec81cfde68c1ec6794c6de6e SHA512 ab6c57ada3b0d1e36c91f3e0f45e573b91a4869f230f02a7e5e3e5a8f7e020bf56c63df1cbdc5b552ef9a4229ab739cf76df7f799091a2efa148ab9e5c12b1c5
 DIST github.com%2Fgogo%2Fprotobuf%2F@v%2Fv1.2.1.mod 88 BLAKE2B 0699027ef7284edb7deb6a2640db52a5b93076e3250d42710bf02a1cd7d5f591f1d335ffb1e7e753dda5fe177837fad87a25bf69b03466bb545708fb2952fd7d SHA512 b91b25b4fe769a403fd7a1f82d7720bdb0526a349ffe7cfdfff09a2ba5e0015d5a3446cd8e0e5fe46479b7d2296a8616de38a8183c0185f84fcfc75d202db106
@@ -309,6 +345,7 @@ DIST github.com%2Fgogo%2Fprotobuf%2F@v%2Fv1.3.1.zip 2698974 BLAKE2B 5fcb1c66d3fa
 DIST github.com%2Fgoji%2Fhttpauth%2F@v%2Fv0.0.0-20160601135302-2da839ab0f4d.mod 32 BLAKE2B 277920ac439062c049c6bf823817eb494f74b04c4e98fce8697b0fa7e73495681d209fea12d9265e7800cd8740a68ae3aba0837a6e76fe18df052734a13d40a3 SHA512 7a77a04ed51e7bf75d80d8accd810ef16587e1d941496c8f57517c7a8f185b3c00e01a456b8473c2d89e324175be7ad7e1cffc12c8d97209e0164cb60b24afbc
 DIST github.com%2Fgolang%2Fglog%2F@v%2Fv0.0.0-20160126235308-23def4e6c14b.mod 30 BLAKE2B 6dea6116bb7fb72123a93cc8b83dca5455b76591c7948524ffe664bf966780799c4d007154502922e21f688aef5148211db6b0e3dd3f6b545c4192f5bd5166a8 SHA512 3714d2a95d0435a113c36df5feb13f77a07a1514fdf6b5f01e6e8cc5d159067736e0065bad8062dc636fa5c52c98e3fea6985075005b2838bdf53e0b07093024
 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-20160516000752-02826c3e7903.mod 36 BLAKE2B 3eee85c76d1ccaca7488ee3039bae6a7a9b4c8253481cdf6d62d1126623312a07264ed0e061bf5d7bde3aafb23e078b2bc86c3718cb2fff6618976c420c7dcae SHA512 5a0f44d45d666885e31206077a515fa02246d56699aa02f7809868029fdf6a718a5df8edac0ec245880f982882c2f4ca1d13a1dc0c7c0f79d7e89c6c46fab523
 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
@@ -344,6 +381,8 @@ DIST github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.0.mod 124 BLAKE2B 4c032e7f2e1c87
 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%2Fprotobuf%2F@v%2Fv1.4.3.mod 124 BLAKE2B 3242575be48f0e1f74e2d0976d2a11f0edccc59c7b74cecde37233c19f97c51e576cd3032175cfad3c1ce9721cd41053f459341182fba836e0ff0456126e493e SHA512 9586be76b697c6a5c3216762ac13a7d297372ebe0c7ac5941d16c326d1580c8a73fb475236ed9a4214d158a7386e761877be16cdbd4ac2074e8a5e1dfdc95b54
+DIST github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.3.zip 206951 BLAKE2B da403116137f70222d2028df84c6f872d324e6aef808ceb2f58dae257e9b7cd2fb37b477c2b61bda55888f5aa72fe6f46afc79ed4fb440f1212c5105f8b6dcc2 SHA512 8df603b906846c265342236e7bff8ad4f37fbac2ab425b6002201ec727602bc2454708985d44de11bd91212e15e338ce1942f33a3e38c328f2ab9e3b990a2ab5
 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
@@ -375,6 +414,8 @@ DIST github.com%2Fgoogle%2Fcel-go%2F@v%2Fv0.4.1.mod 423 BLAKE2B f27df4dc2fad19e9
 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-go%2F@v%2Fv0.6.0.mod 364 BLAKE2B 07359e3161b23e583f4c03d876b770f90647990e5cac61c95c590af1d5efafaf3d2447cabe3d0768c7f6fd29b370ad110329545c19cd0b4bbc8399af019a690c SHA512 6e8f653ff78f1d9ec535465f448a3743f89daf2c1a15dd91c93bbba8cff5acbf4572940ffd69c7fdb386801d3fafba6f8a28ec0f6164d4f867e26eaa3ada190e
+DIST github.com%2Fgoogle%2Fcel-go%2F@v%2Fv0.6.0.zip 2275099 BLAKE2B 0c386659f1181ed59fed2de48c357fbf7d4423ac12e147e6a2c6af62d713f562001693e5510d3ac09b1340f01213292b6688de83b7b73ede60d5e7254560714b SHA512 7fcfcc8b712239b5f305f6e35e64817ee52ccfe63e40b6d97dfe08428e8727561e3c9734ff7e005f4db000a4feb969c56d98fe7d50299b73c99e3bfb9c416f8c
 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
@@ -418,12 +459,14 @@ DIST github.com%2Fgorilla%2Fhandlers%2F@v%2Fv1.4.1.mod 35 BLAKE2B 549faba95b001f
 DIST github.com%2Fgorilla%2Fmux%2F@v%2Fv1.6.2.mod 30 BLAKE2B e02807a9c1526691f789f8b176ad7757507d87fc5fe0d52b8997d72e9d528682a6fd10aea2426d11649c3caa7b6e4ae3c552e86fa30f3f710e6354caace3a88b SHA512 2facee17b28c8b9111ec642ffa0975e7f80601b4ffcc4d1756468e963236fc303cf69d3b5129287b746dc08a66fb719706bef277171b709a3013e6b4ce7e43c9
 DIST github.com%2Fgorilla%2Fmux%2F@v%2Fv1.7.3.mod 30 BLAKE2B e02807a9c1526691f789f8b176ad7757507d87fc5fe0d52b8997d72e9d528682a6fd10aea2426d11649c3caa7b6e4ae3c552e86fa30f3f710e6354caace3a88b SHA512 2facee17b28c8b9111ec642ffa0975e7f80601b4ffcc4d1756468e963236fc303cf69d3b5129287b746dc08a66fb719706bef277171b709a3013e6b4ce7e43c9
 DIST github.com%2Fgorilla%2Fsecurecookie%2F@v%2Fv1.1.1.mod 39 BLAKE2B 18dedfc007aad3087ef83c141ac6fc1835681c7f09af9a657f879e1f2bfce5e8d501113ca0e044435979b1dfb0ac5ad6954661f91118af7ff00b929076a39206 SHA512 f5596bc3919bf32ebdb9851ba6b8e5931eb88583e5129c277f6d5de4b339433ca8a180c40b1bfb44420c35cc8a01f53e4bf1cf6f0aef6f3b790590234bbebf61
+DIST github.com%2Fgorilla%2Fwebsocket%2F@v%2Fv0.0.0-20170926233335-4201258b820c.mod 36 BLAKE2B 94a5b4cb6c6de32397f001dfc95c49960de212f67fbb6b4a1a4806f78cac88a2698c3c2e19b7e1cb64d07a3ad6caab25a1006bb4f51b65e1c62c5a12c77d8b9c SHA512 21ce8fb666af3c32e843c816626a7c4c0c63ed1f170c7a49eea4a2f40e28e4ba0105dad2e17aa527da7dc3eca198a20dbb6566e60ef48d7d7cf72413bc81d24a
 DIST github.com%2Fgorilla%2Fwebsocket%2F@v%2Fv1.4.0.mod 36 BLAKE2B 94a5b4cb6c6de32397f001dfc95c49960de212f67fbb6b4a1a4806f78cac88a2698c3c2e19b7e1cb64d07a3ad6caab25a1006bb4f51b65e1c62c5a12c77d8b9c SHA512 21ce8fb666af3c32e843c816626a7c4c0c63ed1f170c7a49eea4a2f40e28e4ba0105dad2e17aa527da7dc3eca198a20dbb6566e60ef48d7d7cf72413bc81d24a
 DIST github.com%2Fgorilla%2Fwebsocket%2F@v%2Fv1.4.1.mod 45 BLAKE2B 5f187c997ed74f2aab1da57c9a828be383e41f47905531da8babc1360612ba5d4cc0fc6cc48106647ffa450f334c7cc5f455bea7f6e6b9734f3e55734cf623c6 SHA512 81ef224435efb5cbd429dd4339e8410234855f4a268302a61d34e76c388e89ea22c97ae90d71a6ef910ca00d3178e40d3587eaf484112966050fbd1f1f4843ab
 DIST github.com%2Fgostaticanalysis%2Fanalysisutil%2F@v%2Fv0.0.0-20190318220348-4088753ea4d3.mod 120 BLAKE2B 0734abf8ddbb6c4bd190acb4f76c5f9e3f9ece54ffe3cb9a92f6f612bbb7844b46b9ce35fe680bdf9fedd66319f629866b79f311110b33167fef23752fc6b7dd SHA512 9e85c69bafa7a9f6ea007c63ebd31f4ecbf9fce14601a8f8ca2a5832414863b7911d36d629a1f6646cf31a17ad2ee29a1acfefb76da467fd2cb13a20b7436ffc
 DIST github.com%2Fgostaticanalysis%2Fanalysisutil%2F@v%2Fv0.0.3.mod 120 BLAKE2B 0734abf8ddbb6c4bd190acb4f76c5f9e3f9ece54ffe3cb9a92f6f612bbb7844b46b9ce35fe680bdf9fedd66319f629866b79f311110b33167fef23752fc6b7dd SHA512 9e85c69bafa7a9f6ea007c63ebd31f4ecbf9fce14601a8f8ca2a5832414863b7911d36d629a1f6646cf31a17ad2ee29a1acfefb76da467fd2cb13a20b7436ffc
 DIST github.com%2Fgregjones%2Fhttpcache%2F@v%2Fv0.0.0-20180305231024-9cad4c3443a7.mod 38 BLAKE2B 1ee03077667437ef310e0e9d77f917474151294d0ae6654596884b28fa847c4be1fc994e4a2dd00d4551d5a4550e14edf1757f5061c44b527cff91353944b989 SHA512 5500094712db06267cf0d437e774bb1b4df9affcebd73ac218259f089f035df59c7ef38e6f36197014acbe1c8b08806734cd27c85a4bc86cd62fd9196d7f5b3a
 DIST github.com%2Fgrpc-ecosystem%2Fgo-grpc-middleware%2F@v%2Fv1.0.0.mod 52 BLAKE2B 51b2a4332061cdef080fa53a14d29b65645776c1077922e6cc37f02db2ddaf924c0f2f71c2cca4586c582075c7cf76861161ccf39d11cf803482276b78321b15 SHA512 6e5556550286ca0fed117d3db2f43d6023d7f0e7625762ca76c773e410fe51d6092c6acb574db7578284188bbf79cb9050aab7000f09510338b24195ea395945
+DIST github.com%2Fgrpc-ecosystem%2Fgo-grpc-middleware%2F@v%2Fv1.0.1-0.20190118093823-f849b5445de4.mod 52 BLAKE2B 51b2a4332061cdef080fa53a14d29b65645776c1077922e6cc37f02db2ddaf924c0f2f71c2cca4586c582075c7cf76861161ccf39d11cf803482276b78321b15 SHA512 6e5556550286ca0fed117d3db2f43d6023d7f0e7625762ca76c773e410fe51d6092c6acb574db7578284188bbf79cb9050aab7000f09510338b24195ea395945
 DIST github.com%2Fgrpc-ecosystem%2Fgo-grpc-middleware%2F@v%2Fv1.1.0.mod 613 BLAKE2B b44c16f9b7d3d98bf2443388c993fdfa2e3ef12701a2517673d02ff1e2f8af172c59fffb5209e2bd614a94dbd7025f7f3aa4016efed8739ef60b71d21950ccbe SHA512 e5e04af7c8223f2455614409c8bc5e856b0fa66ec84289bdc96d2bbdc5d800136e93e862b10dcdacd1e8d6ebdfbcd1d56f3f9725588c92b618b09cef2557e3bd
 DIST github.com%2Fgrpc-ecosystem%2Fgo-grpc-prometheus%2F@v%2Fv1.2.0.mod 52 BLAKE2B 9e5de5c147fb3f100119fc7c290e9790af57892762b7ea8b2a8328c397432466ba56ee20b64ced6dc548d58bf8ef0ecb2e62a51de2524f90a0ff39921d0f2a3f SHA512 c9e15e4a4436ffdedfe5ece51858a45806d6fd77d2306c35eb986a866a3da5bec0d5d06ddba55a05ca45c8c29a51bc7c58150849b5dbde569a6810012f3ace4e
 DIST github.com%2Fgrpc-ecosystem%2Fgrpc-gateway%2F@v%2Fv1.12.1.mod 535 BLAKE2B 2be9f841d89f87d8b4d2935360953fc003863569b6caafcbfbc17fa8c3f08b480c6a565861db774a4ac3b40539c42185e00d9ab3d4611ae7a92d8bf1acc5553b SHA512 f803cd5c2d7b959df845c0c0f118573718be692698685c1e8201aaea744279aa32b4f8a930e57dbc2fcacd5872498d253849066a97dfa832a45a309569e4e992
@@ -431,19 +474,39 @@ DIST github.com%2Fgrpc-ecosystem%2Fgrpc-gateway%2F@v%2Fv1.12.1.zip 572297 BLAKE2
 DIST github.com%2Fgrpc-ecosystem%2Fgrpc-gateway%2F@v%2Fv1.5.0.mod 46 BLAKE2B a909a61754bdc458c27211bf62b57f4ead8065bcb84511f4fc8c6fa77f56d78ca714e7e311035c1544d92f596de2fca56bcc767f9aa360d8d2cc36b7301fde21 SHA512 b1c1ceafb509b0b3c2b1c5fa0a28281880084a63a071a32f6ea4a04dcd2b2c455c9824414da7f767b1e039a079b6a40c0505a2e71991b9e737c1ba01947ea434
 DIST github.com%2Fgrpc-ecosystem%2Fgrpc-gateway%2F@v%2Fv1.8.5.mod 661 BLAKE2B c7566b98c99bd43fb31dcd6de0086533bc499df099dbfc3c37aeba4996bbf46cf11b98e0c356ecebd0c7adbcabf4ab54fb31c41309287c26c083e78cd1639451 SHA512 35fbfcc2b6fb04830cf6d4966469ccf37e4b7593c8d8c5479dd2322722bb325b7f303ca836989c3ea96f862a4c85bae7863c415f94b72bb91742763ef08bcb49
 DIST github.com%2Fgrpc-ecosystem%2Fgrpc-gateway%2F@v%2Fv1.9.0.mod 661 BLAKE2B c7566b98c99bd43fb31dcd6de0086533bc499df099dbfc3c37aeba4996bbf46cf11b98e0c356ecebd0c7adbcabf4ab54fb31c41309287c26c083e78cd1639451 SHA512 35fbfcc2b6fb04830cf6d4966469ccf37e4b7593c8d8c5479dd2322722bb325b7f303ca836989c3ea96f862a4c85bae7863c415f94b72bb91742763ef08bcb49
+DIST github.com%2Fgrpc-ecosystem%2Fgrpc-gateway%2F@v%2Fv1.9.5.mod 661 BLAKE2B c7566b98c99bd43fb31dcd6de0086533bc499df099dbfc3c37aeba4996bbf46cf11b98e0c356ecebd0c7adbcabf4ab54fb31c41309287c26c083e78cd1639451 SHA512 35fbfcc2b6fb04830cf6d4966469ccf37e4b7593c8d8c5479dd2322722bb325b7f303ca836989c3ea96f862a4c85bae7863c415f94b72bb91742763ef08bcb49
 DIST github.com%2Fh2non%2Fparth%2F@v%2Fv0.0.0-20190131123155-b4df798d6542.mod 30 BLAKE2B 1b23384397af6f7f44ae78fb4b3c33bb4ea9b982068597a40e67839791af178f96ca280f14d56678b4cf7afdcaf0acb410a1a7a96e2ce1f6b18d945d7e4e7e8a SHA512 9ffd1d80d503a9dac8286873a705320cae5acb96f7125d76d501890702727ff34f12cdfaef33743a248574a3002a4eb8a2e86f932e7c5da72f5770186427870d
 DIST github.com%2Fh2non%2Fparth%2F@v%2Fv0.0.0-20190131123155-b4df798d6542.zip 13100 BLAKE2B 0eac7069a495b3f96395edfbeed5fe92c91e2f79f3f7fb1a6ae6e8a692c80a4e82b6b88ebb8942927f78e7d5eaa21b7297e4f0de70f6d4849f01cc67f5d90cd3 SHA512 8f04f7d4d8cdc2ab2f5976186e43da178739f8ff0f19e7aa767076393257820a0bf90ed1615db339187fed48454d2af61104ed1e390b58169447ea9dce12490a
+DIST github.com%2Fhashicorp%2Fconsul%2Fapi%2F@v%2Fv1.3.0.mod 449 BLAKE2B b4fd520f53e935f4e33630427d57ba97a516afc5c20d4b4c62d06cefa9f77c6f2a043afacf95c9e496e8ff573c8feaa638987ffe014d4432555725a9c9f920dd SHA512 ef9f64ec39004adc78f354ecd2c614f0c76cde23549fbbd778b458699f4aa104972fb2e5c270e7e223fff6354c309873c4c3611c8d746d2045f2a69dac861830
+DIST github.com%2Fhashicorp%2Fconsul%2Fsdk%2F@v%2Fv0.3.0.mod 220 BLAKE2B bfe2c5d746b4762c2a5e90ebf1db1e0489fae5f8de20cc1a16f4c9aaba016fc4500251efd3daa8a14b0a6145220b6e429ce1608cf11d7d69605c68fbcdddb684 SHA512 883151379f088d2645429c88fd2fc598b736fcee56feed40d05efe4540562d409cb54ec061b58d9dfd5f8a363bf3e5183af3a44cc669ce23ac7fc7b9f512950c
+DIST github.com%2Fhashicorp%2Ferrwrap%2F@v%2Fv1.0.0.mod 36 BLAKE2B e3101c1f32c24b5d5bd3de55b4f15645e7f0b338cdcfa00d30cc4c063bf4e9e31e68972979e8282d04920ffcb54f112c8c8f6e0e109824e56881a6a699cdf622 SHA512 2b68ca06311d8602f04eb738a68a24951a9187aa70018d938e549cf7b555bf54dadbda5825501436c52f6103bcd220ed170c99e4cf777187e2b997c87f05fb0d
+DIST github.com%2Fhashicorp%2Fgo-cleanhttp%2F@v%2Fv0.5.1.mod 41 BLAKE2B 927bedbe012a3bba2fb1363bf0157795f58be7dde5d303332f72ae6d7bd13775e9e1e034db821821857801b21b2366a92a28bcb84c00704a12925db0ce19a4e4 SHA512 302b6f472b54597aaeb4b43528098b5a5264acc97abf2228d8cb62bf32e6a29a7171ec6fb8898b494ffe837ee044e58f5596bff425214985aacd2b8b69934341
+DIST github.com%2Fhashicorp%2Fgo-immutable-radix%2F@v%2Fv1.0.0.mod 137 BLAKE2B ca790b5dd3ebd80c7fa24936acad0e033a7376302440c349d53debe64672d75703e83086fdaab607bb87dca35fe7640b2ed941069692dfc9ae37d4a256c7be3e SHA512 aadecf34782d4b40af684ef29e5e45f560d3593b52d5b6ac6b95664c02c04565fd29dc2d48bf1519091129b86856aec732fde408a8acdba41ff9a7ca12bab140
+DIST github.com%2Fhashicorp%2Fgo-msgpack%2F@v%2Fv0.5.3.mod 39 BLAKE2B c5b445c060258545233b5453482e0c739f815c1ff605b539610f3b0bdbadb6da88954c6a408084f171354256bb8521b528573f56080d4125f4fac474ff9bde83 SHA512 45b4424a023ea15d95167322e022269e32f7a718dbeaf192d0cee9f6bd136f5b4a26827d6d041a8103a95f622a0dc92123b32e6463254199893f360ad8680de0
+DIST github.com%2Fhashicorp%2Fgo-multierror%2F@v%2Fv1.0.0.mod 87 BLAKE2B 34587a565b583aac6338d7d23b4e7c2ce12deb6700e00bec711d3d8d829ef1ae356eb1b28873d5bc2a0d6ed249dd6095539a1dfd8c177bec32e08d97f4003620 SHA512 d47dfa43806a386eb74b60f692b3bc580997edb9d7feff6633992a5adbf94d102a238e036d828952e204960152c62895288af6f09e2582e8b1408d259fb834c0
+DIST github.com%2Fhashicorp%2Fgo-rootcerts%2F@v%2Fv1.0.0.mod 89 BLAKE2B 9e53a988f41eb9425cc2fe3051c0bbe67c65208e6988ae1b455450183c225739b540edb0e59cdd8d010c34e89c4e4acb70687c2bcb861d379443a5c36e261458 SHA512 3446ae69871561766d2b70963eccaf443edafd9328f0f58a97630fde61fa746e59d26ee5d833548a92711555656aa9c1f44bb9e241aa87e21f4424a1f10fbe1a
+DIST github.com%2Fhashicorp%2Fgo-sockaddr%2F@v%2Fv1.0.0.mod 40 BLAKE2B 211ec0a2a2a91bfe13a6ad5d7c6cac97497b62796053c633e945a51aa13dc946b6dee1adf040db0e270e1aeca614a43242673dfe44baf06034856d89a61b4030 SHA512 756eee5fa17dc2f37aa9bd623aa2ea86e6ca35a804da1b48067b08fcabd4083ebcca867bb3562453d17f517aa1e6aaec0143cf5776fdf3686ed562f11147293d
+DIST github.com%2Fhashicorp%2Fgo-syslog%2F@v%2Fv1.0.0.mod 38 BLAKE2B 9696a247ecfb868250995f7fde811a647e8b01d6f3a33996109c44aaa16bc85c0c70e9bc621857db7208f5ef49706cd3b2313f13b9e6f3327aebac20f72b4a8f SHA512 dec8c92389eca1dc304cce77cc70a3b51940f073581320117627c759edd5b523c379473179865f1e3e3f86deb9f323a5fff54951871053ed43293b0454182871
+DIST github.com%2Fhashicorp%2Fgo-uuid%2F@v%2Fv1.0.0.mod 36 BLAKE2B 8596defaedca9def85f29cb25a0ae25f8d2ec8eb64d64bd143a237d54d4d23b6851cad71a580667127188cc22d499be07628ce9c916dba946e7b189b612cfc76 SHA512 900755decba72d81cb348184648aa676c4a4c7359cc88ba3b41ebdd7691eeff401a41a495bdca7747e82274b3b2b61499b599e67b5c7369caaf766ea3e488d0e
+DIST github.com%2Fhashicorp%2Fgo-uuid%2F@v%2Fv1.0.1.mod 36 BLAKE2B 8596defaedca9def85f29cb25a0ae25f8d2ec8eb64d64bd143a237d54d4d23b6851cad71a580667127188cc22d499be07628ce9c916dba946e7b189b612cfc76 SHA512 900755decba72d81cb348184648aa676c4a4c7359cc88ba3b41ebdd7691eeff401a41a495bdca7747e82274b3b2b61499b599e67b5c7369caaf766ea3e488d0e
+DIST github.com%2Fhashicorp%2Fgo-version%2F@v%2Fv1.2.0.mod 39 BLAKE2B 65fa1ffbb1bf64cb9bd4830d71ef2ac2fd2344849de31367b61b8c54cf6d2ed8193f54b32937e0f80298b1e59b08fc291d52c91955be5b1fcbfecc4851f16e5c SHA512 40ee5ae5f6991a06b8ef61f04349a5012e36932b53c678dee58d25fc1bae386d6d431de4167641721c28f686071439fb8c9c250bf9607e9743a7280244618d87
+DIST github.com%2Fhashicorp%2Fgo.net%2F@v%2Fv0.0.1.mod 35 BLAKE2B e084dc4953a472039fcdbfaceb0046f7af0cbe4078af4f2560457d8a47e3bf4654c725578f4f54ca1d41f48e37ff6bd1b3968e9b061773ce9fbda5fa5c50f17f SHA512 a36b4a70bb4b943055ad91fc4f754d55473b48f1e6330c9526e4a50dc4aba3b3462b787c71d7f2e863f78518e945ce15f9198a9bd0d6817146f92799733460f1
 DIST github.com%2Fhashicorp%2Fgolang-lru%2F@v%2Fv0.5.0.mod 39 BLAKE2B 13f90f934356dd1daefd27a94bb7a8c31f09835ea69f3fc83d343004858c6728bdd6bfaaa919331f7ee04744d18ac37f46a13be9feaa20e24e88ee364991a9b0 SHA512 bc3e0c3b16454e0f079bef539857c22f09ebf11e78ac1744a22f5af87d7297979b7ccdd48e4f59605cac562c268c3cacdbf2745f65be5c934f73f216707120e1
 DIST github.com%2Fhashicorp%2Fgolang-lru%2F@v%2Fv0.5.1.mod 39 BLAKE2B 13f90f934356dd1daefd27a94bb7a8c31f09835ea69f3fc83d343004858c6728bdd6bfaaa919331f7ee04744d18ac37f46a13be9feaa20e24e88ee364991a9b0 SHA512 bc3e0c3b16454e0f079bef539857c22f09ebf11e78ac1744a22f5af87d7297979b7ccdd48e4f59605cac562c268c3cacdbf2745f65be5c934f73f216707120e1
 DIST github.com%2Fhashicorp%2Fgolang-lru%2F@v%2Fv0.5.3.mod 48 BLAKE2B d49fb83b0e128d1d891c78fd7efc4d1f6c92ff9ba30943fcda9b89d752d468836df7c37d6f30d1b4e8eaa5cd966c4b2ec90efc087887f037cce94654761ac107 SHA512 a55d0882366adebd894e5ebf9de5f70ac8b5f8f945e52b7dac8e56b4efc03f40930d132ac03bacb51ca220bad114940b9e27bc0ecbb92dc739691674a8aa5e15
 DIST github.com%2Fhashicorp%2Fhcl%2F@v%2Fv0.0.0-20180404174102-ef8a98b0bbce.mod 32 BLAKE2B 8b645c7230638dd2b30ad68a01a18237d6bbc0ae6d2fc671706a7785c9ff50eedbb3beb06e0ebd28b7053fd20ff648606a54226ba95fda6e9deafaf5cab367be SHA512 748afdd4b790c0fa1464b492b79164ef83ae56cdcde204d19adee8b24a755455921132a71af714d78f726cfd7621dc03f85b383d6f26adf9501457573dce26af
 DIST github.com%2Fhashicorp%2Fhcl%2F@v%2Fv1.0.0.mod 75 BLAKE2B a44a3c2185418f331e2648bdef36882414dbf8416884b8fd385b7e926c9b837d317322a433e7312e14c27eb095cbed26a74eec9822f0f063a2d14e753031f632 SHA512 045ed40015294ebd8f7a6df06b418415da8f091d09fb4d34fd70718bbf5ce9f49dca7399dc5649336de3fc83bbbd93e740ad6f62d41ea540fae3b17f349cd66b
+DIST github.com%2Fhashicorp%2Flogutils%2F@v%2Fv1.0.0.mod 37 BLAKE2B b9e2cfa29511ec268d1dc1e0d8a8eeeaf1c246c1cd828fe6c2618c2f7d313deb4456e5d35d60034825585430da755b96d25ee003028f55c1b2aebaee2fbda535 SHA512 82c9a364ab098ebb6f830753e089529036cb405aed375df5b55459b203a1d2d02299103925bcf4dff94bf4868e7005f114367e90fd2d24d5f1db3e0287628f66
+DIST github.com%2Fhashicorp%2Fmdns%2F@v%2Fv1.0.0.mod 376 BLAKE2B dd92d033685d65d1876a52156317b2f1196028c035f6ef039849df4066b93fc518e9f9c06a666b4fb1fb803d984266f57fd9eecd891e241bc50f8b54ed6a9952 SHA512 541dffe3beadcf5eeebe266671462e3827262ae700a146c4a08700b325018b183252650b50a7d4e539e872c0b6e5d7e35de4f1abdd955dcad51543ea6b22acc1
+DIST github.com%2Fhashicorp%2Fmemberlist%2F@v%2Fv0.1.3.mod 921 BLAKE2B df064db28a23bae411857c5abc0e9a0e4635556e51326db806eaa79008505c49b9ed1579a7db6f72a9cbd6128fc10cb858cdaac6d71725fa4b21b43526767c04 SHA512 8128789efce7912b540284205af308c33ab47af7dcbcb165c1d0a86e342b17bbc8dc5c8cd6d5c5e751c412b6b4b8e80bb6d2f3b4fadd813dc147301ec27c45b6
+DIST github.com%2Fhashicorp%2Fserf%2F@v%2Fv0.8.2.mod 774 BLAKE2B 3b47f3c78972eb538f84348d5e698a2e44d86d4f51316b8cf596be23433e91a763c24ea9463cea0f52476c656067ee4e254d5cb905464d7e32a6b69aaed0bb56 SHA512 7fb4f6b07a08973d6cf33be6f03356eb1b176d816955274a4aa1571b8965fc311ff0c832901fe9a716c5d5bb697e7c861c458ce618fd7d2d4eecb316b2efbbdd
 DIST github.com%2Fhpcloud%2Ftail%2F@v%2Fv1.0.0.mod 31 BLAKE2B 7202132cff9b47a4484c61586949dbf7e13622067675cdd09dace3ce2e5b3a37b6fc5275b3bd6dbb0ec6ca0335bb7c9a036cc043b2d8ff1f38bc90ce13041aec SHA512 54a5bbc02b82693a977a4f690314b16d94cf071decddee3a4af2a90398e626ff188bc34ab3517278e7aac4e657f3f3070a020c85274be3750371dfdeee139b23
 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%2Fhudl%2Ffargo%2F@v%2Fv1.3.0.mod 29 BLAKE2B 7cd37a0dd89dc331943531c8477a4773980f42e0c135a159bcee3ae6bd82aa8f15c4d67e7fa60878a35c7fcb69d647738095087775e18c540059fff6f4dc192a SHA512 28dafc16202503db863783e4701ab30b34c71b4435a4859329fa635c0915f0ca408dcd8c73217e0751f879400845d8136e171bde5d0cf6b7fa7ec4ae3ea97f69
 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
@@ -453,6 +516,7 @@ DIST github.com%2Fimdario%2Fmergo%2F@v%2Fv0.3.7.zip 26261 BLAKE2B 65c5f6b4f0e2af
 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%2Finfluxdata%2Finfluxdb1-client%2F@v%2Fv0.0.0-20191209144304-8bf82d3c094d.mod 46 BLAKE2B 825c65ce0e045d5c764d3ccae81a25c6224c44656bb8ceb93f39d06a0c8d766ce7562e5ea1ceed903a5d1ad4c035e27ee84b4311548d024e108a5cd6ca142508 SHA512 324450602d8234231b0cf40b07e8936948487354b8f6e92012f3e65ba3c646b0993e4722d3867a12d0bd3749c8dd6fca4a1118393e2ca682170e500b3d54e5fd
 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
@@ -460,6 +524,7 @@ DIST github.com%2Fjmespath%2Fgo-jmespath%2F@v%2Fv0.0.0-20180206201540-c2b33e8439
 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%2Fjpillora%2Fbackoff%2F@v%2Fv1.0.0.mod 44 BLAKE2B eb9ba00998f4a45590f7ab28d94adcda4e2b511ae7078f5583bfdcc792d34b6eded81b8c0f71ced35b782cd1bf344542673677915b44b9eb31873e9c5d69e133 SHA512 4d591cc0f2d11ba450f294361950972fe0dd71bdff5bb0c3e72b673cad6ea990335680bf7650093e1f9978bc8556a0ef9329ae2e8a14c10b7de668aead7afe33
 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
@@ -477,6 +542,7 @@ DIST github.com%2Fjuju%2Fansiterm%2F@v%2Fv0.0.0-20180109212912-720a0952cc2a.mod
 DIST github.com%2Fjuju%2Fansiterm%2F@v%2Fv0.0.0-20180109212912-720a0952cc2a.zip 24106 BLAKE2B 9dbfd461ee5e9d9548a6021d588e3ad36e33c034d452ac180882892a933eb69000b062cf698b11ac2b87ece4efc744881906494370982d60d7493416179eb128 SHA512 4ef8c6620f596b1bf3145cb7745d661206bdd53a9495515f6afbe143a1fd2dab680e8bad412fba583279488040594d59750bf90859396c49082ba7c090d7ecd2
 DIST github.com%2Fjuju%2Fratelimit%2F@v%2Fv1.0.1.mod 33 BLAKE2B 529c89dc43822871a3108f93bd29db8bccc63d1ee1c44b0d1c3da6cf966bdef90f7960878ed4ae8e6a4407189bcab08b70b960f224f8ba57db7ff118458777ce SHA512 81a0934c2626af125a116aa22457e47f16487546b4367a1e2b160144b4e2244723986e83914e365543e7f265ca2a953112f934627ce03aa39568f2c8f0c0124f
 DIST github.com%2Fjulienschmidt%2Fhttprouter%2F@v%2Fv1.2.0.mod 43 BLAKE2B 2b7883d00bddf90261a91670917e335bf5c59101032ed3ef5ab6752eb4da25e8417071b1d0021441fd887158b519f4fca4b028b6ea52fe3ae9a41b84441c8c06 SHA512 60340233f2a0205ee4b1a7b2d78ed52d88fe5d39887413d0e62d6ed006c51eda83ac117454b0c1a31ab29c5aceae13810ec719dadc554d10480219c1afc3e5bc
+DIST github.com%2Fjulienschmidt%2Fhttprouter%2F@v%2Fv1.3.0.mod 51 BLAKE2B 2e102c58874af58833146011d2b9d64950522530e5bb51d643b06f98b258d7cb52efa2caa36a1fd4d39d4307a37712de7f22d45990ebab7a755b7cacedcc861f SHA512 e208321653fa4f40d2af68b6db37a368134e27463a45691a1642bfbe67186efa2a6fa41cddb3e443e465c7425d8d44cee8364953b39e1b08fc16b447431cecb3
 DIST github.com%2Fkballard%2Fgo-shellquote%2F@v%2Fv0.0.0-20180428030007-95032a82bc51.mod 41 BLAKE2B e9dae477e838938303749c4e7f1d0ece371d20bfb8f0d6fbb915a9ec249b82e300ef691c2175137488065828f67b02503576420fc95c2aa40f4fda262526dc7a SHA512 ab1be2f5ee91ad8c24a7c1d3c2277506dd76f85e8511f53e923ea7e0ecba140303c9312f0ecd2e09631e2e6591ad31a3b19e900ec102b486ed9b56c38a0d0c84
 DIST github.com%2Fkisielk%2Ferrcheck%2F@v%2Fv1.1.0.mod 143 BLAKE2B 128f8934f81d0e497e1258ec65129fe5d8831b66058669a5aef3fdb2fbe5f6d8ab30bfe97a1de7befadd34aafd55d6d15bb787e8948fb7718761392817203874 SHA512 c5e546822036a7114a29454e28290f8e1082392a47a101fb1d370e0969fc2c83186b4487473f903dd638abb8a763ce3180dc87993906895a2df33db7d8bc4790
 DIST github.com%2Fkisielk%2Ferrcheck%2F@v%2Fv1.2.0.mod 98 BLAKE2B b9d3c55999054ed927f666a43066ccc6758a6c5f550651f43ad5d85b5403c882ee76ac2b2553803d71789da33c60ea41857ed545003072ab6c666dbb77118e00 SHA512 3529b37d770af511a716a612b7fd7fb6a4805d13166e3a6f9378950443f6eceb2f3d95db5a46027437ce55b36e571c75bba72a03769d21ecdc97888019d80a68
@@ -486,6 +552,8 @@ DIST github.com%2Fklauspost%2Fcompress%2F@v%2Fv1.10.4.mod 46 BLAKE2B b5879e59b70
 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.11.3.mod 46 BLAKE2B b5879e59b7061f16bd04702694188fc8b148c5089aa7a3a195c9fce7c349bd191dda7dc3172f88f0d546cb8c3eaaa82eac73720992509baad59757c740d277f2 SHA512 55b1b23e692eed7e5cd2789b542c27eb85c019460a1ea75bfb31802263328b53da1a466e4b09085e4e002dc699047bf3ef5ab003022a6182c9b762e0b812febd
+DIST github.com%2Fklauspost%2Fcompress%2F@v%2Fv1.11.3.zip 17429355 BLAKE2B 8a95287e031087b368ec4fd7dd27c3515e901e091f82b9eb11c1f110e66e7eeff3c80103bcbec53ab47efdd78198bd07eb7c0f8d573e2cf277fdc18a08700724 SHA512 94f9a98b33011db2d24213ecb51c701951e323d45c671bd9ea8d091de45c5e5899650a6fa120c6602e0883e637e2204f4c5e905810ac8aafcf980dd9f35ab905
 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
@@ -494,11 +562,15 @@ DIST github.com%2Fklauspost%2Fcpuid%2F@v%2Fv1.2.3.mod 34 BLAKE2B 1fea82f0ae24add
 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%2Fklauspost%2Fcpuid%2Fv2%2F@v%2Fv2.0.1.mod 46 BLAKE2B 1b395032bc9be34d676b49f478c04109fe1dd010544690d6c1bdacc28a17489dce66c8edf61ea9de139feae36bf393c0180dc2f6b73d54e5e0884a7fdbb25b37 SHA512 16bc59642bcbc705e57b1862066193a922b9c98b271cb1b2c3b98886b06d7d5f6e73b272e61432c809b569fd9715ec00725266f5a4954e0812855e093cd87093
+DIST github.com%2Fklauspost%2Fcpuid%2Fv2%2F@v%2Fv2.0.1.zip 345134 BLAKE2B 07b7ffb7a6375c6ea089a0eeba9c6fbf6e5af0b08638b88caca0da0d4b9210e0360d99ac83af1ccbfee4fe2ff43ec72691c0d85ad7c180e618931937cbcaa044 SHA512 b2229cc7bd2ad216d6aadd9de35e2a5102246173b5d01416e328404fe7bc9abc8c06c8c084299ab563a0f5dfc90481c5bfbf6b40c9910999d0f38285cab3c9f1
 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
 DIST github.com%2Fkonsorten%2Fgo-windows-terminal-sequences%2F@v%2Fv1.0.2.mod 58 BLAKE2B 4cf48282c28d2b8237fe9ff852ad25d102cce038fbd1852a1938bcf69c895df05dfdef6e533b3c0b4da28103eb5e3a9561f802414ccdd99b2d3ec2e2db0807ee SHA512 fe33ca4de6588b95f0155458b8b6daab218553b58de5dac220efe54019dfab085838cc6a22012a106fa36a6094447f744825cad04aaf0b158fce5aa676048fe5
 DIST github.com%2Fkonsorten%2Fgo-windows-terminal-sequences%2F@v%2Fv1.0.2.zip 3968 BLAKE2B 223cfe3604cb674a11d4558b8f5a35e2eb41cf11d536e2e2cbdccd6a3c6bed8abf66f450774b39e7247493ea8a382906617c5f297fda02a272b18eef8dcbcf47 SHA512 16c4bf83b78541d2d684113926813ce4cc91f3f13f34dc2cf8d643661dc9f21a988b8382d2c058e138fc87c1ca197e8f694b07595959e917c82bd6ca9101a5ec
+DIST github.com%2Fkonsorten%2Fgo-windows-terminal-sequences%2F@v%2Fv1.0.3.mod 58 BLAKE2B 4cf48282c28d2b8237fe9ff852ad25d102cce038fbd1852a1938bcf69c895df05dfdef6e533b3c0b4da28103eb5e3a9561f802414ccdd99b2d3ec2e2db0807ee SHA512 fe33ca4de6588b95f0155458b8b6daab218553b58de5dac220efe54019dfab085838cc6a22012a106fa36a6094447f744825cad04aaf0b158fce5aa676048fe5
+DIST github.com%2Fkonsorten%2Fgo-windows-terminal-sequences%2F@v%2Fv1.0.3.zip 3966 BLAKE2B b638ca22c4f9df8cce5b84837e4f72b009c1ead300c08807b8268d26f04d6cc5476d9af56f676d8f4ac046c78c333614670e0853bee13de3439b5d89b96bfbb0 SHA512 ff98f8c05d8e23fca69ee5ed780e728f9d1779ab55cecd16bff890a91d14af81ae7a0304f34b3e04fbcbbb61e3c97c044dd9c190bd8359f3b19bdd31f8a37329
 DIST github.com%2Fkr%2Flogfmt%2F@v%2Fv0.0.0-20140226030751-b84e30acd515.mod 28 BLAKE2B fddd4b3cdef60f53bc3f8da5a3154d10b49dd180c12837d3740c22b442947cba2025649f3ac7321bcf0c73a272527659b0ccd9be141ddca13caa7594bf6ad3fe SHA512 3c623d077e39697506174a50c0380cb7787a05a52819b1a73c2f64ba8dd819fd500777de83c83d8d9e80f19c828128a569b4cd783667b4d6b9a375b0e3d527a7
 DIST github.com%2Fkr%2Fpretty%2F@v%2Fv0.1.0.mod 67 BLAKE2B 2e1b4a8a38998179a32db321d331db54f881770a89719410876cdde1799cb8558ca2862bc70838d606540606d05918c4b115cf1c125945a77ed376c2efc4aa85 SHA512 4d841fc7a022e4e09e0a95925ad92a75809a67c30fb88de9190e4a2196383038dab9a5b3294b6a0b4786248977a0e09eea857a34100cbf22f8a52912ce9fa58d
 DIST github.com%2Fkr%2Fpretty%2F@v%2Fv0.1.0.zip 11159 BLAKE2B c176e4bc9b5534b0df153e027f22be7d28eefbea1c0adab10979f19d601b95d300c54086b5ee388f453c73b9931339b9b04208fc5e6512385b348c49faff5488 SHA512 bad73f3c47f70de55a90a977a1e2b4a68de545a8425c71533de081c7a8f71d7ab1b489001c56ba2e88dcb78c08804275f7f8128c812f50d005a074ed6dd9286f
@@ -520,6 +592,8 @@ DIST github.com%2Flibdns%2Flibdns%2F@v%2Fv0.0.0-20200501023120-186724ffc821.mod
 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%2Flightstep%2Flightstep-tracer-common%2Fgolang%2Fgogo%2F@v%2Fv0.0.0-20190605223551-bc2310a04743.mod 267 BLAKE2B d2298b42ba1b8aed99658a846dd1ff5cadf5403411766efaa880ecd043a56703ac1089ea5edb04b391d710d99f9b1a1471628043be868fededf189130bf852e4 SHA512 76b19a140339b43774f3df87d1de97dd4bbdbf5939f523fe39faca051dd2a4b9e719dc147a0a2f931fd30871c30eb6a628d58bded12271e04f6de5d9dbab497d
+DIST github.com%2Flightstep%2Flightstep-tracer-go%2F@v%2Fv0.18.1.mod 414 BLAKE2B c0bcdf3e0a6f510eb3649030349e26c3d78608af9ea46150e891c17463491da92c544562b60cfaf35b8e6e11cba5b43bcfe0a8bbc3e3cf7832ba6114ba8cd9ae SHA512 1ca2109c477bea717b8f66a2d57c35373adea2fcaf4223d85770be21833824334e4f9010c1257db95e345d1fcab540c96a40e9abd7bb51cd993559c224e79500
 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
@@ -529,8 +603,11 @@ DIST github.com%2Flucas-clemente%2Fquic-go%2F@v%2Fv0.15.3.mod 582 BLAKE2B 359b64
 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%2Flucas-clemente%2Fquic-go%2F@v%2Fv0.19.3.mod 814 BLAKE2B 110bd6c2e87e936b8574c0bc0a765dd34cc747c238aa88f6e595cefeee516df985bba5a21fb9dc9d871e543b097f08f413134c16d22e18aaddf5427b88de1199 SHA512 3c8afad992ae7ddb5a98dc28d410465b8b46e660f69957fb8dfe3451ebace00bbd8fb7b9ec9998ce6129df3300b2eb8153edf26181641d44f9c9c063225b62f2
+DIST github.com%2Flucas-clemente%2Fquic-go%2F@v%2Fv0.19.3.zip 728621 BLAKE2B 74936af3fed3ccaf9ce932a8b75b5dca7c23fac9295dc69a133277da579ab9e5b6203e3dc0fbafaf8ee7fa84c514c2e347d8e527bdf466836b12d1392765b383 SHA512 791bb623c9decfb027bd450b7f789616d737ef7ddbe1b4a89b33e9167dce8b65be66820fb82171ffe30a8ace37c9ec14060cc936d33a2264f08d160aac33266d
 DIST github.com%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%2Flyft%2Fprotoc-gen-validate%2F@v%2Fv0.0.13.mod 43 BLAKE2B f49107f68b9d73c573cfe976efad9dfb5b4555aecc4b15eb4b1592d1ced4cd1cd09f1d2483e7476f8732dd1404a07d9d9a35df84c944cbe21b46409dc5802265 SHA512 f4286a907eaf928904461716aaec3d5e58a826f2f50c6568f70aacd2f14c9d226bb633ebf9fbc8e492961ca23f459be0c49b1ddc644fadcb7e90e99818fb03bd
 DIST github.com%2Fmagiconair%2Fproperties%2F@v%2Fv1.7.6.mod 40 BLAKE2B b8e71ef21c42894c31d75cce0e7423b21e716de0539a8a7ff462e0d5c05c77795238598630208055ad808af2db8c56a997e7e114ef391c07d380b996ce533544 SHA512 8a724e5cfce28512549e7b06ec42c9e02625adfb3398fd45af07f8c512782002a262e8567669929626814758f9d12041c318bd4258f88d110a851630537bd5d1
 DIST github.com%2Fmagiconair%2Fproperties%2F@v%2Fv1.8.0.mod 40 BLAKE2B b8e71ef21c42894c31d75cce0e7423b21e716de0539a8a7ff462e0d5c05c77795238598630208055ad808af2db8c56a997e7e114ef391c07d380b996ce533544 SHA512 8a724e5cfce28512549e7b06ec42c9e02625adfb3398fd45af07f8c512782002a262e8567669929626814758f9d12041c318bd4258f88d110a851630537bd5d1
 DIST github.com%2Fmagiconair%2Fproperties%2F@v%2Fv1.8.1.mod 40 BLAKE2B b8e71ef21c42894c31d75cce0e7423b21e716de0539a8a7ff462e0d5c05c77795238598630208055ad808af2db8c56a997e7e114ef391c07d380b996ce533544 SHA512 8a724e5cfce28512549e7b06ec42c9e02625adfb3398fd45af07f8c512782002a262e8567669929626814758f9d12041c318bd4258f88d110a851630537bd5d1
@@ -541,12 +618,16 @@ DIST github.com%2Fmarten-seemann%2Fqpack%2F@v%2Fv0.1.0.mod 176 BLAKE2B f13ab7cbc
 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%2Fqpack%2F@v%2Fv0.2.1.mod 178 BLAKE2B 1044039faf6fb3c3d61c9b00ebf83caa7812cdd7b7787945b7f9f106b88899906d646a6f00f81361e14aa48e053a2177309cd59f1a63cabb706a832d5a7cda6c SHA512 3db41fe780063d019ba2e84c08116f754f5cf6de31dd4432364c7f9f808d802218d3eb039e10eec0dba6fe6ab836799663c5f3789a12f308605d0a52934a2960
+DIST github.com%2Fmarten-seemann%2Fqpack%2F@v%2Fv0.2.1.zip 49880 BLAKE2B efa369101ffe9a4f0226aa501c0c43b10752aad6968716bff0f735d8ce59962d76c113312863b00949a7a77563c65161b77c3ea7387c2df3d13ac565d4738671 SHA512 909caa45b28dc73ab52972138f431b45d97e0b98ef2f49f48a86e79b79a93f05187d25af19695e72cdfe6130281685843a2a144ec14addfa1a46bbcdc0b7fbad
 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%2Fmarten-seemann%2Fqtls-go1-15%2F@v%2Fv0.1.1.mod 207 BLAKE2B 5b3d5ad841a5d0141a734651988d7d4fe37edf8f0452606a9368db7ab760986d6910a62c1f9fe404c02eef38f24b01ecb89da7131b8dbf29f771032bf0b26306 SHA512 a1596052f6915fbb2d54b6d5ec302f4005630d26952d42dd645a9beb62dfe65a80715a0de4bd64b04712c40fa3d67bd6ce4abd0c98a07ec0cdf37281ffe91f9a
+DIST github.com%2Fmarten-seemann%2Fqtls-go1-15%2F@v%2Fv0.1.1.zip 589961 BLAKE2B 4f183f3164e6b7dd14c868d2999b31176e68a5a8b5614bff9c170ec41f27a9fb387243aa3b6ce138afc462ef129f2352587d11c8def51ed2565dc1c8c6bb483b SHA512 b2537252e8de3295e2fe3f64b6141686c822b371536eda638be7d3754e3d805c43b6814942c7ce16ac995a478bf321f7161f52d9a96705d097ba0e69d533317e
 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
@@ -573,6 +654,7 @@ DIST github.com%2Fmatttproud%2Fgolang_protobuf_extensions%2F@v%2Fv1.0.1.zip 4437
 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.0.14.mod 28 BLAKE2B 7846fb7a9c146e4b4cd0db250d3a84bca13c7c3b8292ba71215a041006c8ea39a36b88dac7749a9bba96dc463b499633591f6f19d43369067b0f4f46594b8ddc SHA512 4ce4d3df63fbdbfe3505816e81dc7e806554d79cfe0254ce8e0228bc16eafc014c98475c24f4a6e0c6efb6fa16e891e2e47c43c9ea10ce20a95dc69f686f6361
 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
@@ -580,6 +662,7 @@ DIST github.com%2Fmiekg%2Fdns%2F@v%2Fv1.1.27.zip 218584 BLAKE2B 3369bc1602c73ab7
 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%2Fcli%2F@v%2Fv1.0.0.mod 416 BLAKE2B 845f9f6d79c8b18d4a070255eb93aac9afc50ad01593fc5c6076c59e4b5c09f34856b29ab24809a67fd10ffc5cc28908faff8358a52cc8885947c53622d6090d SHA512 7cbcae5e1749c55a0c3fa25b007035c0c44c8f982a37635735afb95c63a20ba019a51e74244c568a170b5a379ccb10cc8c9df716b6261d324755ea92c7f462f4
 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
 DIST github.com%2Fmitchellh%2Fgo-homedir%2F@v%2Fv1.0.0.mod 39 BLAKE2B e28ca0cdd6db21c4b97e47151a6c11487314f26d5a259f9d7f5581f3d92648a57d931e1d6b004597f76cf10916fbe14728c99192e24b6da674de2cdc9cc4e78e SHA512 a2b7ed5a25e6dcab620357d5c216546bdb554edbc6fd927a0703e788d7e7a10a743471d10f5c7cc56ad829ab35c7272c61d210e55947363447832e924844e9ee
@@ -587,7 +670,11 @@ DIST github.com%2Fmitchellh%2Fgo-homedir%2F@v%2Fv1.1.0.mod 39 BLAKE2B e28ca0cdd6
 DIST github.com%2Fmitchellh%2Fgo-homedir%2F@v%2Fv1.1.0.zip 4163 BLAKE2B 7e00360086a04fb62a46ba20a10ac3460b364aa6ee09bf46f9769980c086db04aad45c4cbaa809a218f207c086876678d708a74d0a7679a48cf62b0b5edd48b7 SHA512 06bd620730c303df004e1d6a06a1aab8d83551d594c28e42f8d43613153ac28e6a5dcffaede69c84b2b49027b62581851a332f1397a2d6df9a46078510f7d1e2
 DIST github.com%2Fmitchellh%2Fgo-ps%2F@v%2Fv0.0.0-20170309133038-4fdf99ab2936.mod 34 BLAKE2B c2617f21438d9c66d02b5f99c147c4409aca4892affa6949f59d6c2153b5860a177c90e95ebfc7649c710c19bf1b41693c67db80c4644c9bdb4f3d9c2b16fc07 SHA512 e493fbf1926f5de9c7b499dcfa319c4881e088e6c722537a61a75ca2afafc93a8586bac67fbdab47efa714a1ac8aa47cf196e821aba83662df6d4321a9817e69
 DIST github.com%2Fmitchellh%2Fgo-ps%2F@v%2Fv0.0.0-20190716172923-621e5597135b.mod 34 BLAKE2B c2617f21438d9c66d02b5f99c147c4409aca4892affa6949f59d6c2153b5860a177c90e95ebfc7649c710c19bf1b41693c67db80c4644c9bdb4f3d9c2b16fc07 SHA512 e493fbf1926f5de9c7b499dcfa319c4881e088e6c722537a61a75ca2afafc93a8586bac67fbdab47efa714a1ac8aa47cf196e821aba83662df6d4321a9817e69
+DIST github.com%2Fmitchellh%2Fgo-testing-interface%2F@v%2Fv1.0.0.mod 49 BLAKE2B d388b11419bfd0c80b52fb3bb5a2600712364115efe7b40ac02ba2da11d40ca30dffac19646056a4aa754de05c490d1f68af4549bdd1fab7596dae593eada97d SHA512 3e334e248e9584b050eb81bd23071a8542185c64b5f112f46b82c6842d2b8707099403bbba1b8485d64cd62faaacab3fd52e868bb405ca6e6067034e66ffc51b
 DIST github.com%2Fmitchellh%2Fgo-vnc%2F@v%2Fv0.0.0-20150629162542-723ed9867aed.mod 35 BLAKE2B 4427dfd7f169daf7c63bcfae1116dfddeca583f03e3a9edc24b588eef903f3e7c4f59903a745977be1f778c6250e3a8175bef36a9a8d7adb707759ba22851ce4 SHA512 5fa11d6039c5f030350c61873d6bef1acc27c4aa20ebee97cdf5158adcb55966f03aa5e766a8d0b23978b3fe869817fa2a0648eebac12784eb048e551ed5a5dd
+DIST github.com%2Fmitchellh%2Fgox%2F@v%2Fv0.4.0.mod 32 BLAKE2B d511476a16a86c50db84dbacb40afb4b30ac3f72c4fd5a8b20fdd8bc6de1c46592bd16b24f77bd037dcb23ba86cd217fa740b59a784c6fff0fea1720d2045695 SHA512 451fbf9129c151784d97cfe6af29d27a277b6821411cfa5b23e6730ba0f5d5a830054eb6ed660dd2192c16abd54d5999be5b80e39bbac3499c3198311d01ec1f
+DIST github.com%2Fmitchellh%2Fiochan%2F@v%2Fv1.0.0.mod 35 BLAKE2B 0b603da65c4738d257fb759b8aa3971011ee721c1fc783663e1b26175335c6c90ad56eab45ddb6422e39dc0c6603e13ea64756f8a97bbfcc5e77845248b16a74 SHA512 2249854bef533dc77479041f9dc5610e14c549be1aac292a39b8b74b36c9fc42c04d211d8d5b71082c05971cc26a94a57751c3e61895050d41909270ee5123f3
+DIST github.com%2Fmitchellh%2Fmapstructure%2F@v%2Fv0.0.0-20160808181253-ca63d7c062ee.mod 41 BLAKE2B 291f73049327af60c94a2b2113b8e370f90d2a3fc7074c58ac523ce2a613ebada88ce048a73cf882c68ff552dd6df0be42f796f4ed11a549c0b7ca6c67f61c38 SHA512 7816e3703475601df65f20ad4e5d1f6bbedc4a7c87c594518358c1a9c24421aa5ccb6e8389ad983a514a823674c6f0f771f1f367b10d99691dbd8db7105ec44e
 DIST github.com%2Fmitchellh%2Fmapstructure%2F@v%2Fv0.0.0-20180220230111-00c29f56e238.mod 41 BLAKE2B 291f73049327af60c94a2b2113b8e370f90d2a3fc7074c58ac523ce2a613ebada88ce048a73cf882c68ff552dd6df0be42f796f4ed11a549c0b7ca6c67f61c38 SHA512 7816e3703475601df65f20ad4e5d1f6bbedc4a7c87c594518358c1a9c24421aa5ccb6e8389ad983a514a823674c6f0f771f1f367b10d99691dbd8db7105ec44e
 DIST github.com%2Fmitchellh%2Fmapstructure%2F@v%2Fv1.1.2.mod 41 BLAKE2B 291f73049327af60c94a2b2113b8e370f90d2a3fc7074c58ac523ce2a613ebada88ce048a73cf882c68ff552dd6df0be42f796f4ed11a549c0b7ca6c67f61c38 SHA512 7816e3703475601df65f20ad4e5d1f6bbedc4a7c87c594518358c1a9c24421aa5ccb6e8389ad983a514a823674c6f0f771f1f367b10d99691dbd8db7105ec44e
 DIST github.com%2Fmitchellh%2Fmapstructure%2F@v%2Fv1.1.2.zip 25943 BLAKE2B 9cf08441a9bb45da31ac429a372a969a822a0c5de569352bc25403cdc3e8559a7110dd2612cc9b93c91882973aefdc70f8ddadf44c1488eb0c3f5bc62cca2b73 SHA512 43d57d9ca99ee6af49e8a39be4d65799afccc8cb077a8c5b473a9147eba30d4653a8a4cb86abce66d4c8639d1eb0d961c4a50907ce9af2b2864acb615a2ecfc8
@@ -604,12 +691,20 @@ DIST github.com%2Fmozilla%2Ftls-observatory%2F@v%2Fv0.0.0-20180409132520-8791a20
 DIST github.com%2Fmozilla%2Ftls-observatory%2F@v%2Fv0.0.0-20190404164649-a3c1b6cfecfd.mod 42 BLAKE2B f2c65eda4f8af83b8125816f597f32de21a2fb675e30625c135b92fa603dddab4a253c6151692859ef24c4a4a4b3d68d5dc0506a07d2f86ce28171ca69db1982 SHA512 46deadaef6abd1e87e8aeda576aad66d6b8b49eb95295d6e036197884a4f9564d260a14bbc667bcd646c6fab3ef8eaf2c4307ffdbaf9403923e5b98c5180aff4
 DIST github.com%2Fmreiferson%2Fgo-httpclient%2F@v%2Fv0.0.0-20160630210159-31f0106b4474.mod 43 BLAKE2B ff4c9b108c54fa1040ace39dd53fab92b2feb161110c0f87a9e2cafa95a22938ec6e3ec45958e25a0394583552d23a1a393766ed4eb12a0972f13d953eb4570a SHA512 d5568a21faa8f0bf90f7091bef6b024cfdd7cf979943dcd658a8026e4fd252ec2751c2ecf7f6f7e7889ace70868f96261b226af6d533f3d401b476e99d5e100b
 DIST github.com%2Fmwitkow%2Fgo-conntrack%2F@v%2Fv0.0.0-20161129095857-cc309e4a2223.mod 39 BLAKE2B 391eaf696f1a5c764f9e156ae3f6285ae5bf8a4abf2a735fd13fd1591f3bb97737502b79df093156305503ed4b63e0d458900e61fa8717f96ee17a6d43bc2f79 SHA512 9fccb6717f5b37cff2d858cc31f7e16aed120a67498c2f0d24aa30ffac4eba2e87822b12d62f700a0c62d7561708bab2e13e35e89cf5407cfb06a0de5c70808b
+DIST github.com%2Fmwitkow%2Fgo-conntrack%2F@v%2Fv0.0.0-20190716064945-2f068394615f.mod 39 BLAKE2B 391eaf696f1a5c764f9e156ae3f6285ae5bf8a4abf2a735fd13fd1591f3bb97737502b79df093156305503ed4b63e0d458900e61fa8717f96ee17a6d43bc2f79 SHA512 9fccb6717f5b37cff2d858cc31f7e16aed120a67498c2f0d24aa30ffac4eba2e87822b12d62f700a0c62d7561708bab2e13e35e89cf5407cfb06a0de5c70808b
 DIST github.com%2Fnamedotcom%2Fgo%2F@v%2Fv0.0.0-20180403034216-08470befbe04.mod 32 BLAKE2B a2c30f1489eee8da31831e7a160dd0a2a9d456e7c59dbb902f97daa3676b9bc12376da69ac3770ea613f3fd862eea3736d3144144d4ce426c70aeefb1d2fbeaf SHA512 e28974c60d2dc0603fa14a6a57814c4119acc44afccc63e58ba69466b23bfa2b109e0747a7ae44c84b5c9374220b7a1e840241b7d834d5b369f3a1f6e0bd2a1a
 DIST github.com%2Fnamedotcom%2Fgo%2F@v%2Fv0.0.0-20180403034216-08470befbe04.zip 16736 BLAKE2B c804c37fbecf361160022b4400118c5f13de6b480581ac134a8b38ccdee6626dace6891b39cd6363e6db2ed4f8d575db59d7868a1227f12b9ea3c78425bd016d SHA512 71d7a9f08927eee21118b27d41dc70a4c525f37f67458b5e93481f1cdbe295b07a720fb433dbe07063affbd1b15820103b7017dd5d34205e5296d50263927cf0
 DIST github.com%2Fnaoina%2Fgo-stringutil%2F@v%2Fv0.1.0.mod 39 BLAKE2B 7703b0d2668b61ecc03faf6c5d2acc198afe36da786cf9b3e0c7c52a62af3acabd59f4981abe0e6c99428a0a77264712c015985be45b0b65ee03b80900ea2d91 SHA512 18998ee91dba5395b06f49ab9b9b14b8f3f6271d9bd145ef0c536b62a121d062276fa03e0af4b540b838b30d927f39ad6403a51c1ed5e7185dc52700cf79ab00
 DIST github.com%2Fnaoina%2Fgo-stringutil%2F@v%2Fv0.1.0.zip 7604 BLAKE2B aba667c2c6a82e62059cdd544863b93e1804623695f4bdceb369a91063ede2d0c9913f20d5b6442ba00f64433b72d797ed47bff65130f5cdebe269d9fa62cc39 SHA512 45d442c6e218e185b3f76d2d49c3c6ed5400b078c77aaf475ebb299685d62ddbd645d2cffb04774f3f49fcf340751a997480a6258bc20e9315c3731d2fad35ea
 DIST github.com%2Fnaoina%2Ftoml%2F@v%2Fv0.1.1.mod 30 BLAKE2B 6389fb6d3b047300662c1e3994cc8bd35bc62c75ec45fc5d7e728bc1b5b778a12ec6fb94e71a4d4022d86e929bbfb9f48eba2459cfc610613f9f96681c9ebe32 SHA512 e4468fc60622384862e3dd158d6646f63c35a7bb2908146318f91565a58b5aacd482e13e3314888ab0d066ae2f24de71ddd9b1b9739b49ecf711d47ad8159a59
 DIST github.com%2Fnaoina%2Ftoml%2F@v%2Fv0.1.1.zip 57962 BLAKE2B 0e478a2fb4f245d2177de526764f4684274ede648c5c940ebcfcc1b0fba19312f4fedc2da7d846b555936556a04cae2f15785949446e617425bc9439db205735 SHA512 9a0fd4b1899c33fb988240190be8fc97a7875077e4ea0d897c13a91021659e160afb15a2c5b53c729f27e7102f78579027604cbca1afd7dc3845f4fd045daab4
+DIST github.com%2Fnats-io%2Fjwt%2F@v%2Fv0.3.0.mod 71 BLAKE2B 01b34bcadbbfc83fd26f11a51b23b66f59212c6c9f9f669ddff2d19c7d563df24839933473705b86c235cc143732398d11f0ce2af1979cebc7594a742e325019 SHA512 8df11664ca01688c0fb0648e6943c13fe0c892ddd94cdf88da039470449726ecec8b0eaf69f0e41f277e9248502325093e698a8f949a7fb2ed9b59fa28bfa4a0
+DIST github.com%2Fnats-io%2Fjwt%2F@v%2Fv0.3.2.mod 71 BLAKE2B 329c114697ca9dc1dc69c4fcffbf488631b0a9648533db756495778f7ceb6de109798fc9c7e473c3cdfec6a049d6e21acb10ba6b1e2ec11cc2c2a99c03f7da81 SHA512 8745b75071b79f3dea777d3eec1e0f74cdefe5b202c8075994f7e68ba8e9bb87afb70d494fbf55944b12182d480da1c1f45c9f057c789b82ec2da81eff6079a2
+DIST github.com%2Fnats-io%2Fnats-server%2Fv2%2F@v%2Fv2.1.2.mod 341 BLAKE2B 96093120c73925e7a1705fee52cb06904bdb530d8f730f6ca7832ab0646a7762e012019020ba01d3781765cd3ec849bcfac3b6e903f2dcd53104c87bf845ba73 SHA512 b555bd66ca72fd51b16a45f9e21cea01a748c44c5dca1ff248efdb5dcd36b61a7a5527f3afa9d50415f6cac56d998aa8590f65e7c0a7f90888fb174fde83067e
+DIST github.com%2Fnats-io%2Fnats.go%2F@v%2Fv1.9.1.mod 143 BLAKE2B 946454f6ede7f2a46621597850fa560fdfa9b6a08a53c0aa95652fc08178dcfea523a57fc8030e5fa101128d697794f5a3bac20a3d92fd436f960975c3b18d63 SHA512 9937550a5df4b906c0e3af1777b64d119f6adc98f73738c2a8d376d665baa7bd4d0e97da7d93f0622325d80f84c3fa374d72e706bd945e50006b10f8ccce6a4e
+DIST github.com%2Fnats-io%2Fnkeys%2F@v%2Fv0.1.0.mod 96 BLAKE2B 071f4237c2606c161d8fc6160c818259807572f1e41dec9b753653b9dfcf4bab8c2c7d201f35d803ed876b99da693d15c1f5ac4075b556bfcf78e9fbec4d2dae SHA512 eb91e385e6161b3bc7e3e2e337519c1435a368fd98a26880cb37f3d52bdaaf23d7b07e1c7430592d0c960050a08c3f94e0a18576da214e50fe7047f2324b0ea0
+DIST github.com%2Fnats-io%2Fnkeys%2F@v%2Fv0.1.3.mod 96 BLAKE2B 071f4237c2606c161d8fc6160c818259807572f1e41dec9b753653b9dfcf4bab8c2c7d201f35d803ed876b99da693d15c1f5ac4075b556bfcf78e9fbec4d2dae SHA512 eb91e385e6161b3bc7e3e2e337519c1435a368fd98a26880cb37f3d52bdaaf23d7b07e1c7430592d0c960050a08c3f94e0a18576da214e50fe7047f2324b0ea0
+DIST github.com%2Fnats-io%2Fnuid%2F@v%2Fv1.0.1.mod 31 BLAKE2B 294aaa7492b6b42b366e5130e12ca72a84223fe02b4f01281ccbe3ba68dc5b515428ce95a9b575219b4688a42aaeb1a5e0dfa3bc06a1db47b8afdda282cbb991 SHA512 918b829894cfd626c011f7ff13934a2c1c12c3482ed61652ec2c59f5b94a0e8c8510e3bef4f5cbfae977df177f8eb9a123738d7382a6a6e2f8cc582d50eb10c9
 DIST github.com%2Fnbio%2Fst%2F@v%2Fv0.0.0-20140626010706-e9e8d9816f32.mod 26 BLAKE2B 0983732fffb2607008a1f339c76256c9e16ff02af37c01923363819cdac4c0f39432d01eaabfbae19ffb7a6aeb625d1dfe3beaa5b4c051cded66162f7562cbba SHA512 f8f31d63294d5e22d3fb838e02fd89e9c7f49dd5eb1a247c2b3b732e6cd6c74d775a525b57dfafb44b76d3b143d42222e10eaa4ff6727afb8dd25a8d287d03e5
 DIST github.com%2Fnbio%2Fst%2F@v%2Fv0.0.0-20140626010706-e9e8d9816f32.zip 9817 BLAKE2B 655485b7bbbde357718980b90f521085bd638c8615b477b21c07dad48245ede5d75c29fe528f17e6ff30201f641a36c9ca052c25edfe98180a1026f0504700f5 SHA512 580712b8fc654328c36425f145b4c3eff5b94b1a64f66ecc84a98ff7109179fb84b52a323ae77af268350fe20f3ea9de9845091857a950fbccd0ad0eb436b8a7
 DIST github.com%2Fnbutton23%2Fzxcvbn-go%2F@v%2Fv0.0.0-20160627004424-a22cb81b2ecd.mod 38 BLAKE2B e88cae8efddc7e87d193f1dfa70990188cf6997f38aaf0d22135aaed71abd543291661bf5628d0c3d7dc90e64fa0a7ee58e65db2af21bd160c7733b5971059e2 SHA512 96389bbcfe0ff698d1638ea020d8a6311f7caffce3c9d8ab1fb6da6870dc1685313803af2f79da15ad0d5fbc33e17eb883b2631a2d81fa70dd851fb7133b43da
@@ -631,7 +726,10 @@ DIST github.com%2Fnrdcg%2Fnamesilo%2F@v%2Fv0.2.1.mod 132 BLAKE2B 7360cf115d224b5
 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%2Foklog%2F@v%2Fv0.3.2.mod 30 BLAKE2B cccdd5811f1be90eb22900329526d699cb97bd2bca45cf30d8b2eb7fa1f2539f107b3f5ac4a93b4c38c44abf88d2957fb3e625d93544d9e726ed4b2f7a01a9fe SHA512 cc0a9caf1e57dcd87dc0757fb61c2b503e72195e089d758278323ceb46d06871dfc15508669ac95a470386987c6410cf72d0729140d36d9a445a038ea79155a9
+DIST github.com%2Foklog%2Frun%2F@v%2Fv1.0.0.mod 28 BLAKE2B d1f2187d0457fbf3087b388af0e41fa8c7a6c1d54c9f22fb631a144f42adf679bd372b5fc45f8d6f33d7e3cfbd57c1b7da2c4e969ae32185281390db58e9acbd SHA512 41e5c366b775318a4162bea00a6fa4e3d5a23c2ddb5c2707e4a4fb77c42855ce407429a7cf9c8e506bc79493ad5c56423c70dab081187ea6c94fbdaa0d5040d7
 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.0-20170122224234-a0225b3f23b5.mod 41 BLAKE2B a8e979ec93d507fe82beeb327f4747a7dc9ef7068b14afe9d08ac1e8241c5681d53bd5c1751781948e07d41831eb133ee850e30ce651728686a75fdb66b6e1a5 SHA512 446f9405f9004b40cfa355b9d93f279e2f74fe9157a868e5d8253b7c563fd58c0c2f7b393960eb1693e5be2ee6e9cfd7f5213adb0bc7f85559928ee9dda6da02
 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
 DIST github.com%2Fonsi%2Fginkgo%2F@v%2Fv0.0.0-20170829012221-11459a886d9c.mod 30 BLAKE2B 54980427295e87f99bc189c9ec00c2167e9aa771cd8777d61cec8127a3eb19f718843e2e736a6d4c08877d23528bc6da810da0c61a1dc07620422fb1b5434684 SHA512 1b8b7ce4a8f0092f0b2a2395fbcafa8cfd6830183bc36fdd58e740dc9ec4fc5201f5eec2daa6e2effeb59f9e1c0ce986ceef838d16876c9fbf0fffad4b7660ba
@@ -655,25 +753,37 @@ DIST github.com%2Fonsi%2Fgomega%2F@v%2Fv1.7.1.mod 556 BLAKE2B 8e36edf565660234a9
 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
+DIST github.com%2Fopentracing%2Fbasictracer-go%2F@v%2Fv1.0.0.mod 45 BLAKE2B 4a11e9a4a24eb8e0603b2e708591792b76e8523cfe113df480a67bbe95169d1b1e30ff8267ed6530684369a445f2d15f433f258a7c36b7b03381154ca90e1ae0 SHA512 33ab2af09dda0c6ad1d7b3f85dee520f18971c9c0e161d260f04b08ff3cce9b0633fd09b90c46aa5770a783ab7fe6871e6f8a5a0ed90bf56d555bf325beaf46f
+DIST github.com%2Fopentracing%2Fopentracing-go%2F@v%2Fv1.0.2.mod 45 BLAKE2B 7a7820ed255877b390c76ffd281258a8e70dbb2812b7d2d0bf63bb431e8e4f52faad48d4e6801b301ce35cd6dcd49ceac6ab94b32e35befe2e6df56e1a1e8eec SHA512 13b356ebfd062cecffa1e323aa7768d933c6915c2963eff50b1f743712d48cb24f137ba839a7df211e6e02979a4d1c9d32eec8194227edd995c3d35849edeb54
 DIST github.com%2Fopentracing%2Fopentracing-go%2F@v%2Fv1.1.0.mod 45 BLAKE2B 7a7820ed255877b390c76ffd281258a8e70dbb2812b7d2d0bf63bb431e8e4f52faad48d4e6801b301ce35cd6dcd49ceac6ab94b32e35befe2e6df56e1a1e8eec SHA512 13b356ebfd062cecffa1e323aa7768d933c6915c2963eff50b1f743712d48cb24f137ba839a7df211e6e02979a4d1c9d32eec8194227edd995c3d35849edeb54
+DIST github.com%2Fopentracing-contrib%2Fgo-observer%2F@v%2Fv0.0.0-20170622124052-a52f23424492.mod 50 BLAKE2B 45544c1be596ddeb8fa01c80e7d96799912343c885784b18c114716ffdcbeaa05a772d819b9a762b7f155045be1ab3409d423c173356c6fb61b9dbf810c606e9 SHA512 edf1afd7200a64b2feecdcb8f1007e58444ab9737bc0e9d4cea67cf286116fb0ebd4d9b9ae10786bf71265d9b813b175f78deb0b416346736c9a7e39d741b6c8
 DIST github.com%2Fopenzipkin%2Fzipkin-go%2F@v%2Fv0.1.1.mod 39 BLAKE2B f2a29cf2ce5b2862bfb3d894f36035e27c8cbb4ac1a1fe78cb4a0bacb1e3fc20e82d38b9b6c5d8793229cdf5d5a21975c936de50e6e3d395296d7e116a346d23 SHA512 b4a425d5f19203f3808000050e56a197965f4f26b8828ffc5837b7ee2fec2813f7c38dc242614a7a2d97b5fbfe63986c0115bce38b5a02eec6c60ec7a4568114
 DIST github.com%2Fopenzipkin%2Fzipkin-go%2F@v%2Fv0.1.6.mod 1010 BLAKE2B 6bef0142218537a9452ead65865ba25d9bd2c9773cd87e199a72ec57c7de0143088044bb79e23c2d7a29d4275713efaeab457d8fe2b519006883b0c15f11e24d SHA512 10181677125b9bccfca933fa3ccc84c81381548b0bcbbf1c7423822f13902eca3907e06d9cff462126b4795b8ecba9fd0525e4dd9f90962697829b99dbc20bc7
+DIST github.com%2Fopenzipkin%2Fzipkin-go%2F@v%2Fv0.2.1.mod 1033 BLAKE2B a6a88217fc248fb358f71cea9af2fe5a4346d51927e75317792cda9e00896e20f70ac060618bb1a648a05c5d214482a2cdd4a4ed5c5685ba583fb17b7d7d9a10 SHA512 44a8be7c11b9055ee26d0386c31f27d24d7d82b5be2594842a5338007f9d7a0d2bf835a5a2ed20c3dd78a0f8188f7e1d2d2b072acae0346d170612d38df4e761
+DIST github.com%2Fopenzipkin%2Fzipkin-go%2F@v%2Fv0.2.2.mod 1033 BLAKE2B a6a88217fc248fb358f71cea9af2fe5a4346d51927e75317792cda9e00896e20f70ac060618bb1a648a05c5d214482a2cdd4a4ed5c5685ba583fb17b7d7d9a10 SHA512 44a8be7c11b9055ee26d0386c31f27d24d7d82b5be2594842a5338007f9d7a0d2bf835a5a2ed20c3dd78a0f8188f7e1d2d2b072acae0346d170612d38df4e761
+DIST github.com%2Fopenzipkin-contrib%2Fzipkin-go-opentracing%2F@v%2Fv0.4.5.mod 369 BLAKE2B 96cb4a6ca9813f733a4a86753a406716bdffb636c0df7a43227c6eb5f950cf9fc8d1510a02a6ac9f75198609e377a6f4c3af16650527345d9a2d369ff6792d39 SHA512 cee2d00b0b1b1c3d09c27566af4f47243360366597b3b101656cbeb4293ee3e36c38ed046d193bc28dedfc86d36a9d24343c2b0e4f231aa74b7528e1c302617a
 DIST github.com%2Foracle%2Foci-go-sdk%2F@v%2Fv7.0.0+incompatible.mod 36 BLAKE2B aa3c0143ce0099e48e07d3282bb4bb680612890e5011c4eb5e49c131d71447598bf13e93e6938b6982ba0450c668c2ea949b53f2ecc0848744512de232bff39a SHA512 cd96f5afd87e43290e6e74bf2828ae1636d4f905e1ffe068888bc30d1313a9e4ec752dc2dede29c75f4f1dd8e695c43acbb01c116c2b8fb62a21d123594a6b2a
 DIST github.com%2Foracle%2Foci-go-sdk%2F@v%2Fv7.0.0+incompatible.zip 2638269 BLAKE2B 1774e973bcf8878a63fa7110c0ebb5111efa397850e1a7022394a16217fba818248bd49cf8090c08a61ad941a5454c44b4484be1fefd69dcf9585806918fe964 SHA512 9bdcb18865a426936752a2dfbc35a108a40630d5f40b7bc8940a3b4473489d97410df4ccb765a33eaab2f818f9c7662e6ff55565264225987128fd6dea26a8cd
 DIST github.com%2Fovh%2Fgo-ovh%2F@v%2Fv0.0.0-20181109152953-ba5adb4cf014.mod 29 BLAKE2B 2d82d180af97e34712353c14a8f7f43e828f9453f0a9f50fd3532343f7f27475793c1c8ab2f8b30c0bcc44a0bde09480238f7eea4210e83fe7fa03a0601c0f5b SHA512 fda12385ad4188e0ca8a6a1b4b2c8035f4d537d23b1c30dcdc6cd55591b5d7fa7745fe30e12fcacd8b0859b9aeac8ae7d6aefc3c8d98d3def9412e1dfe61f51e
 DIST github.com%2Fovh%2Fgo-ovh%2F@v%2Fv0.0.0-20181109152953-ba5adb4cf014.zip 24599 BLAKE2B d040a7df967584a001d2277979a0847329fd1edf2a8a9c6e8d86d22da10e508891b1fa176db964cc85ae50e415eaf3dfe4ae0e18d2af905a9039867de76d656e SHA512 4b9ea67b0b2791401bdb9003da1e2c80732864f044eef359aa45d764b2e7b0ed7b69fc4c709ef9d25a12064a7f16a650611fd93d582a4649afad7315e1417e79
+DIST github.com%2Fpact-foundation%2Fpact-go%2F@v%2Fv1.0.4.mod 42 BLAKE2B 96c6dbda3f5479e2687e4dd71f0bda96d8f25d2edf4665e5e4b742c942fea4db9d879cb039442672cd9aea2d1667091355d745156911bdc21a3344fae5e52752 SHA512 64c2746a75d99c6637221fd8244cc1a07c805f055f4a1f3c1408e3b6c96471343caf438ae1b797c424d59660777011201f47f262ac7210aa81d37c6c3f28bcdd
+DIST github.com%2Fpascaldekloe%2Fgoe%2F@v%2Fv0.0.0-20180627143212-57f6aae5913c.mod 35 BLAKE2B 3db6c40257f2c4b0254a26c6e414fdc87c037f6312d4bf7bbd39420d6df70f50eab84c387b54cc71fe16068e1b25e3fc63a833e11cf5b4346f842bc61328b0dc SHA512 0b378d1e15db4fc5a3d7d711b63dedefd141d607192344c8d1ab2ac755ab9c6e91b2c320378ac8a485cf94deee59e6628e7930017c6d659bead6ba89cd78a802
 DIST github.com%2Fpborman%2Fuuid%2F@v%2Fv1.2.0.mod 70 BLAKE2B a94864739ead6676f2defd1020645bb86b8b77600037227aee95fe3e82070c31814fd055dad1fa16ce1a00f64f32be96a97968259ef43f70f20e8a55cb9943eb SHA512 aa2a52cf55149c10f76a8e535dc75ff9bc18b4f2515a31e8720a26a5f501459c736dc73548d2e37f348f27b78974bf0a3b18080df972eec26222fd8afbbcfabd
 DIST github.com%2Fpelletier%2Fgo-toml%2F@v%2Fv1.1.0.mod 36 BLAKE2B a388b7d0db7c8b9a589164ac639887f1e54d3f5d59ed9bfdbb427b88d381d95455cec1f3474d6dadf847925b7b0e9944a3713656f4870db4fadaa1774595c3f1 SHA512 b74e16c113ace53ce6b7a4df1fc73f21a5acdcf3d2343a4c4f1ad7a2cd8d2282ef7ede98de8c1c46f7d35feae28c9f49ba4a2dff1071357cb4e88e93f25b521d
 DIST github.com%2Fpelletier%2Fgo-toml%2F@v%2Fv1.2.0.mod 36 BLAKE2B a388b7d0db7c8b9a589164ac639887f1e54d3f5d59ed9bfdbb427b88d381d95455cec1f3474d6dadf847925b7b0e9944a3713656f4870db4fadaa1774595c3f1 SHA512 b74e16c113ace53ce6b7a4df1fc73f21a5acdcf3d2343a4c4f1ad7a2cd8d2282ef7ede98de8c1c46f7d35feae28c9f49ba4a2dff1071357cb4e88e93f25b521d
 DIST github.com%2Fpelletier%2Fgo-toml%2F@v%2Fv1.6.0.mod 153 BLAKE2B eb918832463d06e37d522e86feed16ac3efc2f6bca36524a0956920ac639f2efa6b87bf70ee22015108b4c9c7ae63eba7345b6c770568f605438863ad23fe0e9 SHA512 89b6489f7666b4eedab8c8edb345c82d42626c567d2e402a87344d18e63133f89bdb5c0f3aeca8568e8c4c76cfeac132a4b8904902f2ac47a734209d1ce814c8
+DIST github.com%2Fperformancecopilot%2Fspeed%2F@v%2Fv3.0.0+incompatible.mod 43 BLAKE2B 22517b91de93a0e72290dc3599ff8b4fd4fe2807e175e3778c0cb6977db6c02857b9a331e2e07b21851fbf35eefaadb2e05f36c2bda3c2381f22e23d4f24b89e SHA512 b2a58daf4ac906cb34db04bd3815766a74ff25c40c4f4b70edbefac0d3368f1a26ccbff3a5ea910c399ecad0213a2eecca174827caeabe3027e0c99fce53bb23
+DIST github.com%2Fpierrec%2Flz4%2F@v%2Fv1.0.2-0.20190131084431-473cd7ce01a1.mod 69 BLAKE2B e3c2bc67965f266f7449c37a9cb421a8a5464cb18b54ec9c81223c81b3e19890e4b628e3d14a7904a6de4e8a83b53a21c01ae32f774fb583a8739eabd00daaeb SHA512 7b303db4973d7804f48fc036bd427a8258d34aac8a8ec95252e6602c7053be4428b5e15642263913686c3207cda00316132ec668bbaeb2748e093b1f359a1620
 DIST github.com%2Fpierrec%2Flz4%2F@v%2Fv2.0.5+incompatible.mod 30 BLAKE2B 007bbbe9dc603d92170e1aa89946c3df382b73e60a01f247ff3c28c56eec5c06b1f901cd3f52a81ed967949436fe0d2a7b4dc70088dbb38de97705967f127aa3 SHA512 e3f6142da79fb97efb98b7bac49f4fdcc16f2c59b40ac87ca98b633874bac81105a0bcff20045bed75d39ba3922093102f9e74462356d6dda6147f6be4d31703
 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%2Fpkg%2Fprofile%2F@v%2Fv1.2.1.mod 30 BLAKE2B f5ef9d146a30ae9c67d2f7e86eef366821045d1f7b6442681377ec8d4528e315b661373ce82bedce6dcc74bb3dd9b7b2e5d59c6d5fe6aae8302a09656bd61b04 SHA512 a8742602593700ae7d9d1bb18e567d5784239e9b158b2c9ffc0c16e1212013bb9fe49c4bdfd58fd2e61e1752b5bd0390fd6910d66e5ea8917450a3e41609d54e
 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%2Fposener%2Fcomplete%2F@v%2Fv1.1.1.mod 35 BLAKE2B 763a350270dbd9e5a8f735ded2a13c7bde23a356f8f4187b4fe430b1dbf995cc9ca2dad54a38e927c07ba01b5c21f8aadcce69b8a94baaafee013d4a9fd0c988 SHA512 79b29fa26101598261ce7406c81be4fa53d79e89a7bed072abcd572d7f35f3a408da45055f1b05c7ace8acdb0ac2ea005d79a4766e7657087ca46327ebce842c
 DIST github.com%2Fpquerna%2Fotp%2F@v%2Fv1.0.0.mod 30 BLAKE2B f2951f62c06f2c9c5c0042f82861f021166c353c644d0f0d8d0ea0664ff218ef315357558e901ee488c5d0eba2690649ac89cc6178eec6e6aa60a503ed4e9d0a SHA512 e5702cc3a1b0d84fbfdd11005a5f1735a378d709c2f60a737b32b81bd2498206cef3b3ce693b2bfde9ad11de8c6bf734527d2c8874348a97a724441325baa42b
 DIST github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv0.8.0.mod 43 BLAKE2B 2bfedb841a10d8d6a861189203de74eb9bc6bc37bb10cdfc2404b1e972b7672568ed27d235e143d831cf2f840943c039398296cb78f1309f00d1ad9e0ce21056 SHA512 191cf6496c41b2b82c9a8f2ab2aeab63ede47807160f7cf746c548b3e92e367fc8f80ff8c6efbb7e91ca5903d5672b235c1ab9f14d3f9f988e8ff1c821d3b8bf
 DIST github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv0.9.1.mod 43 BLAKE2B 2bfedb841a10d8d6a861189203de74eb9bc6bc37bb10cdfc2404b1e972b7672568ed27d235e143d831cf2f840943c039398296cb78f1309f00d1ad9e0ce21056 SHA512 191cf6496c41b2b82c9a8f2ab2aeab63ede47807160f7cf746c548b3e92e367fc8f80ff8c6efbb7e91ca5903d5672b235c1ab9f14d3f9f988e8ff1c821d3b8bf
@@ -685,6 +795,8 @@ DIST github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv1.1.0.mod 357 BLAKE2B ade62
 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_golang%2F@v%2Fv1.9.0.mod 377 BLAKE2B 51ba08b9e8ab65c350bc60bf337cf786426ad6e51d2548f5358622b41608b7cec408d264ef87810da60f9ef0a7e6ca972cf048d0d5c1fb5df748f0e342d75cc6 SHA512 f325dde1f371b028a8f9e3a1464e8f90982aca72a9c262a3eab8edf752110fb1fbca55650ac48e7575a5e5ba98b371df47f2178ede11faeaafd68b0d27515641
+DIST github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv1.9.0.zip 244293 BLAKE2B fe666ceb014052fd0aac0a092300eceec2a78a0c943e4b4890df6af74aae1c2f9134f4495374f0659d3f044b558fd5712d37decd37a542ea1e86ee847b09ff51 SHA512 136e3f1d2cd66a1d9acc5485f3838fc3ae8a201e448c5e8545dbe8f4ec22f59a19cb17d61ca978bce7f980996779ececdd04a72920e06a491e3e5e3e1bf5fbcd
 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
@@ -696,6 +808,8 @@ DIST github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.0.0-20180801064454-c7de2306084e.
 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.15.0.mod 739 BLAKE2B 6a475498d76be0ec42814e1d5a932c707711b9538e8507afaa36a3ee6d26b78392f750e9553f960cd9768f3ba6a88b3d8c338b102ba48260c91b0f5b48e1cb06 SHA512 5d321367c7b93f913cb524c688dc515dfe28a0cd712665b61ac12dfebac8a67fd19ba578f8a3666b557b41670eb9f3cc718fb93ca413851552efd695859b7c4f
+DIST github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.15.0.zip 179538 BLAKE2B 63f0b8db91a63eeeeaca059ca5ab286c061ce89622af0a4083e1ba2456a09541eb01ca01c62d0f2c7f5e2fd6f35ce464443cfc787ccad3389099f508310f4f6f SHA512 5e715eb1efd6d64f6af867ec8c5171bbdca42881f6753e50390f59b6e68dda58976298e010ee1af178f116732f4fcea096f19d67eaf882120bd77f9290974f52
 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
@@ -710,6 +824,8 @@ DIST github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.3.mod 136 BLAKE2B 49b2b47ca2cb
 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%2Fprocfs%2F@v%2Fv0.2.0.mod 198 BLAKE2B 9b5c175c915db6a1fdf18f440acf348e395fd2059e1f44fb1fd556e7c2c6821cfa397f88d2123f681b41fe5c5689ebc58c7c75865ef63f7f1c61fd8d323d8117 SHA512 7a54bddb87350ba24423842fcf1cd8b031be427e9f689467503d8d6a876691b209a5d2ac33d848a977d2c3890284d816fe4f2fa9391642010c96c3c0d691efcb
+DIST github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.2.0.zip 261840 BLAKE2B 0b2120e55db33da70f3764bfd57657445f66fb4ba22c0d05898aa46156228c4a3e232cfaf24e2881707cffe7d3b5694fe04c03f589ee12d6329e94c90847e62e SHA512 cc3c69c18a6bd2bdc5e98de10c0ad6f9c540d5639252b007851be73c405e3774d1ca16518d3edeec036258300692b82a959bef3d92878c772370f6b8892ecc64
 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
@@ -726,12 +842,15 @@ DIST github.com%2Frussross%2Fblackfriday%2F@v%2Fv1.5.2.mod 39 BLAKE2B 6d57702836
 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
 DIST github.com%2Frussross%2Fblackfriday%2Fv2%2F@v%2Fv2.0.1.zip 110026 BLAKE2B 862c858d51e59569c38e1304de08c256752db260cde7f7f44fab41d22695999fe73483d3854166f4e8d3da9b4f8e41b7999d7e44510ab8c2ca6c0120173b77e3 SHA512 992df87104aa66dec048d39496c85819cab19bc890cb2c60326660d011642f49cd926b082d3eb4136b229a6e4893ed023a133e4bf83a4993c534b24e14d77b4d
+DIST github.com%2Fryanuber%2Fcolumnize%2F@v%2Fv0.0.0-20160712163229-9b3edd62028f.mod 37 BLAKE2B 6f0d51a83cccf661003d3c9a10b10fca12a5933730c676a4279c47a0b8563ae5d897845ac84079070bf47b32ea1c2ec80879b85bf8ac72b91f1a63239292758f SHA512 0af9557d073093339188a1d8f226798eccb05d43e1394ac9d207118ada9449332077161e2d6ba2327d9b736aafae79d4a08abad233ae9aca9917c677809ce2c7
 DIST github.com%2Fryanuber%2Fgo-glob%2F@v%2Fv0.0.0-20170128012129-256dc444b735.mod 35 BLAKE2B 68028ffeebb96ddadff1a781e7f0d7267d9ee0255b2b00958d9e36b6870e27630f7cfb1f6a1c90d81fa6303465d50936c66567c4b562a8b2711d459ee4e093b4 SHA512 1cf1bb0f786ca726b882a958d719c3b762ac146c01b5f57fa246dabd3fc1462b47cb71f7fa0c6b146873113a609b5a94aee724d2d624fec9651947b78d39cf73
 DIST github.com%2Fsacloud%2Flibsacloud%2F@v%2Fv1.26.1.mod 726 BLAKE2B f410e7ec566b2cd8d333bb2b331f92196e9c922d2db68861e9a7b6879fa1df07848697f9b4cd99004f5a120b0121e02766c53df602b6d9d5d35d8c9abe756ffc SHA512 8c62149992f2f5b4ca22dee42af56325e4ace6769a8a9f784871eafcd9a3715f108839915451e20ce47f260ceaf90823c925401cae4baa46393402c9a15e7ed0
 DIST github.com%2Fsacloud%2Flibsacloud%2F@v%2Fv1.26.1.zip 352985 BLAKE2B 0f5e1ecac6aea6a4763f665840f1e54b04f1288ec3cee68339a6976c52c93e1e2dc7b3bb702e635e8ef1d27235faed7802ac8048779d491013da6134cf79b1e1 SHA512 d136a6b764302eaa5a3e4f23764fc80eaa1622b7bc5db8787dd48fc0178289b1a6a752fdad4755320f668e4839c62f1dbac955e98b76e01eb0fef01a3c59f5e8
 DIST github.com%2Fsamfoo%2Fansi%2F@v%2Fv0.0.0-20160124022901-b6bd2ded7189.mod 30 BLAKE2B aaac68b939ffebebdf66ff051f43954a0450cef7812e0009cdb821669113858fbb9531121c1c355a581d8c343283200c5957108e13858c4808ba3e78603a9938 SHA512 e90c0e17e2792645cfb6cd61164c93e6a9b9abecae6f9a58df99a0eefd2e78348dd534267fc945e23c8757a6e769baf2cdf4d59fb9bd4d8ef9a26b20ef0a48a0
 DIST github.com%2Fsamfoo%2Fansi%2F@v%2Fv0.0.0-20160124022901-b6bd2ded7189.zip 7278 BLAKE2B b00c13c60dd6877a06bd301fc3797347037298eae3cb71c3a70f41df9dd7a36b1b1bfc93d928f0eb36ed54e3d21a094f93ac799dca4a0613becca0eda30ea3e3 SHA512 3c3977090a524ee9c34a43db5cf335d67dc5e7613d582d3b56ccf410f0185a984f10668275d49fc51d44f92d39270fbd84381e336a44d574bdb851656a1492a4
+DIST github.com%2Fsamuel%2Fgo-zookeeper%2F@v%2Fv0.0.0-20190923202752-2cc03de413da.mod 38 BLAKE2B ce3c91e2fcd6c3748acf0e0f6355a0af01db3c7b36a793fc07b94b1072133f7f25f4c49473bb27007ba2de7233454a3728f24eacecda76388570810e62a5d161 SHA512 54235e8bcd2f98cfbfdfe187ee4b2cc7d0efe155710474100709b1a8c2e55cc2e24a16559857fb9edf484a0b76debbcef69d5c182efe52594c9858a37b6b10f0
 DIST github.com%2Fsatori%2Fgo.uuid%2F@v%2Fv1.2.0.mod 33 BLAKE2B d6c66082304928ba92ad6144b157ce4f59db0abc5af56538abd5a81fd927ea716df4b5dee47ff883dd99f377d2b3a772296e08244fb7a769a5843a54426be81d SHA512 081e7b82b53c1a86743e3cc4973c1bd15e1b5c48929513bfc41c0e182fd4a047519b8cac9f4e830d7a08eb3443b2feb62c727387a294a30b7c988b698d6e8d45
+DIST github.com%2Fsean-%2Fseed%2F@v%2Fv0.0.0-20170313163322-e2103e2c3529.mod 29 BLAKE2B 8f509981164937fb0aab63b0344ddbf25c183b926a6e87400e745f6aee9dcc478f0ed455c62a9753722954acb3506be5f7810915a15d03647668e7bb707c09c0 SHA512 c7dc34c7a73c5899ca207c0cac88dd38ddebaffa04b5dd511a86dd10160e60be2806dfc6e079a5871b0cb6142f53d7d7dc87ddbe3fb19240bf894430feac5875
 DIST github.com%2Fsecurego%2Fgosec%2F@v%2Fv0.0.0-20191002120514-e680875ea14d.mod 830 BLAKE2B 3fe0e58e30d39e14d38ff07a8f411e46e68992aec872c5b90d098e68ca7ef22d5620a99a3f44a00ec43ce4b4a47afe9c4aa8f2b30be33ebe9dc6c3520c0cb8df SHA512 ba39611cdbb9db1aca8d5dd2cdf42dc58aa4fd68972b259bc3cb27de102f00772fbdc335e4e2e28f19782565a014548b5dc059102e476624b75e6f3f4b995dea
 DIST github.com%2Fsecurego%2Fgosec%2F@v%2Fv0.0.0-20200106085552-9cb83e10afad.mod 893 BLAKE2B b7c4fce71eb1ae94235ec5ee140fa34606dc44d2af3e0dc98e3599e7cd6c4a196ddac0b7196c46b0838d41bd583424042cae8df68cf675a7455a9baf967ae779 SHA512 f65a6fc335e123b7e2c8672314548ff366f654e2cefc7fe5cc89952893b9c11f8f73503aa7aa9760c250cbbae53b8f96ff585f0a448e7faa1ac6bed65a3ad2f3
 DIST github.com%2Fsergi%2Fgo-diff%2F@v%2Fv1.0.0.mod 32 BLAKE2B 9c0be7f17fe7a9156f124f7f67c3e15e14719d0b271f36d5d41ccfa5ff6c1b7887e0051df6eb3b29f29b40357d8e438598088b3c4f4df28fb81f030c8efa7ff3 SHA512 8b8b8958405a188b93adcdda0634aaa2961b5b8e0d3b3e1f768fb9c49c02b73cf3bb39027431e0c1d209abea6cb72a651c5776bf26391e81f4dc18c7bafa692c
@@ -769,6 +888,8 @@ DIST github.com%2Fsirupsen%2Flogrus%2F@v%2Fv1.3.0.mod 393 BLAKE2B b9d712acd24d7a
 DIST github.com%2Fsirupsen%2Flogrus%2F@v%2Fv1.4.1.mod 337 BLAKE2B 41471db637c5c0363cd36be6d16a6228671ce9658ef71103ad2122a2cd8cfc13c30b87bf2b34df7ba9d6c1fff1ac821462fbb86b622c274cf26a1e3ecb7fd2e9 SHA512 29a4efc27c658b047fbfc6eb2ae311753b01fe878cc733e2fdfd83f5791b3e30ab50b08addd300dff37e7880f6b57662ac0cb0f4b98df2c5a5a9f7d555bc98a5
 DIST github.com%2Fsirupsen%2Flogrus%2F@v%2Fv1.4.2.mod 337 BLAKE2B 94ce7d2e23281061ee0ac0b1be2f8c3439c86e62c56ecf556a81123d57d819b1e0e95ec3b7c6425f13abaaa1683942b7a3d0bb8ad489577284b2a6063c777b37 SHA512 38a79599dbd09661614d54fc92149fe581575b7833e89dd73a3f754fafa4bc549c6c9078753ab8e2a85ce2be3ab81e528e29b6d19e7c329e0cb0f74896d2e418
 DIST github.com%2Fsirupsen%2Flogrus%2F@v%2Fv1.4.2.zip 58627 BLAKE2B f4276f0095188324c06e4412303ac19e3006b18823985e26ca49b2de54ef58cade626b3d2439f5f2a29c47618420b890951f94e5a4801dbaad4c3294f6555a4e SHA512 3bf6be07dd9a97bde938309857e16dc425587c100e35b2acd1a6f11a9ac196238b0844abbaded43fcc01be0664efa15b64f159f6259322043e3046e7d361dc20
+DIST github.com%2Fsirupsen%2Flogrus%2F@v%2Fv1.6.0.mod 301 BLAKE2B 5322be7914862368eba07f521c046dbd7580edafd47ac633116b8c9f4b61526d0d63df11ba6894223590a1ffcf4bf478c394a335c305010ca9fc18107d4e61b7 SHA512 8fe5a437a5f3f8c1ce0aff067ee261a946d946d7640aa5acf7c34b9c8c4ee65128a6421aa38bbb1feeba1339b356952ad58b4bad98f1c89ac455d94e86684a8c
+DIST github.com%2Fsirupsen%2Flogrus%2F@v%2Fv1.6.0.zip 65802 BLAKE2B e0487985824efba7ee61c5a73df7b591d625dcda32f833ae276191cd82bec8f3db30cc2ba217d80cb56af1436b8954fcd22ed3f861c6c7fcb4a94818357bbde3 SHA512 abd13a98d10b6c996918712443edacf97ba5fcb9ece7615f59458a583130f68920dd313533ff0d8c84c6011fd2c4d221783b1250e3250b569a6ead9d7c02f7a7
 DIST github.com%2Fskratchdot%2Fopen-golang%2F@v%2Fv0.0.0-20160302144031-75fb7ed4208c.mod 41 BLAKE2B da40259a83c14d444c933f97bb673c4edee72b95d5c19ef021479afe2ebfb6f01bc157527214a19e35d100a6f4d353eeefc60badf51cb85dcd735a773aa5b033 SHA512 7a7b948320e1df47d23498732e5fd7e63fcd7e905299e11f74ee86a8146fe8df29dfea06abd59185810d75c7ff670e2ecba07ccc461b681a9469beafcfb7801b
 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
@@ -807,6 +928,7 @@ DIST github.com%2Fsmartystreets%2Fgoconvey%2F@v%2Fv0.0.0-20190330032615-68dc04aa
 DIST github.com%2Fsmartystreets%2Fgoconvey%2F@v%2Fv1.6.4.mod 302 BLAKE2B 69fd290c3e72f4ee0597f480bae8647d80ab5c4acab21ac3ea19e847e3af4ac91a767876fac04c94c2db8bc782a24577d3478d3d0653f673609f2d57d6cc3427 SHA512 24806ff2cbf2719f50bb37cc5ffadeca1b64c7b089a1647695b45d647ddac16332504c7026813b4ab9316e53e755ad0ebbf6db9ca88179d0526ca2634e27e25f
 DIST github.com%2Fsmartystreets%2Fgoconvey%2F@v%2Fv1.6.4.zip 1521758 BLAKE2B 653e697d76d392b18c09e5c1c96734a737071667345b9d6ff9c9589bbe74e1c50849dcd7fc00b660adc1aaa30366aa9ca93a94d5eb4e605f7897d9714119f926 SHA512 3bdd2bbeaf755618d9fa7f324814497308361cb0f3f93a7ac84b9fc01b79ab346353ff0a022d3d85e74aef57b3773e03ea9279d0a60de317a1c57d5eca2d1507
 DIST github.com%2Fsoheilhy%2Fcmux%2F@v%2Fv0.1.4.mod 32 BLAKE2B cf220acb07f93b3927afcfb4211e356e17f28dbef71cfdf777366d8cd09440282cd23e7800c7e86949615b90ec60ad4f2601ef21e58d4470349913c348758b0a SHA512 def5f190323350b58be18ef9f1b00e4810987a37e1fa9332be62a638a01df7f070788c75a19a0c11949890ccbc395419de45bf9c5f7fb38fdbef56118c681d32
+DIST github.com%2Fsony%2Fgobreaker%2F@v%2Fv0.4.1.mod 86 BLAKE2B 93d8710c720a6abfda7ce2f81229f4ba96088d4563b163f02fbe05c962e698f1ab1771ddc8a0296e8eab22a1e65f64258a5b3ad459f53de0d662e1ef3ca9edf9 SHA512 de0d160e304d1e1341fb3d3769ad300b61879ef491b3a293ebd1874ca259dc3fe95a3bd3f41b04e382cac8391174a54175e08b8422f243563e845208cac15070
 DIST github.com%2Fsourcegraph%2Fannotate%2F@v%2Fv0.0.0-20160123013949-f4cad6c6324d.mod 39 BLAKE2B 0bf074876e4db2c76b675966ce28a4a32e7ac8a50c44f1f3c7f1cc929c682fd00d1fbdc5dd72d9d6dee2405d59d6699f1a8da4ed69863260258dd2574b81e924 SHA512 a6e5d41a24eded17812fae0ac1815c4e41dd3d60ac3ee667475e1801c3c654416346077d2473193be24dbdccb5d4fe7ae44acddcd354420d6a312a03df9daaf9
 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
@@ -822,6 +944,7 @@ DIST github.com%2Fspf13%2Fcast%2F@v%2Fv1.3.0.zip 12738 BLAKE2B e7a649d1c85aa7b3a
 DIST github.com%2Fspf13%2Fcast%2F@v%2Fv1.3.1.mod 175 BLAKE2B 9077c3a2c65f4025500a3215c440b1b3856e09f1543cad7ca6a37fe5b42d51af01c2032b905c72cce445807bb311ed461c4a5fd4fe680a81ac7a1c0d94759c67 SHA512 7a0a21f6a7564b3261bccc8b1e1cd39d5d1a95bd0dd3debea914b1d37b687fbacdaee5f1dd5f1f74e4da11664c12f7ee63b484d690cd79389423cb79ff38dee9
 DIST github.com%2Fspf13%2Fcast%2F@v%2Fv1.3.1.zip 12750 BLAKE2B 65fce8e1c7f8d6553e3b003b02a2ab3a7b1eccd7dae3db0423b8ba9d5579721d6d84d0227e321f8d7b557db71648ed2e4a3b810ef867f34ce25f02f29b4209f0 SHA512 bc4f20343133aad94ea020cbb5f2c74c5b983603f3638ee84093a31b4cb94e3725f3e0f01252e6546f86d1e47c317e171e0229681116b8d4aeac67221af40636
 DIST github.com%2Fspf13%2Fcobra%2F@v%2Fv0.0.2.mod 30 BLAKE2B cb72701c052ce4059500f4c6b3d0c4fb336d118865bf1f7f45ce0b0279e1d01b6e58d49f82182c2523681a97bcaa7a70216d63ceeca0ea1d09c1921226f6bc4e SHA512 ea13ed8e166d16a7bcd14a7cde90af1cacc0b05995d1c5ec245fa536208e0cbfffd689dd460d66c0a1ad315f2b0ae9f4b803ed72bcdfd89c4a98a7ed934289c7
+DIST github.com%2Fspf13%2Fcobra%2F@v%2Fv0.0.3.mod 30 BLAKE2B cb72701c052ce4059500f4c6b3d0c4fb336d118865bf1f7f45ce0b0279e1d01b6e58d49f82182c2523681a97bcaa7a70216d63ceeca0ea1d09c1921226f6bc4e SHA512 ea13ed8e166d16a7bcd14a7cde90af1cacc0b05995d1c5ec245fa536208e0cbfffd689dd460d66c0a1ad315f2b0ae9f4b803ed72bcdfd89c4a98a7ed934289c7
 DIST github.com%2Fspf13%2Fcobra%2F@v%2Fv0.0.5.mod 310 BLAKE2B 851f2542f28849f4f5c33155e5d9562aa9aa2645f1fb57e6300e2c6e98c39e0728e01a5e26d4a514435245662fccc55b8eca4eb2633a21057a6c4a5d80d24fd4 SHA512 dfde1474aedc5f36508bed07a01fdfd433967d2a6c0acadc6d985ce862da5e1cbec7ced13d55073512afbc2d925e6ad3e3cdee9511ad17b14ea8a159d8adf8e0
 DIST github.com%2Fspf13%2Fjwalterweatherman%2F@v%2Fv0.0.0-20180109140146-7c0cea34c8ec.mod 42 BLAKE2B 1f0af0f4518708edd09c0f02aec6103960b023a6bc178181276c54cd86b653e8bd1ddd60c5d49fa75a85f1fa0d18f670a9c2ead381da7c4f2d5e611b24f51ca9 SHA512 748b5648bf8bec4d1efe13f4dc37608e7378acc2a7d954e9d3b649a4b170a1e2d1c61338f6bee8d9007ad75a5bde87487612b47a692d6f966bca56490dcb834d
 DIST github.com%2Fspf13%2Fjwalterweatherman%2F@v%2Fv1.0.0.mod 42 BLAKE2B 1f0af0f4518708edd09c0f02aec6103960b023a6bc178181276c54cd86b653e8bd1ddd60c5d49fa75a85f1fa0d18f670a9c2ead381da7c4f2d5e611b24f51ca9 SHA512 748b5648bf8bec4d1efe13f4dc37608e7378acc2a7d954e9d3b649a4b170a1e2d1c61338f6bee8d9007ad75a5bde87487612b47a692d6f966bca56490dcb834d
@@ -832,6 +955,9 @@ DIST github.com%2Fspf13%2Fpflag%2F@v%2Fv1.0.5.mod 39 BLAKE2B c9d700f96874e0a3977
 DIST github.com%2Fspf13%2Fviper%2F@v%2Fv1.0.2.mod 30 BLAKE2B 18e0337f9146af34821783f04024be09e18f3804558482ea56acf28048ec811ae679e0bc0f6044774e69a98c575b0a41e210277b966bfb04270d7ebf504cb1c0 SHA512 0b3a57fbf1292964f8d35a7b85e9c828bd2c1344d68e4d04ce84acc9c99e2239895058fa656d45e0e5e622afad62056b583fb00a5dd3181302798ea99b0b6799
 DIST github.com%2Fspf13%2Fviper%2F@v%2Fv1.3.2.mod 986 BLAKE2B 4f2c5d920b08d5802df635316a6ca72ab3346dcd2b0ec76bc9657c265eebc68ef7c8036c1993595bcdb416ea9ef0e7ea338162a7c6854c98db3a16b035c310ca SHA512 2195ba8e28e21deb5d4f78a9319e568ea5e81fb7a257292ec12d0aeaba84d1898e8d0cb51355f87d7093c3c0501cfa1f93f2e520e40edc4995260d7977fe306f
 DIST github.com%2Fspf13%2Fviper%2F@v%2Fv1.6.1.mod 2141 BLAKE2B 156a151b0a2adc3281ce942a6b33dd518a60248a9aa927241d787a6a6e4c37f8acb76cde85d8ce6e7351bea257bf0dd8a671c22c5f4d5d6a8ffb150e17ae291c SHA512 21bc1c47e67da822efa2fd98ffe8c0a9f432e95be723682a738a82098fab25771a2ebec1903561118fde91a08ae370989cd5375432cc21d80ce07ba2c44ff6d5
+DIST github.com%2Fstreadway%2Famqp%2F@v%2Fv0.0.0-20190404075320-75d898a42a94.mod 42 BLAKE2B 528d17f9ad90612c6004aa88eb138daac467c3cd82e8f9a990e64ec956a9e50ebface9db66bb7800f74e7923a647999a9332d871f08d78a7eb09883e0fc6c811 SHA512 c5b104556b88e433f61bc94d0b61fabaa86fc25f3089a03f1360fe61b2b3487a5f2c6c3086eb08298d48cc05860652b58075c51d2767c2c4f2a698069b7dcbdb
+DIST github.com%2Fstreadway%2Famqp%2F@v%2Fv0.0.0-20190827072141-edfb9018d271.mod 42 BLAKE2B 528d17f9ad90612c6004aa88eb138daac467c3cd82e8f9a990e64ec956a9e50ebface9db66bb7800f74e7923a647999a9332d871f08d78a7eb09883e0fc6c811 SHA512 c5b104556b88e433f61bc94d0b61fabaa86fc25f3089a03f1360fe61b2b3487a5f2c6c3086eb08298d48cc05860652b58075c51d2767c2c4f2a698069b7dcbdb
+DIST github.com%2Fstreadway%2Fhandy%2F@v%2Fv0.0.0-20190108123426-d5acb3125c2a.mod 34 BLAKE2B 8362ffab206b4889b3d3c3842042d4504d5e040313b40a66022477a6edb32b377f4756a8c783c1950f1ea60e4ed0f9b616408908e44e571fa340c75639f50e5b SHA512 20d2c6658f5ad6e033e9532ddf6944e168fd2296acf434999967932ada1f80b6ef2e4f433dc033f745168be3e77c07931d9ae95c7f48c9a01eea2f6c2a7a9855
 DIST github.com%2Fstretchr%2Fobjx%2F@v%2Fv0.1.0.mod 32 BLAKE2B d698910da1ef00a70a1673b8c74105de195020ccd95d1e70c5dd1e1615210886ff9acbc9cfd03f46e99f5223b60b04695b8d362b9e0edd4e485480f802bd229a SHA512 4e366e5a60559a8863cb2a50280deb307d8bf885ca5440cce1b49a084b4cc4583b3481240125f35f161226592a43f2c0a426152f117d79b68c92c72a93f751d5
 DIST github.com%2Fstretchr%2Fobjx%2F@v%2Fv0.1.1.mod 32 BLAKE2B d698910da1ef00a70a1673b8c74105de195020ccd95d1e70c5dd1e1615210886ff9acbc9cfd03f46e99f5223b60b04695b8d362b9e0edd4e485480f802bd229a SHA512 4e366e5a60559a8863cb2a50280deb307d8bf885ca5440cce1b49a084b4cc4583b3481240125f35f161226592a43f2c0a426152f117d79b68c92c72a93f751d5
 DIST github.com%2Fstretchr%2Fobjx%2F@v%2Fv0.2.0.mod 137 BLAKE2B 47195334e42f0997d96b50b8364764426301d31cc7fbc289b89b173b877d54cc67133b07d4a21e6ecdfa2e4404a9cff32f06b53cfa9493e075ee2ff2cc46e605 SHA512 02d0b2b1df84750ad3d15f4b86b3f7989a22007e27b28e7b3a4d34b26ec7ccbaa5d48ac0032ad692bf7db150e101cabdc050b0aa1697cfb20f922c88b9f086b8
@@ -848,6 +974,7 @@ DIST github.com%2Ftimakin%2Fbodyclose%2F@v%2Fv0.0.0-20190721030226-87058b9bfcec.
 DIST github.com%2Ftimakin%2Fbodyclose%2F@v%2Fv0.0.0-20190930140734-f7f2e9bca95e.mod 190 BLAKE2B b079349b0a65db4530e0ae682e1ad705f146a8ac2d1c735b9f660d2fa336088c04050defbd04f93d3b51a20dd396d338874065370242fb80ee5beb981fe613f6 SHA512 5056ac014217b14e7111984a99c6d49120404c31baf0ed510316b3b6edb95084b26d273da643e025e1d13fcffca82411a3542acf37dbadd4afaf9466a7a1c607
 DIST github.com%2Ftimewasted%2Flinode%2F@v%2Fv0.0.0-20160829202747-37e84520dcf7.mod 36 BLAKE2B 7184134b512e4150c612f5efa39b403b6b40d03736895abc3002208929efae56fd11a79adc7ef49218bc02812e36b65b519b019f843e7dcd86dfb0c780c72261 SHA512 cf6746073568cc38f71a6c892ff3a9968da47b3c92a838b6ffee30ab19129e81682281303e786db1ff56cc5d78137ff50f621cc833bc0c37c323d18cfbbd1ba4
 DIST github.com%2Ftimewasted%2Flinode%2F@v%2Fv0.0.0-20160829202747-37e84520dcf7.zip 11156 BLAKE2B 71243f92f8baea98a1f6cdceac34054aa695cca852a03c47d42b0b462bd546e7af2b85962ccbdd6ec4b864d6e907e60a9049e3e0905bc8eaf906bd601de84f37 SHA512 ba86da39a4a35e81d4ca6eb3348a287ddc22a120240ef9107a558727c3095606fe3511738a873a61a9adf80e77ccae23132913f3a758ced70e4f2cce2b8b419a
+DIST github.com%2Ftmc%2Fgrpc-websocket-proxy%2F@v%2Fv0.0.0-20170815181823-89b8d40f7ca8.mod 43 BLAKE2B a0f8fc8639040a1b7194a35a4020cff543111ee47a3b013163e93d14d42325146b1f6c2acfd595438721c4f6e80f9e5871811c058accbf06c6500bdfd9524004 SHA512 b3b02f5e9f8b68a93f531ce9bece44fbaa691f1527528555327c15b574ecee209ba7f6b713d8ae1f6b58b1416a9eb39546be646ef73b4328e79d8bdf605dcf9b
 DIST github.com%2Ftmc%2Fgrpc-websocket-proxy%2F@v%2Fv0.0.0-20190109142713-0ad062ec5ee5.mod 43 BLAKE2B a0f8fc8639040a1b7194a35a4020cff543111ee47a3b013163e93d14d42325146b1f6c2acfd595438721c4f6e80f9e5871811c058accbf06c6500bdfd9524004 SHA512 b3b02f5e9f8b68a93f531ce9bece44fbaa691f1527528555327c15b574ecee209ba7f6b713d8ae1f6b58b1416a9eb39546be646ef73b4328e79d8bdf605dcf9b
 DIST github.com%2Ftomasen%2Frealip%2F@v%2Fv0.0.0-20180522021738-f0c99a92ddce.mod 33 BLAKE2B 92e05addf2b65e704d351cb7f887ac28dce6f67184bf0a46e1bda350f26ba1e50e2ff7d2698a09320f05863b33c99a7034cdf517c56332a7820fc83bdf9a9888 SHA512 0661766aab15879d856bdd7df7033d9193eac91922137af549f3dda17a1adfa148d35f62122fa4ac178f6ffdb5c51a6d10a87ccf7ea2c93da7a86e3cdabdc223
 DIST github.com%2Ftommy-muehle%2Fgo-mnd%2F@v%2Fv1.1.1.mod 309 BLAKE2B 08c694a7e547971dd38604b0fae2620c1c46bffc1d19dc532377bb5d358d7c702b981960cb2f5a10240887d0667b23d2e3e766e18d35206b5e76dd49b2a8dcfa SHA512 59a9c250fef07de709fdffce7965fce26223014dc67c49584b2980c7116b6c398ce162fe3a9114a83b65432899ccf0bf2c281410366735582f14fe40cbd1436a
@@ -900,6 +1027,9 @@ DIST github.com%2Fzmap%2Fzcrypto%2F@v%2Fv0.0.0-20190329181646-dff83107394d.mod 6
 DIST github.com%2Fzmap%2Fzlint%2F@v%2Fv0.0.0-20190516161541-9047d02cf65a.mod 328 BLAKE2B 7e68f565b346a899cc1895af82a9b60a51fe1c1b8de09fbf62af584bf5f7c859cc6fdbeb298044cd208e879ddf3039c8f4a75ec4ba7d7b548a674a87bf507ca6 SHA512 7353ba29c754d3698cb13cdee347f9a2fe4bd9549898713ba99f4f5c490c6bd039d71a0d8490284dcb0319269f368f7f46de4f6b66cde9bba207171f3dc06e30
 DIST go.etcd.io%2Fbbolt%2F@v%2Fv1.3.2.mod 24 BLAKE2B f23f0532ce6fece605e76cd16e5f9a1fbf40657f26b2aa6a135bf300a232ffe8eaa9161f93d2845312b10ccb6dd5c4cfea40a2256b6481787ce9ddca7555b0fc SHA512 8988baa04517a19f905b323768f98690b19ce302d54da4648bf72baa2766c8ea8362efaf1c8dd2f02a82fb9c76e72f32373fd04cf48ff133804b6b251bd48529
 DIST go.etcd.io%2Fbbolt%2F@v%2Fv1.3.2.zip 111427 BLAKE2B 62d61989ac2e7f9b83238e9dbc3027600235213fb39846ce0bb45c84431d80fc3d570d27fba6538668e5a91a8e8331e4bbb081e9106a4409a191209be122fa7a SHA512 f4c1b9f826415b753235e6f71dfb0c2e25ae4dab4acfd632a6ace744e437ae0df9d86dafc79569c6184895e5398108a098a5e5eda57589046316ebc767571cdc
+DIST go.etcd.io%2Fbbolt%2F@v%2Fv1.3.3.mod 24 BLAKE2B f23f0532ce6fece605e76cd16e5f9a1fbf40657f26b2aa6a135bf300a232ffe8eaa9161f93d2845312b10ccb6dd5c4cfea40a2256b6481787ce9ddca7555b0fc SHA512 8988baa04517a19f905b323768f98690b19ce302d54da4648bf72baa2766c8ea8362efaf1c8dd2f02a82fb9c76e72f32373fd04cf48ff133804b6b251bd48529
+DIST go.etcd.io%2Fbbolt%2F@v%2Fv1.3.3.zip 112407 BLAKE2B af65ce0475f0b55ace7f03a7af6fdfaf8daae8b79e0ec1c9fd1aaa911cfe517c6760e6a5fb7881f87d7fed4da3274d14c78aa1424c85c003dc0fa98b092134ee SHA512 ff7060fd74bf2070006a55a739f6a8b64abc5ff09db2d2bc53fe978852e5b82f96bfc79c1f73b68e704bff423722f7adefba0b906de6d96d7e03c3e5740b7ac1
+DIST go.etcd.io%2Fetcd%2F@v%2Fv0.0.0-20191023171146-3cf2f69b5738.mod 2182 BLAKE2B 024744c8c4b0f296f32ce1af2407eae0eb760a443d43e2a1824254c9b2aace62966a2f0f5b5dbfb0cdaf66f2f00740ab653a2b429cc9aadeb3e48421dd6e180b SHA512 904249febd483a4504d49a1b769ded804042c34acd6b7f76503af9f43c76c53063888a7d0e15ee457107cf688108d2bff057330d9d44548b2a30979336370f09
 DIST go.etcd.io%2Fetcd%2F@v%2Fv3.3.13+incompatible.mod 23 BLAKE2B d7c442b8bc73b30a48b7416d878750c5d33103053eeed8e9e444d75f6772cda3d9f940e4816fbd6d5531a59a6d5ae128bac6042caec4ee008baa626954487cb5 SHA512 58c284df2f2a50dcb098d7f52bd60a6c4dedcc3d08a25d4fe6ef65e1879a7a68905b0b8a386c8f90637b087cf794fde3125b2c100bceb21d105449ae5f34898e
 DIST go.etcd.io%2Fetcd%2F@v%2Fv3.3.18+incompatible.mod 23 BLAKE2B d7c442b8bc73b30a48b7416d878750c5d33103053eeed8e9e444d75f6772cda3d9f940e4816fbd6d5531a59a6d5ae128bac6042caec4ee008baa626954487cb5 SHA512 58c284df2f2a50dcb098d7f52bd60a6c4dedcc3d08a25d4fe6ef65e1879a7a68905b0b8a386c8f90637b087cf794fde3125b2c100bceb21d105449ae5f34898e
 DIST go.opencensus.io%2F@v%2Fv0.18.0.mod 1118 BLAKE2B 55892f4e07819a81da5ad96866ff71d2195b51051b5786e11d1e7badca1804f8e7dc3231dc17f99c9d4d00df45e7825ea389a30be8fd0f0670e9620b551efb97 SHA512 6992b5459b8f831b93b69588300374d1ee59e27056887687dd52baf61bb18c41e2ca75079cb17acc339a9d94da79bb697aa96e68af966abd73408a724ab70d2e
@@ -943,11 +1073,14 @@ DIST go.uber.org%2Fzap%2F@v%2Fv1.14.1.mod 257 BLAKE2B 2e5fab0b1a188fb7fffa1c9ca0
 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.16.0.mod 282 BLAKE2B cd8f8b009c9a5c34381fa6946d29e228ba21595e3e5ac25eab1f2546a30b616ec885ddc5659a363856b9112a7c114088702b9c0f5f844e4bd180676dd6f696d1 SHA512 96c2bd0ba8c620be099d5bf69e5fa91309538ff29fe26836a6f74a9db5b9d7d00d3bb372222860744bd6644c89dc1ed7fef56daecedad92ed0cba5cdaa1e4c95
+DIST go.uber.org%2Fzap%2F@v%2Fv1.16.0.zip 231211 BLAKE2B 3a325fbc884563de82d57f4c4060dd01c236317a4e075c3bad03664a19a9e56587dff4fd8a5fbc60b581ee719239b1d45eb1cc424c35acefc84999ab85cd33eb SHA512 da2e30804aead70f6a865de5f5774bba955aa3728a67a322e22413641c75abffffd830f1e5968d6ba241c9012708758a1f1a3629d435954f20602fa9b435c909
 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
 DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20180621125126-a49355c7e3f8.mod 27 BLAKE2B f91145aab2cee00c3567772e97f6162b9681d6cbcbe67a1b5b2f59b8f912572f705a0d1280fdced086d92efd10c50ecede26d1cfa3d5419217e5eef95097b4b1 SHA512 a88da5b983ff482a4e8b512761eeee466a8b0664b42da54ec9772c2eb3cb1bc5b7545045e283bac82552336802d8bc8efe137ba16f3530228b529366744a33e6
 DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20180904163835-0709b304e793.mod 27 BLAKE2B f91145aab2cee00c3567772e97f6162b9681d6cbcbe67a1b5b2f59b8f912572f705a0d1280fdced086d92efd10c50ecede26d1cfa3d5419217e5eef95097b4b1 SHA512 a88da5b983ff482a4e8b512761eeee466a8b0664b42da54ec9772c2eb3cb1bc5b7545045e283bac82552336802d8bc8efe137ba16f3530228b529366744a33e6
+DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20181029021203-45a5f77698d3.mod 27 BLAKE2B f91145aab2cee00c3567772e97f6162b9681d6cbcbe67a1b5b2f59b8f912572f705a0d1280fdced086d92efd10c50ecede26d1cfa3d5419217e5eef95097b4b1 SHA512 a88da5b983ff482a4e8b512761eeee466a8b0664b42da54ec9772c2eb3cb1bc5b7545045e283bac82552336802d8bc8efe137ba16f3530228b529366744a33e6
 DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20181030102418-4d3f4d9ffa16.mod 27 BLAKE2B f91145aab2cee00c3567772e97f6162b9681d6cbcbe67a1b5b2f59b8f912572f705a0d1280fdced086d92efd10c50ecede26d1cfa3d5419217e5eef95097b4b1 SHA512 a88da5b983ff482a4e8b512761eeee466a8b0664b42da54ec9772c2eb3cb1bc5b7545045e283bac82552336802d8bc8efe137ba16f3530228b529366744a33e6
 DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20181203042331-505ab145d0a9.mod 27 BLAKE2B f91145aab2cee00c3567772e97f6162b9681d6cbcbe67a1b5b2f59b8f912572f705a0d1280fdced086d92efd10c50ecede26d1cfa3d5419217e5eef95097b4b1 SHA512 a88da5b983ff482a4e8b512761eeee466a8b0664b42da54ec9772c2eb3cb1bc5b7545045e283bac82552336802d8bc8efe137ba16f3530228b529366744a33e6
 DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190211182817-74369b46fc67.mod 27 BLAKE2B f91145aab2cee00c3567772e97f6162b9681d6cbcbe67a1b5b2f59b8f912572f705a0d1280fdced086d92efd10c50ecede26d1cfa3d5419217e5eef95097b4b1 SHA512 a88da5b983ff482a4e8b512761eeee466a8b0664b42da54ec9772c2eb3cb1bc5b7545045e283bac82552336802d8bc8efe137ba16f3530228b529366744a33e6
@@ -956,6 +1089,7 @@ DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190313024323-a1f597ede03a.mod 88 BL
 DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190418165655-df01cb2cc480.mod 88 BLAKE2B 22568b660b7e13eed0dd423bfb6b033adf659a2c2b59c6ab12d707aca9f6f7317b7b438640caf6233dea4d9840aec4eb997eff5fcccbcdb193ba81db52d814d7 SHA512 fcfc8d63d333065f1193e9c27efe32a1fab270e450fbe1db533156e00427a13c75691163cd1bc7e9aa26b84d4142625c9fbd755535c575f83d63d82d7a276066
 DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190510104115-cbcb75029529.mod 146 BLAKE2B 6fe18cbe4eb6c3f6c26a4d2f9f309c48eb9ea59017125179cbfd61bb1e62395515c8cb286e1139fbcf54d37dcb2baa1a2f98dcfbcb6178b7f7df3b51929ff5c5 SHA512 f40c7b620b28b5bdc6ce92d43768af71b5869e7f0eb7872dd0f2751eed2bd15a17f7af26bf2dc5c6f7e6b816a174d010bfd22b3f8f5dd72f22dc4e4357dea842
 DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190605123033-f99c8df09eb5.mod 146 BLAKE2B 6fe18cbe4eb6c3f6c26a4d2f9f309c48eb9ea59017125179cbfd61bb1e62395515c8cb286e1139fbcf54d37dcb2baa1a2f98dcfbcb6178b7f7df3b51929ff5c5 SHA512 f40c7b620b28b5bdc6ce92d43768af71b5869e7f0eb7872dd0f2751eed2bd15a17f7af26bf2dc5c6f7e6b816a174d010bfd22b3f8f5dd72f22dc4e4357dea842
+DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190701094942-4def268fd1a4.mod 146 BLAKE2B 6fe18cbe4eb6c3f6c26a4d2f9f309c48eb9ea59017125179cbfd61bb1e62395515c8cb286e1139fbcf54d37dcb2baa1a2f98dcfbcb6178b7f7df3b51929ff5c5 SHA512 f40c7b620b28b5bdc6ce92d43768af71b5869e7f0eb7872dd0f2751eed2bd15a17f7af26bf2dc5c6f7e6b816a174d010bfd22b3f8f5dd72f22dc4e4357dea842
 DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190911031432-227b76d455e7.mod 146 BLAKE2B 6fe18cbe4eb6c3f6c26a4d2f9f309c48eb9ea59017125179cbfd61bb1e62395515c8cb286e1139fbcf54d37dcb2baa1a2f98dcfbcb6178b7f7df3b51929ff5c5 SHA512 f40c7b620b28b5bdc6ce92d43768af71b5869e7f0eb7872dd0f2751eed2bd15a17f7af26bf2dc5c6f7e6b816a174d010bfd22b3f8f5dd72f22dc4e4357dea842
 DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190923035154-9ee001bba392.mod 146 BLAKE2B be8899d39fa75a36aa5a09db22d890466433efdd5310fbe61e7672f3c008a9aa34d038f844ca92450e9b8dde8c7d4d3649984f5edcb02abc34c71f46ce584c76 SHA512 173aab1e733ef5c18c3d259720c9fd7e46681d525ec934b4dc29a56beb91a362216768c28b50891b6230be003bb8e38636974e941d4fe6270a016798675fddea
 DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20191011191535-87dc89f01550.mod 146 BLAKE2B 6fe18cbe4eb6c3f6c26a4d2f9f309c48eb9ea59017125179cbfd61bb1e62395515c8cb286e1139fbcf54d37dcb2baa1a2f98dcfbcb6178b7f7df3b51929ff5c5 SHA512 f40c7b620b28b5bdc6ce92d43768af71b5869e7f0eb7872dd0f2751eed2bd15a17f7af26bf2dc5c6f7e6b816a174d010bfd22b3f8f5dd72f22dc4e4357dea842
@@ -1012,9 +1146,11 @@ DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20180724234803-3673e40ba225.mod 24 BLAKE
 DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20180826012351-8a410e7b638d.mod 24 BLAKE2B dad51d0aff48ef669f448f7b41bcdb153dbdc48863761ba1cac6aa3e3eaeec838e22733e6c61796b22bcc95d9e0a274085676bf191a8072717a398a067fe9e62 SHA512 d7446d3dd844b97512470f7ff05fce72d099f7800396e2738a54d41796f0f76be07e7aea1f638fee0190c7d8ce65eefc54eebe6917a06d14da04d0c9c8f9891a
 DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20180906233101-161cd47e91fd.mod 24 BLAKE2B dad51d0aff48ef669f448f7b41bcdb153dbdc48863761ba1cac6aa3e3eaeec838e22733e6c61796b22bcc95d9e0a274085676bf191a8072717a398a067fe9e62 SHA512 d7446d3dd844b97512470f7ff05fce72d099f7800396e2738a54d41796f0f76be07e7aea1f638fee0190c7d8ce65eefc54eebe6917a06d14da04d0c9c8f9891a
 DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20180911220305-26e67e76b6c3.mod 24 BLAKE2B dad51d0aff48ef669f448f7b41bcdb153dbdc48863761ba1cac6aa3e3eaeec838e22733e6c61796b22bcc95d9e0a274085676bf191a8072717a398a067fe9e62 SHA512 d7446d3dd844b97512470f7ff05fce72d099f7800396e2738a54d41796f0f76be07e7aea1f638fee0190c7d8ce65eefc54eebe6917a06d14da04d0c9c8f9891a
+DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20181023162649-9b4f9f5ad519.mod 24 BLAKE2B dad51d0aff48ef669f448f7b41bcdb153dbdc48863761ba1cac6aa3e3eaeec838e22733e6c61796b22bcc95d9e0a274085676bf191a8072717a398a067fe9e62 SHA512 d7446d3dd844b97512470f7ff05fce72d099f7800396e2738a54d41796f0f76be07e7aea1f638fee0190c7d8ce65eefc54eebe6917a06d14da04d0c9c8f9891a
 DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20181029044818-c44066c5c816.mod 24 BLAKE2B dad51d0aff48ef669f448f7b41bcdb153dbdc48863761ba1cac6aa3e3eaeec838e22733e6c61796b22bcc95d9e0a274085676bf191a8072717a398a067fe9e62 SHA512 d7446d3dd844b97512470f7ff05fce72d099f7800396e2738a54d41796f0f76be07e7aea1f638fee0190c7d8ce65eefc54eebe6917a06d14da04d0c9c8f9891a
 DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20181106065722-10aee1819953.mod 24 BLAKE2B dad51d0aff48ef669f448f7b41bcdb153dbdc48863761ba1cac6aa3e3eaeec838e22733e6c61796b22bcc95d9e0a274085676bf191a8072717a398a067fe9e62 SHA512 d7446d3dd844b97512470f7ff05fce72d099f7800396e2738a54d41796f0f76be07e7aea1f638fee0190c7d8ce65eefc54eebe6917a06d14da04d0c9c8f9891a
 DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20181114220301-adae6a3d119a.mod 24 BLAKE2B dad51d0aff48ef669f448f7b41bcdb153dbdc48863761ba1cac6aa3e3eaeec838e22733e6c61796b22bcc95d9e0a274085676bf191a8072717a398a067fe9e62 SHA512 d7446d3dd844b97512470f7ff05fce72d099f7800396e2738a54d41796f0f76be07e7aea1f638fee0190c7d8ce65eefc54eebe6917a06d14da04d0c9c8f9891a
+DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20181201002055-351d144fa1fc.mod 24 BLAKE2B dad51d0aff48ef669f448f7b41bcdb153dbdc48863761ba1cac6aa3e3eaeec838e22733e6c61796b22bcc95d9e0a274085676bf191a8072717a398a067fe9e62 SHA512 d7446d3dd844b97512470f7ff05fce72d099f7800396e2738a54d41796f0f76be07e7aea1f638fee0190c7d8ce65eefc54eebe6917a06d14da04d0c9c8f9891a
 DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20181220203305-927f97764cc3.mod 24 BLAKE2B dad51d0aff48ef669f448f7b41bcdb153dbdc48863761ba1cac6aa3e3eaeec838e22733e6c61796b22bcc95d9e0a274085676bf191a8072717a398a067fe9e62 SHA512 d7446d3dd844b97512470f7ff05fce72d099f7800396e2738a54d41796f0f76be07e7aea1f638fee0190c7d8ce65eefc54eebe6917a06d14da04d0c9c8f9891a
 DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190108225652-1e06a53dbb7e.mod 24 BLAKE2B dad51d0aff48ef669f448f7b41bcdb153dbdc48863761ba1cac6aa3e3eaeec838e22733e6c61796b22bcc95d9e0a274085676bf191a8072717a398a067fe9e62 SHA512 d7446d3dd844b97512470f7ff05fce72d099f7800396e2738a54d41796f0f76be07e7aea1f638fee0190c7d8ce65eefc54eebe6917a06d14da04d0c9c8f9891a
 DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190125091013-d26f9f9a57f3.mod 24 BLAKE2B dad51d0aff48ef669f448f7b41bcdb153dbdc48863761ba1cac6aa3e3eaeec838e22733e6c61796b22bcc95d9e0a274085676bf191a8072717a398a067fe9e62 SHA512 d7446d3dd844b97512470f7ff05fce72d099f7800396e2738a54d41796f0f76be07e7aea1f638fee0190c7d8ce65eefc54eebe6917a06d14da04d0c9c8f9891a
@@ -1032,6 +1168,7 @@ DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190603091049-60506f45cf65.mod 172 BLAK
 DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190613194153-d28f0bde5980.mod 181 BLAKE2B 95ef87cbad118eb6bfc963893e37a555067b7fcf70e52cf4261de029eb46b739b12f50530a46fb91ec9119febcf5033176324a55064f589c17b240a23a15bb4a SHA512 2794c616072f01ca3324107aad2ed97e05f6e6c1e9811a1749073376a89c9ce57a910cfdc8dd6bdc2583d133bb53605c7a68917eaa221ec5c1c8319e5dfbb236
 DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190620200207-3b0461eec859.mod 181 BLAKE2B 95ef87cbad118eb6bfc963893e37a555067b7fcf70e52cf4261de029eb46b739b12f50530a46fb91ec9119febcf5033176324a55064f589c17b240a23a15bb4a SHA512 2794c616072f01ca3324107aad2ed97e05f6e6c1e9811a1749073376a89c9ce57a910cfdc8dd6bdc2583d133bb53605c7a68917eaa221ec5c1c8319e5dfbb236
 DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190724013045-ca1201d0de80.mod 181 BLAKE2B 95ef87cbad118eb6bfc963893e37a555067b7fcf70e52cf4261de029eb46b739b12f50530a46fb91ec9119febcf5033176324a55064f589c17b240a23a15bb4a SHA512 2794c616072f01ca3324107aad2ed97e05f6e6c1e9811a1749073376a89c9ce57a910cfdc8dd6bdc2583d133bb53605c7a68917eaa221ec5c1c8319e5dfbb236
+DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190813141303-74dc4d7220e7.mod 181 BLAKE2B 95ef87cbad118eb6bfc963893e37a555067b7fcf70e52cf4261de029eb46b739b12f50530a46fb91ec9119febcf5033176324a55064f589c17b240a23a15bb4a SHA512 2794c616072f01ca3324107aad2ed97e05f6e6c1e9811a1749073376a89c9ce57a910cfdc8dd6bdc2583d133bb53605c7a68917eaa221ec5c1c8319e5dfbb236
 DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190923162816-aa69164e4478.mod 181 BLAKE2B 95ef87cbad118eb6bfc963893e37a555067b7fcf70e52cf4261de029eb46b739b12f50530a46fb91ec9119febcf5033176324a55064f589c17b240a23a15bb4a SHA512 2794c616072f01ca3324107aad2ed97e05f6e6c1e9811a1749073376a89c9ce57a910cfdc8dd6bdc2583d133bb53605c7a68917eaa221ec5c1c8319e5dfbb236
 DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190930134127-c5a3c61f89f3.mod 181 BLAKE2B 95ef87cbad118eb6bfc963893e37a555067b7fcf70e52cf4261de029eb46b739b12f50530a46fb91ec9119febcf5033176324a55064f589c17b240a23a15bb4a SHA512 2794c616072f01ca3324107aad2ed97e05f6e6c1e9811a1749073376a89c9ce57a910cfdc8dd6bdc2583d133bb53605c7a68917eaa221ec5c1c8319e5dfbb236
 DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20191002035440-2ec189313ef0.mod 181 BLAKE2B 95ef87cbad118eb6bfc963893e37a555067b7fcf70e52cf4261de029eb46b739b12f50530a46fb91ec9119febcf5033176324a55064f589c17b240a23a15bb4a SHA512 2794c616072f01ca3324107aad2ed97e05f6e6c1e9811a1749073376a89c9ce57a910cfdc8dd6bdc2583d133bb53605c7a68917eaa221ec5c1c8319e5dfbb236
@@ -1047,8 +1184,11 @@ DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200301022130-244492dfa37a.zip 1500173
 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-20200625001655-4c5254603344.mod 181 BLAKE2B 05d6754fa387bac4a6481ad34fb7b681064fc6443b3f70cba316fe2fd0896050e4a772fd8e1be655130a00bb5feaded4725ffea1c5dd6ba55ba55315aaae34d2 SHA512 54d242da2536da38e292b62a955b3961f7b0a9789fe36c5f7ae93577eeac734a6e5bac21a657cf71d488395278cd7683db538e16a9c853835277a800a9d43471
 DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200707034311-ab3426394381.mod 181 BLAKE2B 05d6754fa387bac4a6481ad34fb7b681064fc6443b3f70cba316fe2fd0896050e4a772fd8e1be655130a00bb5feaded4725ffea1c5dd6ba55ba55315aaae34d2 SHA512 54d242da2536da38e292b62a955b3961f7b0a9789fe36c5f7ae93577eeac734a6e5bac21a657cf71d488395278cd7683db538e16a9c853835277a800a9d43471
 DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200707034311-ab3426394381.zip 1503811 BLAKE2B c8cfe6b14a455a6ad71c42ce03235c650b7efe842131874cf99570716907e02c9fbe42df586e69332189518cbdcf6e2e417caebec84ce928e7ba959b66ab869c SHA512 bc3772a7ae7cd2b50f61ec8d07e7f7e1af9f24e0b737131da375a525be44dc993ee740ce0a11e0baaf0cbd81e819e3ecad889c0c7ece95086cb428e52b10a785
+DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20201110031124-69a78807bb2b.mod 181 BLAKE2B 3d3ddd23252ae7c54121211421c04a53076d3c347a9511c24494ded58863b0e96b2fefbdd10ee783bb3c0089cca1af91358701ef709fbd52a2c2d1fdec011939 SHA512 098a7d7eadb99bc1eb8695f1d86e1ed2ec2f5f625045f3ed77648d4ef7047818cfc449d46c8a6ccf285f95956baf228c1c57d6e281da1f63f67cfa0f93ca4230
+DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20201110031124-69a78807bb2b.zip 1580428 BLAKE2B 3bc05480dc51b5f2b1b67473a4955a40218100e989f6dff8d1bb337cee52b451554f743448f8b39c3df73066c30f0b7740303807141ff2580a0a9a5b96e3ff21 SHA512 d2d645328924c9e9eb76e267cb47a7397f5cb200ee0a1a295eac1b0da4ba87657c64a7b8f2fc8aea3a359c4f44255e8d44fc06e40c65db539f50f9738b55cb47
 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
@@ -1071,9 +1211,11 @@ DIST golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20190911185100-cd5d95a43a6e.zip 26635 B
 DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20171026204733-164713f0dfce.mod 24 BLAKE2B 64a70c4594f5d3c37d962c1ed07630fba8abeaf534242f8f1509af271684499252af9a2320d5bac8e44064dba344b807535e4e9dd085fc0fb47bd9304120601a SHA512 ffe50fccf7f1d200f2ebc805b190e3f10c5a3184458a38f4590e520d7ce115e1520fbabe56651bbdc2e08da4a8db5ac86d0e88728efde3ab26c64ab4e0cd604c
 DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20180202135801-37707fdb30a5.mod 24 BLAKE2B 64a70c4594f5d3c37d962c1ed07630fba8abeaf534242f8f1509af271684499252af9a2320d5bac8e44064dba344b807535e4e9dd085fc0fb47bd9304120601a SHA512 ffe50fccf7f1d200f2ebc805b190e3f10c5a3184458a38f4590e520d7ce115e1520fbabe56651bbdc2e08da4a8db5ac86d0e88728efde3ab26c64ab4e0cd604c
 DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20180622082034-63fc586f45fe.mod 24 BLAKE2B 64a70c4594f5d3c37d962c1ed07630fba8abeaf534242f8f1509af271684499252af9a2320d5bac8e44064dba344b807535e4e9dd085fc0fb47bd9304120601a SHA512 ffe50fccf7f1d200f2ebc805b190e3f10c5a3184458a38f4590e520d7ce115e1520fbabe56651bbdc2e08da4a8db5ac86d0e88728efde3ab26c64ab4e0cd604c
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20180823144017-11551d06cbcc.mod 24 BLAKE2B 64a70c4594f5d3c37d962c1ed07630fba8abeaf534242f8f1509af271684499252af9a2320d5bac8e44064dba344b807535e4e9dd085fc0fb47bd9304120601a SHA512 ffe50fccf7f1d200f2ebc805b190e3f10c5a3184458a38f4590e520d7ce115e1520fbabe56651bbdc2e08da4a8db5ac86d0e88728efde3ab26c64ab4e0cd604c
 DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20180830151530-49385e6e1522.mod 24 BLAKE2B 64a70c4594f5d3c37d962c1ed07630fba8abeaf534242f8f1509af271684499252af9a2320d5bac8e44064dba344b807535e4e9dd085fc0fb47bd9304120601a SHA512 ffe50fccf7f1d200f2ebc805b190e3f10c5a3184458a38f4590e520d7ce115e1520fbabe56651bbdc2e08da4a8db5ac86d0e88728efde3ab26c64ab4e0cd604c
 DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20180905080454-ebe1bf3edb33.mod 24 BLAKE2B 64a70c4594f5d3c37d962c1ed07630fba8abeaf534242f8f1509af271684499252af9a2320d5bac8e44064dba344b807535e4e9dd085fc0fb47bd9304120601a SHA512 ffe50fccf7f1d200f2ebc805b190e3f10c5a3184458a38f4590e520d7ce115e1520fbabe56651bbdc2e08da4a8db5ac86d0e88728efde3ab26c64ab4e0cd604c
 DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20180909124046-d0be0721c37e.mod 24 BLAKE2B 64a70c4594f5d3c37d962c1ed07630fba8abeaf534242f8f1509af271684499252af9a2320d5bac8e44064dba344b807535e4e9dd085fc0fb47bd9304120601a SHA512 ffe50fccf7f1d200f2ebc805b190e3f10c5a3184458a38f4590e520d7ce115e1520fbabe56651bbdc2e08da4a8db5ac86d0e88728efde3ab26c64ab4e0cd604c
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20181026203630-95b1ffbd15a5.mod 24 BLAKE2B 64a70c4594f5d3c37d962c1ed07630fba8abeaf534242f8f1509af271684499252af9a2320d5bac8e44064dba344b807535e4e9dd085fc0fb47bd9304120601a SHA512 ffe50fccf7f1d200f2ebc805b190e3f10c5a3184458a38f4590e520d7ce115e1520fbabe56651bbdc2e08da4a8db5ac86d0e88728efde3ab26c64ab4e0cd604c
 DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20181029174526-d69651ed3497.mod 24 BLAKE2B 64a70c4594f5d3c37d962c1ed07630fba8abeaf534242f8f1509af271684499252af9a2320d5bac8e44064dba344b807535e4e9dd085fc0fb47bd9304120601a SHA512 ffe50fccf7f1d200f2ebc805b190e3f10c5a3184458a38f4590e520d7ce115e1520fbabe56651bbdc2e08da4a8db5ac86d0e88728efde3ab26c64ab4e0cd604c
 DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20181107165924-66b7b1311ac8.mod 24 BLAKE2B 64a70c4594f5d3c37d962c1ed07630fba8abeaf534242f8f1509af271684499252af9a2320d5bac8e44064dba344b807535e4e9dd085fc0fb47bd9304120601a SHA512 ffe50fccf7f1d200f2ebc805b190e3f10c5a3184458a38f4590e520d7ce115e1520fbabe56651bbdc2e08da4a8db5ac86d0e88728efde3ab26c64ab4e0cd604c
 DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20181116152217-5ac8a444bdc5.mod 24 BLAKE2B 64a70c4594f5d3c37d962c1ed07630fba8abeaf534242f8f1509af271684499252af9a2320d5bac8e44064dba344b807535e4e9dd085fc0fb47bd9304120601a SHA512 ffe50fccf7f1d200f2ebc805b190e3f10c5a3184458a38f4590e520d7ce115e1520fbabe56651bbdc2e08da4a8db5ac86d0e88728efde3ab26c64ab4e0cd604c
@@ -1097,6 +1239,7 @@ DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190626221950-04f50cda93cb.mod 33 BLAKE
 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-20190826190057-c7b8b68b1456.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
 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
@@ -1124,12 +1267,18 @@ DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200413165638-669c56c373c4.mod 33 BLAKE
 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%2Fsys%2F@v%2Fv0.0.0-20200625212154-ddb9806d33ae.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200930185726-fdedc70b468f.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20201214210602-f9fddec55a1e.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20201214210602-f9fddec55a1e.zip 1532022 BLAKE2B 8deaad7f0040f695cc5f98eeed5ffa9d0b66fc1938b1a551f7e409aeea2216df6f2ddc5afdb64ffd935d556a9d6ecaf9059118cdb05cfe13e8224229627dd9d5 SHA512 c416507064872878d070b4d0a1e8207ded1f149de8572951654feca5e349a5cb8e8ddf62fd26aee502cf73adf3d4dc7c90f8dff6702e8a67c49713d02e31c13a
 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
 DIST golang.org%2Fx%2Ftext%2F@v%2Fv0.3.1-0.20180807135948-17ff2d5776d2.mod 25 BLAKE2B 31009af0fdcd0f8730c9985287e6e364ec4e5183e57e92560dbc80a2010eced51b8a90f01a82b49384268c8a0adbf69d179c205d3f68e0eb459169d2ea9528f0 SHA512 ca081ef7cccd7bbedc6843fbe0c452352661a07e1298cd02ff338ed79d807c6401d613a3cf20011189d2f98a794ffa410547b3e352eb58a6f0a84822285d391d
 DIST golang.org%2Fx%2Ftext%2F@v%2Fv0.3.2.mod 88 BLAKE2B f3dd520e0e4e9b57feab62ecabb9169f37f1ce49b2846b949f9266f807767d38f55e4aa8ea006229c6f81cfc1e2c9dc0d1e3c186235e416dfb90fe7e04751d07 SHA512 d9361afb453b10c9d02787568ec33ea4c97a115899c6b3d1a1246547a749244e9218475ae5ae9f741d9b355260d2d3c33852673e805fcdd5f26f3ca40f035884
 DIST golang.org%2Fx%2Ftext%2F@v%2Fv0.3.2.zip 7430601 BLAKE2B d2403817cb6b7e32462b90995412c4e63cfdeaf3710fc9386f4b708e0ae2be9593649e923f0d844dc4420b177e42e7abfa7657e03e27fa08be9e98d76da4cb9c SHA512 8d8dad296f1497f352e94c416711dbb1f468901a3fd2dfd0a9c67f2d59306ea611d77917289521d2845f6958f571f6c3fe2d3dab289524d8145489d5b386fbaa
+DIST golang.org%2Fx%2Ftext%2F@v%2Fv0.3.3.mod 97 BLAKE2B ed93c1d43f199d8cbd43cb25edac5de569cb78773d7f3232d59a0a4de6d174c5c100db2b02ca42c51f3e17e0f5e781ba9b5641a512b0dc72dcfaa5f6bd7d451b SHA512 f3f68808ccf5223453f765f59db1ef551b2130069eb83518878961c2d4a2044f9049f8d49df6e67699fcd2645cf90b84d35626590b2cfbca302fcf0eac76dc8b
+DIST golang.org%2Fx%2Ftext%2F@v%2Fv0.3.3.zip 8010747 BLAKE2B 78d999113a75f84966ffd23356e7cf60811b614754936851f197e547657cb6ff40acd074593c9cb6a2ae39ba625b36731c2fc0bc4b2b5ff68a2d377a6c7192db SHA512 024719305765ca737b225fec6268f84fc4c7d17c04e31eadfacafbb24a5f30af61920f4633e95d74dd2a266de40d1d2d13587881a3c22829ffeafb01fd75959f
 DIST golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20180412165947-fbb02b2291d2.mod 25 BLAKE2B ba9e31cf2a4ab0f78a5c67d78026c2ef9571bcff7c820ce212637c8360420af274bfc47cb14bbc3df24457a4d3acb5dee38448a848abbd4e82232bef05b6b2e9 SHA512 6e51811c33b84ddd4a7548013579204266e466bd2e87aa9b6e34892570aa09c607ffa806f8a420474e26ca0e277ab23c81bb07b0ebf2c3b6ed193014c1bc37a7
 DIST golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20181108054448-85acf8d2951c.mod 25 BLAKE2B ba9e31cf2a4ab0f78a5c67d78026c2ef9571bcff7c820ce212637c8360420af274bfc47cb14bbc3df24457a4d3acb5dee38448a848abbd4e82232bef05b6b2e9 SHA512 6e51811c33b84ddd4a7548013579204266e466bd2e87aa9b6e34892570aa09c607ffa806f8a420474e26ca0e277ab23c81bb07b0ebf2c3b6ed193014c1bc37a7
 DIST golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20190308202827-9d24e82272b4.mod 25 BLAKE2B ba9e31cf2a4ab0f78a5c67d78026c2ef9571bcff7c820ce212637c8360420af274bfc47cb14bbc3df24457a4d3acb5dee38448a848abbd4e82232bef05b6b2e9 SHA512 6e51811c33b84ddd4a7548013579204266e466bd2e87aa9b6e34892570aa09c607ffa806f8a420474e26ca0e277ab23c81bb07b0ebf2c3b6ed193014c1bc37a7
@@ -1234,6 +1383,7 @@ DIST google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190307195333-5fe7a883aa19.mod
 DIST google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190418145605-e7d98fc518a7.mod 450 BLAKE2B bf0efd5f0ff915b9f59fa81611892e70644a4b14fefd15190d0ff68043f7809f51d53766dc50fc0eb9372df3e6590d3fbcf51aec5e9b0c18027e156ce53b8df1 SHA512 37a99611220df08ac5f15ed6f718f37a35523f5cef392b7b7da86b0eaf05e4fa5e52aceb42a6b6ddf6924b1f7cc151876d2e532c83dd2edbcca7c41b9191c427
 DIST google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190425155659-357c62f0e4bb.mod 450 BLAKE2B bf0efd5f0ff915b9f59fa81611892e70644a4b14fefd15190d0ff68043f7809f51d53766dc50fc0eb9372df3e6590d3fbcf51aec5e9b0c18027e156ce53b8df1 SHA512 37a99611220df08ac5f15ed6f718f37a35523f5cef392b7b7da86b0eaf05e4fa5e52aceb42a6b6ddf6924b1f7cc151876d2e532c83dd2edbcca7c41b9191c427
 DIST google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190502173448-54afdca5d873.mod 450 BLAKE2B bf0efd5f0ff915b9f59fa81611892e70644a4b14fefd15190d0ff68043f7809f51d53766dc50fc0eb9372df3e6590d3fbcf51aec5e9b0c18027e156ce53b8df1 SHA512 37a99611220df08ac5f15ed6f718f37a35523f5cef392b7b7da86b0eaf05e4fa5e52aceb42a6b6ddf6924b1f7cc151876d2e532c83dd2edbcca7c41b9191c427
+DIST google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190530194941-fb225487d101.mod 331 BLAKE2B 7a174749635ef1cfd4ef7a5c67d29c51934734bb7d7d0873f56a461f040373213cd4c5deac8fe12b3ee75b7c210e5d26e7b378e31214ea0278ac84eb001f99fd SHA512 1ab2bfe29c78700b879cd08ba8993d452715b4d374d349f48018a7ea8bd5999c236be0d164fe8d340d660e222e229f8ed490b7d8f5c931e754f3617510145905
 DIST google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190605220351-eb0b1bdb6ae6.mod 331 BLAKE2B 7a174749635ef1cfd4ef7a5c67d29c51934734bb7d7d0873f56a461f040373213cd4c5deac8fe12b3ee75b7c210e5d26e7b378e31214ea0278ac84eb001f99fd SHA512 1ab2bfe29c78700b879cd08ba8993d452715b4d374d349f48018a7ea8bd5999c236be0d164fe8d340d660e222e229f8ed490b7d8f5c931e754f3617510145905
 DIST google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190801165951-fa694d86fc64.mod 331 BLAKE2B 63923e4fcfa896f163dc77009fbdee8ce8c2e31a4694b6ccddf3397cad5c89a3be5796dbc65b77cf059f1601729d976f9afd2969bd426c0cd8781b106ffe0be8 SHA512 9f22a11a1d639cc7a465b6e826c2bc3915fe0ac847159a38c470f0b1631d6f6b2e0ae0548344f7a8e97161d4c6b80113062c04062b7ab887d7d615c39cbfc2dd
 DIST google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190819201941-24fa4b261c55.mod 331 BLAKE2B 63923e4fcfa896f163dc77009fbdee8ce8c2e31a4694b6ccddf3397cad5c89a3be5796dbc65b77cf059f1601729d976f9afd2969bd426c0cd8781b106ffe0be8 SHA512 9f22a11a1d639cc7a465b6e826c2bc3915fe0ac847159a38c470f0b1631d6f6b2e0ae0548344f7a8e97161d4c6b80113062c04062b7ab887d7d615c39cbfc2dd
@@ -1253,6 +1403,7 @@ 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-20200416231807-8751e049a2a0.mod 287 BLAKE2B ac895df309c4c2533900f7ff3aaecd59bf883fad6fde8fc7ffef9928fc8f18402fb2198bb3f0b75e876adb7d5d0e37073fc251d149245847ebdd95de1cdf6cd3 SHA512 44dc287d4a33c4225229768c59d1b9e61b51fdc27b1745a8161b17bdef4499cb08ebc565c56caa01673317cbef46cb228ac69b9ada7d4bac870b22eddf5a2977
 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
@@ -1261,10 +1412,13 @@ DIST google.golang.org%2Fgrpc%2F@v%2Fv1.16.0.mod 903 BLAKE2B dd9ff44489e2a944c07
 DIST google.golang.org%2Fgrpc%2F@v%2Fv1.17.0.mod 832 BLAKE2B 9de27394e05cf42e762a8b7ed42b6715244ea1086acd7c44f71b04bc0dc23c31ab236e6474fea423953eb3001dcaa357938daad1d54debfb5d52bdecc1de6bda SHA512 ac90f3fc374cc1ac7706146efaa8488a59634a209c30bf87453fa150bf8849870db2ec04e854438d59911ea35930a5dd8f40f5d5954786d0e0565907fc42f711
 DIST google.golang.org%2Fgrpc%2F@v%2Fv1.19.0.mod 833 BLAKE2B 71052eaeaf40883bff624eecce8fd6f5669fdea9355e6ae0db9c86c841a62f7176d5ab58838d1645f59b9cb4ad4b636048aa3e9f1d7db521104b8f09dc535bc7 SHA512 38c4f75a0121cecd31b2628da3c3d77aeeb9b2c1974eef2d2d2bb7a3eb507d330debb7f14a724c8910174439b38ab54458096aaf665ea4af87a83f866ca0452e
 DIST google.golang.org%2Fgrpc%2F@v%2Fv1.19.1.mod 833 BLAKE2B 71052eaeaf40883bff624eecce8fd6f5669fdea9355e6ae0db9c86c841a62f7176d5ab58838d1645f59b9cb4ad4b636048aa3e9f1d7db521104b8f09dc535bc7 SHA512 38c4f75a0121cecd31b2628da3c3d77aeeb9b2c1974eef2d2d2bb7a3eb507d330debb7f14a724c8910174439b38ab54458096aaf665ea4af87a83f866ca0452e
+DIST google.golang.org%2Fgrpc%2F@v%2Fv1.20.0.mod 979 BLAKE2B cac1528e7af91a98ad2e1fcaee0892547eac67d1d6ce29473c1114eb2c373acebad87008124924adc3f1a98cc4a2911c1679cd7f24f025ffe0d4902d123a6639 SHA512 558a4f5d7910813809d7edead3f7e2300936a262e289905dc1e33ba293d89d9bb590ae0f8b00bedc1e30288257ac66d7edc2d3f3f657d2d31ffaef7ff0e24f92
 DIST google.golang.org%2Fgrpc%2F@v%2Fv1.20.1.mod 795 BLAKE2B b825f2ab62a96b9b164410f761228575fd9882de37635c09803b9d2ce682ebbec30f301fd874aafaad95a5aa2431ba25962073e1bd4f336d8cb137e5939a8708 SHA512 585d4cf68b50a70d7967ac3941a7a83b83ed5df1a31773589a38348b6fdf247eb49e7778f7054b78ba1a65eef48d004a815abad932876cb1af2c09deea9c0db8
 DIST google.golang.org%2Fgrpc%2F@v%2Fv1.21.0.mod 828 BLAKE2B a57ef0fe7edabd002918282ba9ef83386689db2688fd8f1b9ebedd191bb0b7059cc0b99d95974ab68112cd48e1865558d314dda64c71ab239de39fe6e8f0db5b SHA512 f9ab0c8ed5a58799a39f64c63b995badb24d8ba1148c7a1be1e3342d1b0d6a6e334fa2cab16f8e9396907e60386cbccb6495dbbe3ca09440bb878e10e1686d62
 DIST google.golang.org%2Fgrpc%2F@v%2Fv1.21.1.mod 828 BLAKE2B a57ef0fe7edabd002918282ba9ef83386689db2688fd8f1b9ebedd191bb0b7059cc0b99d95974ab68112cd48e1865558d314dda64c71ab239de39fe6e8f0db5b SHA512 f9ab0c8ed5a58799a39f64c63b995badb24d8ba1148c7a1be1e3342d1b0d6a6e334fa2cab16f8e9396907e60386cbccb6495dbbe3ca09440bb878e10e1686d62
+DIST google.golang.org%2Fgrpc%2F@v%2Fv1.22.1.mod 762 BLAKE2B 3c67c1bfdf0cef36f702e4a56d42cd7861cc573282ecf1667c7b19b97b8329a67f34a4c2ef3b2b865cabbd35a03dc43284e4c1af90dd8bb6018b0d8a192484b5 SHA512 4ea69ff3644e3e51f4a9ce73325a995b119088a9c97fec4a4811d1d9f119799182cd4dac377e3b58d96e10b8f6ba500a85ad72463ef4305d04ed1c55261526c2
 DIST google.golang.org%2Fgrpc%2F@v%2Fv1.23.0.mod 762 BLAKE2B 3c67c1bfdf0cef36f702e4a56d42cd7861cc573282ecf1667c7b19b97b8329a67f34a4c2ef3b2b865cabbd35a03dc43284e4c1af90dd8bb6018b0d8a192484b5 SHA512 4ea69ff3644e3e51f4a9ce73325a995b119088a9c97fec4a4811d1d9f119799182cd4dac377e3b58d96e10b8f6ba500a85ad72463ef4305d04ed1c55261526c2
+DIST google.golang.org%2Fgrpc%2F@v%2Fv1.23.1.mod 762 BLAKE2B 3c67c1bfdf0cef36f702e4a56d42cd7861cc573282ecf1667c7b19b97b8329a67f34a4c2ef3b2b865cabbd35a03dc43284e4c1af90dd8bb6018b0d8a192484b5 SHA512 4ea69ff3644e3e51f4a9ce73325a995b119088a9c97fec4a4811d1d9f119799182cd4dac377e3b58d96e10b8f6ba500a85ad72463ef4305d04ed1c55261526c2
 DIST google.golang.org%2Fgrpc%2F@v%2Fv1.24.0.mod 771 BLAKE2B ec4ea0b34d044e7a4dab50109d3b4e9b0081c538bd568155c4aa7a6370dd0ec31a18f3d1d294ad87af95cd58f2ac885026d07d43d21df1eee2c926dd4d8b2712 SHA512 b6c886622095b3999f108230f6cd3dddb72157180b0ad1a539919289b2e0c8496ebfaab369d65e83d6fd6eeb97b618b49a834c7ad3b98afc996f290d49c936fa
 DIST google.golang.org%2Fgrpc%2F@v%2Fv1.26.0.mod 562 BLAKE2B 33a46aa2516aa10a1bfed0431c4f3d41554aa8ab5cff1f259323c47999696d0cdf9113f162eebf3bbc18cea163f1c6f8225777653191380cfccf06e5921db81e SHA512 6e06146c3ee73338a24698b08d0091dca5cc67d033e1a98ca28157dccd8e056a3a2624c798180eda5917f90e1e37aff31158cb8ab2cedeb8e4578324719605ef
 DIST google.golang.org%2Fgrpc%2F@v%2Fv1.26.0.zip 1101208 BLAKE2B bee7938f7e39bd6acfe03bf03e1d4787f30384f34fbf292ddabf7e172dcf8736ebc0d32f7d26bdf0021252dcb984766bc3b778312434a4ffc5f515f009fd26ed SHA512 8b90599cca0b31538086a5d65dc124c2e7641ec42b4774b15b3f5cb063b39f3d8f83a7114e89e6aac1dc4cebbac526105378a3cd9504bc723cb26781b5d214fd
@@ -1288,10 +1442,12 @@ DIST gopkg.in%2Fcheck.v1%2F@v%2Fv1.0.0-20180628173108-788fd7840127.mod 25 BLAKE2
 DIST gopkg.in%2Fcheck.v1%2F@v%2Fv1.0.0-20180628173108-788fd7840127.zip 41465 BLAKE2B 9a7183d3ac6591399b5208026208047a670c85e8b6014ad29955b168c63bb4953fa972d31025613c2ab12d7207adeebe9578b3c15b65ebb792f1e41df2668297 SHA512 fa7c68a2b5a6bb14f99cda92a3e77aad0e4160f659c54ea73e9813af9ff9449df6b0cab42ee283971e778b6b9da4a6098df805dd284c3b1aedfcd3a0b8504bde
 DIST gopkg.in%2Fcheck.v1%2F@v%2Fv1.0.0-20190902080502-41f04d3bba15.mod 25 BLAKE2B 6470f3d94700c4d8b3176d692bdb91646750f2c6a866ff2ef4183aff1de01f024a8757f97b4626ec0355092e5f25e7ded91cd5be845f627d107c58b1daf400d7 SHA512 9ac0f80ef05881387cb2f48f81560f3207fe586ea16495383662e6d62e43d93fac01dfe72e1d0063d3ab065331dab3a8098d7da4f1830ba1aff6f27f8e1bc1b2
 DIST gopkg.in%2Fcheck.v1%2F@v%2Fv1.0.0-20190902080502-41f04d3bba15.zip 41481 BLAKE2B b952f04dc8d4717c839de5a5b7780ec2434915d11f897cc759647f71073dd3df717e1195ff2f4f804457195886c63620b342a089fc489f5deafa9c928708d4bb SHA512 40a523fc1dcc36677a0dc0e626313d44a308fa2ad5eedf7b616470ae2972dd8f5b78c18384efffa65d58391e60b704ed35db5557a5dce8362ae45204f64b721d
+DIST gopkg.in%2Fcheggaaa%2Fpb.v1%2F@v%2Fv1.0.25.mod 31 BLAKE2B 1a4baffd98c62173795d54bc25845b710fe8391726fc5d67cd6025131f783a3d94cd474299d72f5f077dc529203dcdf7a069268dc30fa39d9b3f7fab566df45b SHA512 b8685a6e649de49671d079375ba2132a467bb015a29a7182744caa9464f5e7ac72a952b10faf04e5b6d745ec955b565dc03cbc4ca9849d23ebd5303a12f18401
 DIST gopkg.in%2Fcheggaaa%2Fpb.v1%2F@v%2Fv1.0.28.mod 31 BLAKE2B 1a4baffd98c62173795d54bc25845b710fe8391726fc5d67cd6025131f783a3d94cd474299d72f5f077dc529203dcdf7a069268dc30fa39d9b3f7fab566df45b SHA512 b8685a6e649de49671d079375ba2132a467bb015a29a7182744caa9464f5e7ac72a952b10faf04e5b6d745ec955b565dc03cbc4ca9849d23ebd5303a12f18401
 DIST gopkg.in%2Ferrgo.v2%2F@v%2Fv2.1.0.mod 133 BLAKE2B c4ac637e2bf2d6635065be5213d73f23a1870054c58e9f1cce93af4627ed6fdefa96798b0fbbd27666573757f8b4a48c694ddf3f86c98e898124294459500771 SHA512 cac59fd7470fc9d3203dab6b9e881d4182cfca5acf0a19207a9aff2964d42f20422f9a164bb52b2fa73c523e3caafd63028189bd4190a1670870154dbf3e8178
 DIST gopkg.in%2Ffsnotify.v1%2F@v%2Fv1.4.7.mod 28 BLAKE2B ee2514c386f6cb3ff4a9b829d903e57372ce765aeab91fb2f29e95358e3472e0612a00f2982f53790159738e416819e368afa03e44bf8f6b43511347bc6d6995 SHA512 7cf7d1933039974dd4fa16febc52cc118bcd0e35c329d4c563c7f411b8000d9e17be5bca9a60d94f5309cbef97b3d176110704ebfbc3c114572cbadf63a55a34
 DIST gopkg.in%2Ffsnotify.v1%2F@v%2Fv1.4.7.zip 40894 BLAKE2B 5edf237401ae1a48c425ffec6fc67146850d7137c7026260e894656f6c832066321d930151bdd7624489e1f768fc04b47b0fd3dac3b2171bd092dff344de16a7 SHA512 f99afc545324e49ef1de05fd4c8dde0dae37094e2fb1b81de8d8c9b8ba9b28f39f9b5ab715c728e4a0375544a48d49c2dbd719fc178d222e0b914a425d9aeb63
+DIST gopkg.in%2Fgcfg.v1%2F@v%2Fv1.2.3.mod 24 BLAKE2B 2e460175791185a1eeaec63e12c62c4151b0dd57c9f1e21a2849d834d762c928c843b59a0ec9a2000e8bcf6e86a4c3cea4895c40b99451148e9e4ccd95ffa815 SHA512 cb839ecb3ad2ea4ac9f449a9a0a71dddd03b6988321ccd655cad1d66e042fe2618c635a8ce5ee6a96c5944a12053ef658fc13e54aeb69a5649523f5cd0252252
 DIST gopkg.in%2Fgemnasium%2Flogrus-airbrake-hook.v2%2F@v%2Fv2.1.2.mod 50 BLAKE2B c715a977e733670d4047cc0f62fd485ce2af214d87e799cdea97015f64ee66488e1f68f4aec8e8ab139cd70574a0dd5f54b7bcedad09b8890ad098bcb01d7f5f SHA512 2d48fa45b7183412ac358a60c0af0b3c2f77d5c461f6bf4ba5d7a162195d49076870e739ac6c59e95d41dae2002370f52faf183fd6ca7999d60374866fa3ebdc
 DIST gopkg.in%2Fh2non%2Fgock.v1%2F@v%2Fv1.0.15.mod 157 BLAKE2B 7cf57f0b8cd6b3dfac7e0cb7261d09f3526675ccd027be664aa6d9531578772d1ae3446e6b6cfd827abc30b5fdd9a3711cce768856a0fc18ecd2617aa948a685 SHA512 7673f93817e1fc32353a1d5b72d11e3697cf8c9e87c6d88bc9981ac8d6a36778e29d433efbb42aafb7b75f515acf5e5f42c55483481c3f5615799c5735c720bf
 DIST gopkg.in%2Fh2non%2Fgock.v1%2F@v%2Fv1.0.15.zip 46894 BLAKE2B 7bb6d2acf1604c1af4f8fe6440faa5f8f5e3b43d5079a7fb0348039438278da4ab6a9cbc96ba05b5bcd3f61772d7fbf8db19f0629b20832bc7642aaf05bf21ac SHA512 dadb8035d7573871d75370025bcafd8678bf5b86c329065fe68a17d6f5bb248d804fc9e1de6f304a74c993557f31ce20e7dee2e125187dfdd621b43721d603da
@@ -1316,6 +1472,7 @@ DIST gopkg.in%2Fsquare%2Fgo-jose.v2%2F@v%2Fv2.5.1.mod 34 BLAKE2B 618a69c0e95948b
 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%2Fwarnings.v0%2F@v%2Fv0.1.2.mod 28 BLAKE2B 39555ca91c4818bcc1955c20438d83965ad6f1b2058c6d8590f4c30688eab2ac08dfa1655d4de34bd68006afea1788a89fb0240d60b048be9616c8e44d8a801f SHA512 6fe714c089847582c8c01e055e4bd6b991e8fddc6e420aa03a40efb35fc4ecc5e87a60c44aa82fe004899eab427d4b82262cfebb3331b7443a2c7a68718f8f75
 DIST gopkg.in%2Fyaml.v2%2F@v%2Fv2.0.0-20170812160011-eb3733d160e7.mod 24 BLAKE2B 1cb17a1c6b1eb33cebd983f9e965f6db03f5095441d7cd72aff6df805501eef4dc249c22ecc85da360c27696a7c4ae613f0769a1f89e73f286281de89ffd3ef2 SHA512 89b481cc62ed7a486990ebfcf65cf7a344e5d189deef680e6ddd82dc93f31d166af05fc27b4a95ea27c33fd3ced1b87d4050d617d52008ca059c4a5d3b6c26a9
 DIST gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.1.mod 95 BLAKE2B adb3684980f1d8e6c23444e91028f8db55f1bc496114eb3508dbecf9917dbc8a0a4bed7c0d761123335a75b9ffe727e180f2d6aa5f84312edb05a798185c8362 SHA512 916ff67ddb6c2ba39905db4277ce42596d9ca5a42f8aa7f47f16335e78d91a1b30419fd1b7b6967b37e248363397ec527b38d2f500b3546edda5d2bce1944379
 DIST gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.2.mod 95 BLAKE2B adb3684980f1d8e6c23444e91028f8db55f1bc496114eb3508dbecf9917dbc8a0a4bed7c0d761123335a75b9ffe727e180f2d6aa5f84312edb05a798185c8362 SHA512 916ff67ddb6c2ba39905db4277ce42596d9ca5a42f8aa7f47f16335e78d91a1b30419fd1b7b6967b37e248363397ec527b38d2f500b3546edda5d2bce1944379
@@ -1352,10 +1509,12 @@ DIST rsc.io%2Fbinaryregexp%2F@v%2Fv0.2.0.mod 36 BLAKE2B 61110bed2b9e99e0250cf6e8
 DIST rsc.io%2Fquote%2Fv3%2F@v%2Fv3.1.0.mod 55 BLAKE2B f1f0ba35f0ffd200ed37c06b2025c1fd436e3fd857bd525b9295c0cbcade7e1f037e3f566124a7ef428384d50525426f0d40468c967e39bac6057174710e2566 SHA512 e6357ddd7d09692c60e59e6cb80469ade8284052cdd3ea520ec4dbcb42c1cabe045c599e43cce94bec022bd82e87a554ecac42f8c917cf2ff44daff9c1a147d5
 DIST rsc.io%2Fsampler%2F@v%2Fv1.3.0.mod 88 BLAKE2B c2ac3c9619e396db470c9951dfc11cdacccd56ae09b3b353015ee7e5fbb023df288dbf48d81b44c309241d1ea89a2e0ee42ee1d17e536fcfa531aaee0e651ab7 SHA512 2137507eb25fbae419605e0cd6bca4cfa584110eebc276cd759a4dcb6f97e52928e5b2d9b276e76bcabcec3bbfc2c42f97fa29f54695d27fb00f9423e1638863
 DIST sigs.k8s.io%2Fyaml%2F@v%2Fv1.1.0.mod 24 BLAKE2B d33080dbc62b185d029eb43f75d66328dbfa7c463a3117b3efd5419ab8e1e52cc6f5d5a288d553421025c785ec6948b3aa68588cae19bd325f6acc0d043bb5fb SHA512 78f6402daccb04510f4ef35ee457ee13e4f447fba8e6aa33b4d32aa666e925861bf3b3f22c5ba9573871ec7e830f99e4caae0969724a54eadf40e6a7ed7931a0
+DIST sourcegraph.com%2Fsourcegraph%2Fappdash%2F@v%2Fv0.0.0-20190731080439-ebfcffb1b5c0.mod 43 BLAKE2B 44d562f1cdabdb24ca05eb508183dc158939129a4cf6ec0c58815076367b2902b660ee0ef526aa01e920846fb633d001c499bf63a3cea16494213eec41587408 SHA512 7d863e4af4e480a247bc767d1de96ff8050b12a13a182a9a8fa68c983c2f0b1a16b509d40de3cca552082535f876458034e1510f0f0feef383f16e1f84f81282
 DIST sourcegraph.com%2Fsourcegraph%2Fgo-diff%2F@v%2Fv0.5.0.mod 288 BLAKE2B e8f361d08bba5f5689a0e8b51dc17f11fe893c1fb3c0b671d323c6f66448d0c73d26b64586ce2236cc91f44839eba5ebf2a858b04aa85b5bde847c5956b0a519 SHA512 ef74bbbbb50cb01b861dc25c1a1ee276cebb64a383a31f4acf3f78db0e1b5fa907c6ecb9a88e4819d4aa7d5fccced97b574c12e147c36677a8d4e5f73b55d04c
 DIST sourcegraph.com%2Fsqs%2Fpbtypes%2F@v%2Fv0.0.0-20180604144634-d3ebe8f20ae4.mod 35 BLAKE2B ff9ae0413ef6833c8d2f6ea3938e675256d2c44e38b31cee5223b7a1bcd3ef38515337ef388a155b171bc18d2f5153bef2ad0b0cf06b7c3d01145e5a13338aa7 SHA512 4316ef9aa90178d1f45938d1c81e6e0ab0618eeae3337bdf1bb2509d05c7b0e22e42fc2f86cc5d2a6fb1fdefc50ac68acc030e1d2cce8277314bbc2cc101c262
 DIST 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
 EBUILD caddy-2.2.3.ebuild 53306 BLAKE2B 09cc70698cc65d7276455d4dbddc5449f7a6bcd89da53f4a44546729793e196013b1ae24834d73c560a4b6b9cbc2353bc3d326e790c87c282412f17335d6fac5 SHA512 da8ed55b6465577f44812d340fb26360df69b14c18ce6650d8b1269187e00743b5c8e6e3c57d3d5555331c8bf20f8d4c90c65cc9d21fbecec796ef37172de85b
-MISC metadata.xml 243 BLAKE2B f07cc4f89b36187dd934e1ea6064700c6f915093360a104caa0a9083fe74342f6e926d89744f9e5d974e0d081084eeb59ee8efc9806b72b06fdacf28ab5a6b4a SHA512 7421b060f5581bd9efebb923fdfb339d3ebd0d155fa51055ecdfc7a11ea4fc1d68f875c13d1590fbff0be5183098535ddc373b7601af9c7a4961cfaa1c6ad4f4
+EBUILD caddy-2.3.0-r1.ebuild 61305 BLAKE2B ca4a6f6845dc39729bf47b70aeb49339d60f2dcd0a0f15a65a94d360d52cee60f0feb5737357a8c15bfe297a378d5dbfe385a72a0b01d881649b0a1e18b06ff0 SHA512 cff75cb1d695022fa2f1c5447edf018c5a6d7a250e57f74dd0684f9cacd6b46564de6127f980fab85afde07b5caaaaefd52f2a5f9bb98443a29f29e448dc0c27
+EBUILD caddy-2.3.0.ebuild 60807 BLAKE2B 4322e3bee8702ae9ee020ba9c138205514956f79367747d8d2409f907b3b8d7999d64866300f5ca2e3d279415d267e9804ec9773983eb578e99563dd11eeeb20 SHA512 368667360d943187413a9378cb2ce55575437fa29e6a54eb02aa47c27dbb5ed0e7480a9eb8f068886bed1ef02f94e89e21c0b6ba887a70fa1579416083c6a391
+MISC metadata.xml 326 BLAKE2B bd7fb185b75c385483b02f2f6be1d9014ee2915472a5535058f82b3b63e8c850bc91b09c7b2b9686282c0afcb3d26ff542144f619c681cfa005de6ac43ee6245 SHA512 d0861f85217eea9b0b86b7a844a0821e41abedf1dee86f755133a4a9c255d6abf37fbd0e965e0411e3ab1a9e9f30ade033691be5427b8a85e8cac6b2c3fdaa67
diff --git a/www-servers/caddy/caddy-2.2.1.ebuild b/www-servers/caddy/caddy-2.2.1.ebuild
deleted file mode 100644
index c9836590b062..000000000000
--- a/www-servers/caddy/caddy-2.2.1.ebuild
+++ /dev/null
@@ -1,991 +0,0 @@
-# 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/caddy/caddy-2.3.0-r1.ebuild b/www-servers/caddy/caddy-2.3.0-r1.ebuild
new file mode 100644
index 000000000000..32da8be5fb0e
--- /dev/null
+++ b/www-servers/caddy/caddy-2.3.0-r1.ebuild
@@ -0,0 +1,1164 @@
+# Copyright 2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit fcaps go-module systemd
+
+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/Knetic/govaluate v3.0.1-0.20171022003610-9aa49832a739+incompatible/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/Shopify/sarama v1.19.0/go.mod"
+"github.com/Shopify/toxiproxy v2.1.4+incompatible/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/VividCortex/gohistogram v1.0.0/go.mod"
+"github.com/afex/hystrix-go v0.0.0-20180502004556-fa1af6a1f4f5/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.2"
+"github.com/alecthomas/chroma v0.8.2/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/alecthomas/units v0.0.0-20190924025748-f65c72e2690d/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/apache/thrift v0.12.0/go.mod"
+"github.com/apache/thrift v0.13.0/go.mod"
+"github.com/armon/circbuf v0.0.0-20150827004946-bbbad097214e/go.mod"
+"github.com/armon/consul-api v0.0.0-20180202201655-eb2c6b5be1b6/go.mod"
+"github.com/armon/go-metrics v0.0.0-20180917152333-f0300d1749da/go.mod"
+"github.com/armon/go-radix v0.0.0-20180808171621-7fddfc383310/go.mod"
+"github.com/aryann/difflib v0.0.0-20170710044230-e206f873d14a"
+"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-lambda-go v1.13.3/go.mod"
+"github.com/aws/aws-sdk-go v1.19.18/go.mod"
+"github.com/aws/aws-sdk-go v1.27.0/go.mod"
+"github.com/aws/aws-sdk-go v1.30.29"
+"github.com/aws/aws-sdk-go v1.30.29/go.mod"
+"github.com/aws/aws-sdk-go-v2 v0.18.0/go.mod"
+"github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod"
+"github.com/beorn7/perks v1.0.0/go.mod"
+"github.com/beorn7/perks v1.0.1"
+"github.com/beorn7/perks v1.0.1/go.mod"
+"github.com/bgentry/speakeasy v0.1.0/go.mod"
+"github.com/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.1-0.20201215190346-201f83a06067"
+"github.com/caddyserver/certmagic v0.12.1-0.20201215190346-201f83a06067/go.mod"
+"github.com/casbin/casbin/v2 v2.1.2/go.mod"
+"github.com/cenkalti/backoff v2.2.1+incompatible/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/clbanning/x2j v0.0.0-20191024224557-825249438eec/go.mod"
+"github.com/client9/misspell v0.3.4/go.mod"
+"github.com/cockroachdb/datadriven v0.0.0-20190809214429-80d97fb3cbaa/go.mod"
+"github.com/codahale/hdrhistogram v0.0.0-20161010025455-3a0bb77429bd/go.mod"
+"github.com/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-20180511133405-39ca1b05acc7/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-20160727233714-3ac0863d7acf/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 v0.0.0-20171111073723-bb3d318650d4/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/eapache/go-resiliency v1.1.0/go.mod"
+"github.com/eapache/go-xerial-snappy v0.0.0-20180814174437-776d5712da21/go.mod"
+"github.com/eapache/queue v1.1.0/go.mod"
+"github.com/edsrzf/mmap-go v1.0.0/go.mod"
+"github.com/envoyproxy/go-control-plane v0.6.9/go.mod"
+"github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.mod"
+"github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod"
+"github.com/fatih/color v1.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/franela/goblin v0.0.0-20200105215937-c9ffbefa60db/go.mod"
+"github.com/franela/goreq v0.0.0-20171204163338-bcd34c9993f8/go.mod"
+"github.com/fsnotify/fsnotify v1.4.7/go.mod"
+"github.com/fsnotify/fsnotify v1.4.9"
+"github.com/fsnotify/fsnotify v1.4.9/go.mod"
+"github.com/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-kit/kit v0.10.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-logfmt/logfmt v0.5.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.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/googleapis v1.1.0/go.mod"
+"github.com/gogo/protobuf v1.1.1/go.mod"
+"github.com/gogo/protobuf v1.2.0/go.mod"
+"github.com/gogo/protobuf v1.2.1/go.mod"
+"github.com/gogo/protobuf v1.3.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-20160516000752-02826c3e7903/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/go.mod"
+"github.com/golang/protobuf v1.4.3"
+"github.com/golang/protobuf v1.4.3/go.mod"
+"github.com/golang/snappy v0.0.0-20180518054509-2e65f85255db/go.mod"
+"github.com/golang/snappy v0.0.1"
+"github.com/golang/snappy v0.0.1/go.mod"
+"github.com/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.6.0"
+"github.com/google/cel-go v0.6.0/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/context v1.1.1/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.6.2/go.mod"
+"github.com/gorilla/mux v1.7.3/go.mod"
+"github.com/gorilla/securecookie v1.1.1/go.mod"
+"github.com/gorilla/websocket v0.0.0-20170926233335-4201258b820c/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.0.1-0.20190118093823-f849b5445de4/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.9.5/go.mod"
+"github.com/grpc-ecosystem/grpc-gateway v1.12.1/go.mod"
+"github.com/hashicorp/consul/api v1.3.0/go.mod"
+"github.com/hashicorp/consul/sdk v0.3.0/go.mod"
+"github.com/hashicorp/errwrap v1.0.0/go.mod"
+"github.com/hashicorp/go-cleanhttp v0.5.1/go.mod"
+"github.com/hashicorp/go-immutable-radix v1.0.0/go.mod"
+"github.com/hashicorp/go-msgpack v0.5.3/go.mod"
+"github.com/hashicorp/go-multierror v1.0.0/go.mod"
+"github.com/hashicorp/go-rootcerts v1.0.0/go.mod"
+"github.com/hashicorp/go-sockaddr v1.0.0/go.mod"
+"github.com/hashicorp/go-syslog v1.0.0/go.mod"
+"github.com/hashicorp/go-uuid v1.0.0/go.mod"
+"github.com/hashicorp/go-uuid v1.0.1/go.mod"
+"github.com/hashicorp/go-version v1.2.0/go.mod"
+"github.com/hashicorp/go.net v0.0.1/go.mod"
+"github.com/hashicorp/golang-lru v0.5.0/go.mod"
+"github.com/hashicorp/golang-lru v0.5.1/go.mod"
+"github.com/hashicorp/hcl v0.0.0-20180404174102-ef8a98b0bbce/go.mod"
+"github.com/hashicorp/hcl v1.0.0/go.mod"
+"github.com/hashicorp/logutils v1.0.0/go.mod"
+"github.com/hashicorp/mdns v1.0.0/go.mod"
+"github.com/hashicorp/memberlist v0.1.3/go.mod"
+"github.com/hashicorp/serf v0.8.2/go.mod"
+"github.com/hpcloud/tail v1.0.0/go.mod"
+"github.com/huandu/xstrings v1.3.1"
+"github.com/huandu/xstrings v1.3.1/go.mod"
+"github.com/hudl/fargo v1.3.0/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/influxdata/influxdb1-client v0.0.0-20191209144304-8bf82d3c094d/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/jpillora/backoff v1.0.0/go.mod"
+"github.com/json-iterator/go v1.1.6/go.mod"
+"github.com/json-iterator/go v1.1.7/go.mod"
+"github.com/json-iterator/go v1.1.8/go.mod"
+"github.com/json-iterator/go v1.1.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/julienschmidt/httprouter v1.3.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.3"
+"github.com/klauspost/compress v1.11.3/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/klauspost/cpuid/v2 v2.0.1"
+"github.com/klauspost/cpuid/v2 v2.0.1/go.mod"
+"github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod"
+"github.com/konsorten/go-windows-terminal-sequences v1.0.2/go.mod"
+"github.com/konsorten/go-windows-terminal-sequences v1.0.3"
+"github.com/konsorten/go-windows-terminal-sequences v1.0.3/go.mod"
+"github.com/kr/logfmt v0.0.0-20140226030751-b84e30acd515/go.mod"
+"github.com/kr/pretty v0.1.0"
+"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/lightstep/lightstep-tracer-common/golang/gogo v0.0.0-20190605223551-bc2310a04743/go.mod"
+"github.com/lightstep/lightstep-tracer-go v0.18.1/go.mod"
+"github.com/logrusorgru/aurora v0.0.0-20181002194514-a7b3b318ed4e/go.mod"
+"github.com/lucas-clemente/quic-go v0.19.3"
+"github.com/lucas-clemente/quic-go v0.19.3/go.mod"
+"github.com/lunixbochs/vtclean v1.0.0"
+"github.com/lunixbochs/vtclean v1.0.0/go.mod"
+"github.com/lyft/protoc-gen-validate v0.0.13/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.1"
+"github.com/marten-seemann/qpack v0.2.1/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.1"
+"github.com/marten-seemann/qtls-go1-15 v0.1.1/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.2/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.0.14/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/cli v1.0.0/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/go-testing-interface v1.0.0/go.mod"
+"github.com/mitchellh/gox v0.4.0/go.mod"
+"github.com/mitchellh/iochan v1.0.0/go.mod"
+"github.com/mitchellh/mapstructure v0.0.0-20160808181253-ca63d7c062ee/go.mod"
+"github.com/mitchellh/mapstructure 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/mwitkow/go-conntrack v0.0.0-20190716064945-2f068394615f/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/nats-io/jwt v0.3.0/go.mod"
+"github.com/nats-io/jwt v0.3.2/go.mod"
+"github.com/nats-io/nats-server/v2 v2.1.2/go.mod"
+"github.com/nats-io/nats.go v1.9.1/go.mod"
+"github.com/nats-io/nkeys v0.1.0/go.mod"
+"github.com/nats-io/nkeys v0.1.3/go.mod"
+"github.com/nats-io/nuid v1.0.1/go.mod"
+"github.com/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/oklog v0.3.2/go.mod"
+"github.com/oklog/run v1.0.0/go.mod"
+"github.com/oklog/ulid v1.3.1/go.mod"
+"github.com/olekukonko/tablewriter v0.0.0-20170122224234-a0225b3f23b5/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.7.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.4.3/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-contrib/go-observer v0.0.0-20170622124052-a52f23424492/go.mod"
+"github.com/opentracing/basictracer-go v1.0.0/go.mod"
+"github.com/opentracing/opentracing-go v1.0.2/go.mod"
+"github.com/opentracing/opentracing-go v1.1.0/go.mod"
+"github.com/openzipkin-contrib/zipkin-go-opentracing v0.4.5/go.mod"
+"github.com/openzipkin/zipkin-go v0.1.1/go.mod"
+"github.com/openzipkin/zipkin-go v0.1.6/go.mod"
+"github.com/openzipkin/zipkin-go v0.2.1/go.mod"
+"github.com/openzipkin/zipkin-go v0.2.2/go.mod"
+"github.com/pact-foundation/pact-go v1.0.4/go.mod"
+"github.com/pascaldekloe/goe v0.0.0-20180627143212-57f6aae5913c/go.mod"
+"github.com/pborman/uuid v1.2.0/go.mod"
+"github.com/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/performancecopilot/speed v3.0.0+incompatible/go.mod"
+"github.com/pierrec/lz4 v1.0.2-0.20190131084431-473cd7ce01a1/go.mod"
+"github.com/pierrec/lz4 v2.0.5+incompatible/go.mod"
+"github.com/pkg/errors v0.8.0/go.mod"
+"github.com/pkg/errors v0.8.1/go.mod"
+"github.com/pkg/errors v0.9.1"
+"github.com/pkg/errors v0.9.1/go.mod"
+"github.com/pkg/profile v1.2.1/go.mod"
+"github.com/pmezard/go-difflib v1.0.0"
+"github.com/pmezard/go-difflib v1.0.0/go.mod"
+"github.com/posener/complete v1.1.1/go.mod"
+"github.com/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-0.20190127221311-3c4408c8b829/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/go.mod"
+"github.com/prometheus/client_golang v1.9.0"
+"github.com/prometheus/client_golang v1.9.0/go.mod"
+"github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910/go.mod"
+"github.com/prometheus/client_model v0.0.0-20190115171406-56726106282f/go.mod"
+"github.com/prometheus/client_model v0.0.0-20190129233127-fd36f4220a90/go.mod"
+"github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod"
+"github.com/prometheus/client_model v0.1.0/go.mod"
+"github.com/prometheus/client_model v0.2.0"
+"github.com/prometheus/client_model v0.2.0/go.mod"
+"github.com/prometheus/common v0.0.0-20180801064454-c7de2306084e/go.mod"
+"github.com/prometheus/common v0.0.0-20181113130724-41aa239b4cce/go.mod"
+"github.com/prometheus/common v0.2.0/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/go.mod"
+"github.com/prometheus/common v0.15.0"
+"github.com/prometheus/common v0.15.0/go.mod"
+"github.com/prometheus/procfs v0.0.0-20180725123919-05ee40e3a273/go.mod"
+"github.com/prometheus/procfs v0.0.0-20181005140218-185b4288413d/go.mod"
+"github.com/prometheus/procfs v0.0.0-20190117184657-bf6a532e95b1/go.mod"
+"github.com/prometheus/procfs v0.0.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/go.mod"
+"github.com/prometheus/procfs v0.2.0"
+"github.com/prometheus/procfs v0.2.0/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/rcrowley/go-metrics v0.0.0-20181016184325-3113b8401b8a/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/columnize v0.0.0-20160712163229-9b3edd62028f/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/samuel/go-zookeeper v0.0.0-20190923202752-2cc03de413da/go.mod"
+"github.com/sean-/seed v0.0.0-20170313163322-e2103e2c3529/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/go.mod"
+"github.com/sirupsen/logrus v1.6.0"
+"github.com/sirupsen/logrus v1.6.0/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/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/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/sony/gobreaker v0.4.1/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.3/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/streadway/amqp v0.0.0-20190404075320-75d898a42a94/go.mod"
+"github.com/streadway/amqp v0.0.0-20190827072141-edfb9018d271/go.mod"
+"github.com/streadway/handy v0.0.0-20190108123426-d5acb3125c2a/go.mod"
+"github.com/stretchr/objx v0.1.0/go.mod"
+"github.com/stretchr/objx v0.1.1/go.mod"
+"github.com/stretchr/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-20170815181823-89b8d40f7ca8/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.1/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.mod"
+"go.etcd.io/bbolt v1.3.3"
+"go.etcd.io/bbolt v1.3.3/go.mod"
+"go.etcd.io/etcd v0.0.0-20191023171146-3cf2f69b5738/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.20.1/go.mod"
+"go.opencensus.io v0.20.2/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.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.mod"
+"go.uber.org/zap v1.16.0"
+"go.uber.org/zap v1.16.0/go.mod"
+"go4.org v0.0.0-20180809161055-417644f6feb5/go.mod"
+"golang.org/x/build v0.0.0-20190111050920-041ab4dc3f9d/go.mod"
+"golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod"
+"golang.org/x/crypto v0.0.0-20181029021203-45a5f77698d3/go.mod"
+"golang.org/x/crypto v0.0.0-20181030102418-4d3f4d9ffa16/go.mod"
+"golang.org/x/crypto v0.0.0-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-20190701094942-4def268fd1a4/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-20181023162649-9b4f9f5ad519/go.mod"
+"golang.org/x/net v0.0.0-20181029044818-c44066c5c816/go.mod"
+"golang.org/x/net v0.0.0-20181106065722-10aee1819953/go.mod"
+"golang.org/x/net v0.0.0-20181114220301-adae6a3d119a/go.mod"
+"golang.org/x/net v0.0.0-20181201002055-351d144fa1fc/go.mod"
+"golang.org/x/net v0.0.0-20181220203305-927f97764cc3/go.mod"
+"golang.org/x/net v0.0.0-20190108225652-1e06a53dbb7e/go.mod"
+"golang.org/x/net v0.0.0-20190125091013-d26f9f9a57f3/go.mod"
+"golang.org/x/net v0.0.0-20190213061140-3a22650c66bd/go.mod"
+"golang.org/x/net v0.0.0-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-20190813141303-74dc4d7220e7/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-20200625001655-4c5254603344/go.mod"
+"golang.org/x/net v0.0.0-20200707034311-ab3426394381/go.mod"
+"golang.org/x/net v0.0.0-20201110031124-69a78807bb2b"
+"golang.org/x/net v0.0.0-20201110031124-69a78807bb2b/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-20180823144017-11551d06cbcc/go.mod"
+"golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod"
+"golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod"
+"golang.org/x/sys v0.0.0-20180909124046-d0be0721c37e/go.mod"
+"golang.org/x/sys v0.0.0-20181026203630-95b1ffbd15a5/go.mod"
+"golang.org/x/sys v0.0.0-20181029174526-d69651ed3497/go.mod"
+"golang.org/x/sys v0.0.0-20181107165924-66b7b1311ac8/go.mod"
+"golang.org/x/sys v0.0.0-20181116152217-5ac8a444bdc5/go.mod"
+"golang.org/x/sys v0.0.0-20181122145206-62eef0e2fa9b/go.mod"
+"golang.org/x/sys v0.0.0-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-20190726091711-fc99dfbffb4e/go.mod"
+"golang.org/x/sys v0.0.0-20190826190057-c7b8b68b1456/go.mod"
+"golang.org/x/sys v0.0.0-20190904154756-749cb33beabd/go.mod"
+"golang.org/x/sys v0.0.0-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/go.mod"
+"golang.org/x/sys v0.0.0-20200625212154-ddb9806d33ae/go.mod"
+"golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod"
+"golang.org/x/sys v0.0.0-20201214210602-f9fddec55a1e"
+"golang.org/x/sys v0.0.0-20201214210602-f9fddec55a1e/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/go.mod"
+"golang.org/x/text v0.3.3"
+"golang.org/x/text v0.3.3/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.3.1/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-20190530194941-fb225487d101/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-20200416231807-8751e049a2a0/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.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.22.1/go.mod"
+"google.golang.org/grpc v1.23.0/go.mod"
+"google.golang.org/grpc v1.23.1/go.mod"
+"google.golang.org/grpc v1.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.25/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/gcfg.v1 v1.2.3/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/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/warnings.v0 v0.1.2/go.mod"
+"gopkg.in/yaml.v2 v2.0.0-20170812160011-eb3733d160e7/go.mod"
+"gopkg.in/yaml.v2 v2.2.1/go.mod"
+"gopkg.in/yaml.v2 v2.2.2/go.mod"
+"gopkg.in/yaml.v2 v2.2.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/appdash v0.0.0-20190731080439-ebfcffb1b5c0/go.mod"
+"sourcegraph.com/sourcegraph/go-diff v0.5.0/go.mod"
+"sourcegraph.com/sqs/pbtypes v0.0.0-20180604144634-d3ebe8f20ae4/go.mod"
+"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"
+RDEPEND="
+	acct-user/http
+	acct-group/http"
+DEPEND="${RDEPEND}"
+
+RESTRICT+=" test"
+
+FILECAPS=(
+	-m 755 'cap_net_bind_service=+ep' usr/bin/${PN}
+)
+
+src_compile() {
+	go build ./cmd/caddy || die
+}
+
+src_install() {
+	dobin caddy
+	dodoc README.md
+	keepdir /etc/caddy
+	insinto /etc/caddy
+	newins "${FILESDIR}"/caddy_config.json caddy_config.json.example
+	systemd_dounit "${FILESDIR}/${PN}.service"
+	newinitd "${FILESDIR}/initd" "${PN}"
+	newconfd "${FILESDIR}/confd" "${PN}"
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}/logrotated" "${PN}"
+}
+
+pkg_postinst() {
+	fcaps_pkg_postinst
+	go-module_pkg_postinst
+}
diff --git a/www-servers/caddy/caddy-2.3.0.ebuild b/www-servers/caddy/caddy-2.3.0.ebuild
new file mode 100644
index 000000000000..3c4f8cb30132
--- /dev/null
+++ b/www-servers/caddy/caddy-2.3.0.ebuild
@@ -0,0 +1,1143 @@
+# Copyright 2021 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/Knetic/govaluate v3.0.1-0.20171022003610-9aa49832a739+incompatible/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/Shopify/sarama v1.19.0/go.mod"
+"github.com/Shopify/toxiproxy v2.1.4+incompatible/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/VividCortex/gohistogram v1.0.0/go.mod"
+"github.com/afex/hystrix-go v0.0.0-20180502004556-fa1af6a1f4f5/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.2"
+"github.com/alecthomas/chroma v0.8.2/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/alecthomas/units v0.0.0-20190924025748-f65c72e2690d/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/apache/thrift v0.12.0/go.mod"
+"github.com/apache/thrift v0.13.0/go.mod"
+"github.com/armon/circbuf v0.0.0-20150827004946-bbbad097214e/go.mod"
+"github.com/armon/consul-api v0.0.0-20180202201655-eb2c6b5be1b6/go.mod"
+"github.com/armon/go-metrics v0.0.0-20180917152333-f0300d1749da/go.mod"
+"github.com/armon/go-radix v0.0.0-20180808171621-7fddfc383310/go.mod"
+"github.com/aryann/difflib v0.0.0-20170710044230-e206f873d14a"
+"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-lambda-go v1.13.3/go.mod"
+"github.com/aws/aws-sdk-go v1.19.18/go.mod"
+"github.com/aws/aws-sdk-go v1.27.0/go.mod"
+"github.com/aws/aws-sdk-go v1.30.29"
+"github.com/aws/aws-sdk-go v1.30.29/go.mod"
+"github.com/aws/aws-sdk-go-v2 v0.18.0/go.mod"
+"github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod"
+"github.com/beorn7/perks v1.0.0/go.mod"
+"github.com/beorn7/perks v1.0.1"
+"github.com/beorn7/perks v1.0.1/go.mod"
+"github.com/bgentry/speakeasy v0.1.0/go.mod"
+"github.com/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.1-0.20201215190346-201f83a06067"
+"github.com/caddyserver/certmagic v0.12.1-0.20201215190346-201f83a06067/go.mod"
+"github.com/casbin/casbin/v2 v2.1.2/go.mod"
+"github.com/cenkalti/backoff v2.2.1+incompatible/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/clbanning/x2j v0.0.0-20191024224557-825249438eec/go.mod"
+"github.com/client9/misspell v0.3.4/go.mod"
+"github.com/cockroachdb/datadriven v0.0.0-20190809214429-80d97fb3cbaa/go.mod"
+"github.com/codahale/hdrhistogram v0.0.0-20161010025455-3a0bb77429bd/go.mod"
+"github.com/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-20180511133405-39ca1b05acc7/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-20160727233714-3ac0863d7acf/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 v0.0.0-20171111073723-bb3d318650d4/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/eapache/go-resiliency v1.1.0/go.mod"
+"github.com/eapache/go-xerial-snappy v0.0.0-20180814174437-776d5712da21/go.mod"
+"github.com/eapache/queue v1.1.0/go.mod"
+"github.com/edsrzf/mmap-go v1.0.0/go.mod"
+"github.com/envoyproxy/go-control-plane v0.6.9/go.mod"
+"github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.mod"
+"github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod"
+"github.com/fatih/color v1.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/franela/goblin v0.0.0-20200105215937-c9ffbefa60db/go.mod"
+"github.com/franela/goreq v0.0.0-20171204163338-bcd34c9993f8/go.mod"
+"github.com/fsnotify/fsnotify v1.4.7/go.mod"
+"github.com/fsnotify/fsnotify v1.4.9"
+"github.com/fsnotify/fsnotify v1.4.9/go.mod"
+"github.com/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-kit/kit v0.10.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-logfmt/logfmt v0.5.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.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/googleapis v1.1.0/go.mod"
+"github.com/gogo/protobuf v1.1.1/go.mod"
+"github.com/gogo/protobuf v1.2.0/go.mod"
+"github.com/gogo/protobuf v1.2.1/go.mod"
+"github.com/gogo/protobuf v1.3.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-20160516000752-02826c3e7903/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/go.mod"
+"github.com/golang/protobuf v1.4.3"
+"github.com/golang/protobuf v1.4.3/go.mod"
+"github.com/golang/snappy v0.0.0-20180518054509-2e65f85255db/go.mod"
+"github.com/golang/snappy v0.0.1"
+"github.com/golang/snappy v0.0.1/go.mod"
+"github.com/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.6.0"
+"github.com/google/cel-go v0.6.0/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/context v1.1.1/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.6.2/go.mod"
+"github.com/gorilla/mux v1.7.3/go.mod"
+"github.com/gorilla/securecookie v1.1.1/go.mod"
+"github.com/gorilla/websocket v0.0.0-20170926233335-4201258b820c/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.0.1-0.20190118093823-f849b5445de4/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.9.5/go.mod"
+"github.com/grpc-ecosystem/grpc-gateway v1.12.1/go.mod"
+"github.com/hashicorp/consul/api v1.3.0/go.mod"
+"github.com/hashicorp/consul/sdk v0.3.0/go.mod"
+"github.com/hashicorp/errwrap v1.0.0/go.mod"
+"github.com/hashicorp/go-cleanhttp v0.5.1/go.mod"
+"github.com/hashicorp/go-immutable-radix v1.0.0/go.mod"
+"github.com/hashicorp/go-msgpack v0.5.3/go.mod"
+"github.com/hashicorp/go-multierror v1.0.0/go.mod"
+"github.com/hashicorp/go-rootcerts v1.0.0/go.mod"
+"github.com/hashicorp/go-sockaddr v1.0.0/go.mod"
+"github.com/hashicorp/go-syslog v1.0.0/go.mod"
+"github.com/hashicorp/go-uuid v1.0.0/go.mod"
+"github.com/hashicorp/go-uuid v1.0.1/go.mod"
+"github.com/hashicorp/go-version v1.2.0/go.mod"
+"github.com/hashicorp/go.net v0.0.1/go.mod"
+"github.com/hashicorp/golang-lru v0.5.0/go.mod"
+"github.com/hashicorp/golang-lru v0.5.1/go.mod"
+"github.com/hashicorp/hcl v0.0.0-20180404174102-ef8a98b0bbce/go.mod"
+"github.com/hashicorp/hcl v1.0.0/go.mod"
+"github.com/hashicorp/logutils v1.0.0/go.mod"
+"github.com/hashicorp/mdns v1.0.0/go.mod"
+"github.com/hashicorp/memberlist v0.1.3/go.mod"
+"github.com/hashicorp/serf v0.8.2/go.mod"
+"github.com/hpcloud/tail v1.0.0/go.mod"
+"github.com/huandu/xstrings v1.3.1"
+"github.com/huandu/xstrings v1.3.1/go.mod"
+"github.com/hudl/fargo v1.3.0/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/influxdata/influxdb1-client v0.0.0-20191209144304-8bf82d3c094d/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/jpillora/backoff v1.0.0/go.mod"
+"github.com/json-iterator/go v1.1.6/go.mod"
+"github.com/json-iterator/go v1.1.7/go.mod"
+"github.com/json-iterator/go v1.1.8/go.mod"
+"github.com/json-iterator/go v1.1.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/julienschmidt/httprouter v1.3.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.3"
+"github.com/klauspost/compress v1.11.3/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/klauspost/cpuid/v2 v2.0.1"
+"github.com/klauspost/cpuid/v2 v2.0.1/go.mod"
+"github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod"
+"github.com/konsorten/go-windows-terminal-sequences v1.0.2/go.mod"
+"github.com/konsorten/go-windows-terminal-sequences v1.0.3"
+"github.com/konsorten/go-windows-terminal-sequences v1.0.3/go.mod"
+"github.com/kr/logfmt v0.0.0-20140226030751-b84e30acd515/go.mod"
+"github.com/kr/pretty v0.1.0"
+"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/lightstep/lightstep-tracer-common/golang/gogo v0.0.0-20190605223551-bc2310a04743/go.mod"
+"github.com/lightstep/lightstep-tracer-go v0.18.1/go.mod"
+"github.com/logrusorgru/aurora v0.0.0-20181002194514-a7b3b318ed4e/go.mod"
+"github.com/lucas-clemente/quic-go v0.19.3"
+"github.com/lucas-clemente/quic-go v0.19.3/go.mod"
+"github.com/lunixbochs/vtclean v1.0.0"
+"github.com/lunixbochs/vtclean v1.0.0/go.mod"
+"github.com/lyft/protoc-gen-validate v0.0.13/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.1"
+"github.com/marten-seemann/qpack v0.2.1/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.1"
+"github.com/marten-seemann/qtls-go1-15 v0.1.1/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.2/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.0.14/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/cli v1.0.0/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/go-testing-interface v1.0.0/go.mod"
+"github.com/mitchellh/gox v0.4.0/go.mod"
+"github.com/mitchellh/iochan v1.0.0/go.mod"
+"github.com/mitchellh/mapstructure v0.0.0-20160808181253-ca63d7c062ee/go.mod"
+"github.com/mitchellh/mapstructure 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/mwitkow/go-conntrack v0.0.0-20190716064945-2f068394615f/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/nats-io/jwt v0.3.0/go.mod"
+"github.com/nats-io/jwt v0.3.2/go.mod"
+"github.com/nats-io/nats-server/v2 v2.1.2/go.mod"
+"github.com/nats-io/nats.go v1.9.1/go.mod"
+"github.com/nats-io/nkeys v0.1.0/go.mod"
+"github.com/nats-io/nkeys v0.1.3/go.mod"
+"github.com/nats-io/nuid v1.0.1/go.mod"
+"github.com/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/oklog v0.3.2/go.mod"
+"github.com/oklog/run v1.0.0/go.mod"
+"github.com/oklog/ulid v1.3.1/go.mod"
+"github.com/olekukonko/tablewriter v0.0.0-20170122224234-a0225b3f23b5/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.7.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.4.3/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-contrib/go-observer v0.0.0-20170622124052-a52f23424492/go.mod"
+"github.com/opentracing/basictracer-go v1.0.0/go.mod"
+"github.com/opentracing/opentracing-go v1.0.2/go.mod"
+"github.com/opentracing/opentracing-go v1.1.0/go.mod"
+"github.com/openzipkin-contrib/zipkin-go-opentracing v0.4.5/go.mod"
+"github.com/openzipkin/zipkin-go v0.1.1/go.mod"
+"github.com/openzipkin/zipkin-go v0.1.6/go.mod"
+"github.com/openzipkin/zipkin-go v0.2.1/go.mod"
+"github.com/openzipkin/zipkin-go v0.2.2/go.mod"
+"github.com/pact-foundation/pact-go v1.0.4/go.mod"
+"github.com/pascaldekloe/goe v0.0.0-20180627143212-57f6aae5913c/go.mod"
+"github.com/pborman/uuid v1.2.0/go.mod"
+"github.com/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/performancecopilot/speed v3.0.0+incompatible/go.mod"
+"github.com/pierrec/lz4 v1.0.2-0.20190131084431-473cd7ce01a1/go.mod"
+"github.com/pierrec/lz4 v2.0.5+incompatible/go.mod"
+"github.com/pkg/errors v0.8.0/go.mod"
+"github.com/pkg/errors v0.8.1/go.mod"
+"github.com/pkg/errors v0.9.1"
+"github.com/pkg/errors v0.9.1/go.mod"
+"github.com/pkg/profile v1.2.1/go.mod"
+"github.com/pmezard/go-difflib v1.0.0"
+"github.com/pmezard/go-difflib v1.0.0/go.mod"
+"github.com/posener/complete v1.1.1/go.mod"
+"github.com/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-0.20190127221311-3c4408c8b829/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/go.mod"
+"github.com/prometheus/client_golang v1.9.0"
+"github.com/prometheus/client_golang v1.9.0/go.mod"
+"github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910/go.mod"
+"github.com/prometheus/client_model v0.0.0-20190115171406-56726106282f/go.mod"
+"github.com/prometheus/client_model v0.0.0-20190129233127-fd36f4220a90/go.mod"
+"github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod"
+"github.com/prometheus/client_model v0.1.0/go.mod"
+"github.com/prometheus/client_model v0.2.0"
+"github.com/prometheus/client_model v0.2.0/go.mod"
+"github.com/prometheus/common v0.0.0-20180801064454-c7de2306084e/go.mod"
+"github.com/prometheus/common v0.0.0-20181113130724-41aa239b4cce/go.mod"
+"github.com/prometheus/common v0.2.0/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/go.mod"
+"github.com/prometheus/common v0.15.0"
+"github.com/prometheus/common v0.15.0/go.mod"
+"github.com/prometheus/procfs v0.0.0-20180725123919-05ee40e3a273/go.mod"
+"github.com/prometheus/procfs v0.0.0-20181005140218-185b4288413d/go.mod"
+"github.com/prometheus/procfs v0.0.0-20190117184657-bf6a532e95b1/go.mod"
+"github.com/prometheus/procfs v0.0.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/go.mod"
+"github.com/prometheus/procfs v0.2.0"
+"github.com/prometheus/procfs v0.2.0/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/rcrowley/go-metrics v0.0.0-20181016184325-3113b8401b8a/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/columnize v0.0.0-20160712163229-9b3edd62028f/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/samuel/go-zookeeper v0.0.0-20190923202752-2cc03de413da/go.mod"
+"github.com/sean-/seed v0.0.0-20170313163322-e2103e2c3529/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/go.mod"
+"github.com/sirupsen/logrus v1.6.0"
+"github.com/sirupsen/logrus v1.6.0/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/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/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/sony/gobreaker v0.4.1/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.3/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/streadway/amqp v0.0.0-20190404075320-75d898a42a94/go.mod"
+"github.com/streadway/amqp v0.0.0-20190827072141-edfb9018d271/go.mod"
+"github.com/streadway/handy v0.0.0-20190108123426-d5acb3125c2a/go.mod"
+"github.com/stretchr/objx v0.1.0/go.mod"
+"github.com/stretchr/objx v0.1.1/go.mod"
+"github.com/stretchr/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-20170815181823-89b8d40f7ca8/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.1/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.mod"
+"go.etcd.io/bbolt v1.3.3"
+"go.etcd.io/bbolt v1.3.3/go.mod"
+"go.etcd.io/etcd v0.0.0-20191023171146-3cf2f69b5738/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.20.1/go.mod"
+"go.opencensus.io v0.20.2/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.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.mod"
+"go.uber.org/zap v1.16.0"
+"go.uber.org/zap v1.16.0/go.mod"
+"go4.org v0.0.0-20180809161055-417644f6feb5/go.mod"
+"golang.org/x/build v0.0.0-20190111050920-041ab4dc3f9d/go.mod"
+"golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod"
+"golang.org/x/crypto v0.0.0-20181029021203-45a5f77698d3/go.mod"
+"golang.org/x/crypto v0.0.0-20181030102418-4d3f4d9ffa16/go.mod"
+"golang.org/x/crypto v0.0.0-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-20190701094942-4def268fd1a4/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-20181023162649-9b4f9f5ad519/go.mod"
+"golang.org/x/net v0.0.0-20181029044818-c44066c5c816/go.mod"
+"golang.org/x/net v0.0.0-20181106065722-10aee1819953/go.mod"
+"golang.org/x/net v0.0.0-20181114220301-adae6a3d119a/go.mod"
+"golang.org/x/net v0.0.0-20181201002055-351d144fa1fc/go.mod"
+"golang.org/x/net v0.0.0-20181220203305-927f97764cc3/go.mod"
+"golang.org/x/net v0.0.0-20190108225652-1e06a53dbb7e/go.mod"
+"golang.org/x/net v0.0.0-20190125091013-d26f9f9a57f3/go.mod"
+"golang.org/x/net v0.0.0-20190213061140-3a22650c66bd/go.mod"
+"golang.org/x/net v0.0.0-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-20190813141303-74dc4d7220e7/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-20200625001655-4c5254603344/go.mod"
+"golang.org/x/net v0.0.0-20200707034311-ab3426394381/go.mod"
+"golang.org/x/net v0.0.0-20201110031124-69a78807bb2b"
+"golang.org/x/net v0.0.0-20201110031124-69a78807bb2b/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-20180823144017-11551d06cbcc/go.mod"
+"golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod"
+"golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod"
+"golang.org/x/sys v0.0.0-20180909124046-d0be0721c37e/go.mod"
+"golang.org/x/sys v0.0.0-20181026203630-95b1ffbd15a5/go.mod"
+"golang.org/x/sys v0.0.0-20181029174526-d69651ed3497/go.mod"
+"golang.org/x/sys v0.0.0-20181107165924-66b7b1311ac8/go.mod"
+"golang.org/x/sys v0.0.0-20181116152217-5ac8a444bdc5/go.mod"
+"golang.org/x/sys v0.0.0-20181122145206-62eef0e2fa9b/go.mod"
+"golang.org/x/sys v0.0.0-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-20190726091711-fc99dfbffb4e/go.mod"
+"golang.org/x/sys v0.0.0-20190826190057-c7b8b68b1456/go.mod"
+"golang.org/x/sys v0.0.0-20190904154756-749cb33beabd/go.mod"
+"golang.org/x/sys v0.0.0-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/go.mod"
+"golang.org/x/sys v0.0.0-20200625212154-ddb9806d33ae/go.mod"
+"golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod"
+"golang.org/x/sys v0.0.0-20201214210602-f9fddec55a1e"
+"golang.org/x/sys v0.0.0-20201214210602-f9fddec55a1e/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/go.mod"
+"golang.org/x/text v0.3.3"
+"golang.org/x/text v0.3.3/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.3.1/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-20190530194941-fb225487d101/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-20200416231807-8751e049a2a0/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.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.22.1/go.mod"
+"google.golang.org/grpc v1.23.0/go.mod"
+"google.golang.org/grpc v1.23.1/go.mod"
+"google.golang.org/grpc v1.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.25/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/gcfg.v1 v1.2.3/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/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/warnings.v0 v0.1.2/go.mod"
+"gopkg.in/yaml.v2 v2.0.0-20170812160011-eb3733d160e7/go.mod"
+"gopkg.in/yaml.v2 v2.2.1/go.mod"
+"gopkg.in/yaml.v2 v2.2.2/go.mod"
+"gopkg.in/yaml.v2 v2.2.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/appdash v0.0.0-20190731080439-ebfcffb1b5c0/go.mod"
+"sourcegraph.com/sourcegraph/go-diff v0.5.0/go.mod"
+"sourcegraph.com/sqs/pbtypes v0.0.0-20180604144634-d3ebe8f20ae4/go.mod"
+"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/caddy/files/caddy.service b/www-servers/caddy/files/caddy.service
new file mode 100644
index 000000000000..b11d0827ef83
--- /dev/null
+++ b/www-servers/caddy/files/caddy.service
@@ -0,0 +1,17 @@
+[Unit]
+Description=Caddy web server
+After=network.target
+
+[Service]
+Type=simple
+CapabilityBoundingSet=CAP_NET_BIND_SERVICE
+AmbientCapabilities=CAP_NET_BIND_SERVICE
+NoNewPrivileges=true
+User=http
+Environment=CADDY_OPTS="run --config /etc/caddy/caddy_config.json"
+Restart=on-failure
+RestartSec=5s
+ExecStart=/usr/bin/caddy $CADDY_OPTS
+
+[Install]
+WantedBy=multi-user.target
diff --git a/www-servers/caddy/files/caddy_config.json b/www-servers/caddy/files/caddy_config.json
new file mode 100644
index 000000000000..80918a3254fa
--- /dev/null
+++ b/www-servers/caddy/files/caddy_config.json
@@ -0,0 +1,31 @@
+{
+  "admin": {
+    "disabled": true
+  },
+  "apps": {
+    "http": {
+      "servers": {
+        "static": {
+          "idle_timeout": 30000000000,
+          "listen": [
+            ":80"
+          ],
+          "logs": {},
+          "max_header_bytes": 10240,
+          "read_header_timeout": 10000000000,
+          "routes": [
+            {
+              "handle": [
+                {
+                  "browse": {},
+                  "handler": "file_server",
+                  "root": "/var/www/localhost/htdocs"
+                }
+              ]
+            }
+          ]
+        }
+      }
+    }
+  }
+}
diff --git a/www-servers/caddy/files/confd b/www-servers/caddy/files/confd
new file mode 100644
index 000000000000..39e8468ed962
--- /dev/null
+++ b/www-servers/caddy/files/confd
@@ -0,0 +1,2 @@
+# command_user="http:http"
+# command_args="run --config /etc/caddy/caddy_config.json"
diff --git a/www-servers/caddy/files/initd b/www-servers/caddy/files/initd
new file mode 100644
index 000000000000..3f080d202e1e
--- /dev/null
+++ b/www-servers/caddy/files/initd
@@ -0,0 +1,26 @@
+#!/sbin/openrc-run
+
+description="Caddy web server"
+pidfile=${pidfile:-"/run/${RC_SVCNAME}.pid"}
+command="/usr/bin/caddy"
+command_user="${command_user:-"http:http"}"
+command_args="${command_args:-"run --config /etc/caddy/caddy_config.json"}"
+command_background="true"
+logfile=/var/log/${RC_SVCNAME}/${RC_SVCNAME}.log
+start_stop_daemon_args="--user ${command_user%:*} --group ${command_user#*:}
+	--stdout ${logfile} --stderr ${logfile}"
+
+: "${supervisor:=supervise-daemon}"
+: "${respawn_delay:=5}"
+: "${respawn_max:=10}"
+: "${respawn_period:=60}"
+
+depend() {
+	need net
+}
+
+start() {
+	checkpath --directory --mode 755 --owner root "${pidfile%/*}"
+	checkpath --directory --mode 755 --owner "${command_user}" "${logfile%/*}"
+	default_start
+}
diff --git a/www-servers/caddy/files/logrotated b/www-servers/caddy/files/logrotated
new file mode 100644
index 000000000000..3cb55ca2c6c2
--- /dev/null
+++ b/www-servers/caddy/files/logrotated
@@ -0,0 +1,3 @@
+/var/log/caddy/*.log {
+	copytruncate
+}
diff --git a/www-servers/caddy/metadata.xml b/www-servers/caddy/metadata.xml
index 2bb2d280d7e9..cd5b3d46d1d3 100644
--- a/www-servers/caddy/metadata.xml
+++ b/www-servers/caddy/metadata.xml
@@ -1,8 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<!-- maintainer-needed -->
+	<maintainer type="person">
+		<email>zmedico@gentoo.org</email>
+		<name>Zac Medico</name>
+	</maintainer>
 	<upstream>
-		<remote-id type="github">mholt/caddy</remote-id>
+		<remote-id type="github">caddyserver/caddy</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/www-servers/civetweb/Manifest b/www-servers/civetweb/Manifest
index f0250c48688c..6bbaed55149f 100644
--- a/www-servers/civetweb/Manifest
+++ b/www-servers/civetweb/Manifest
@@ -1,5 +1,5 @@
 DIST civetweb-1.11.tar.gz 11421650 BLAKE2B 487044a313c2ff005a8dfa247b3d8a3c3b52ef048cbc3050ec8c0402ccef4e12e28de53fed5a3a91df1e7f59ba6c03bf545413ffdd0ce3e4d604148c16c661e9 SHA512 e1520fd2f4a54b6ab4838f4da2ce3f0956e9884059467d196078935a3fce61dad619f3bb1bc2b4c6a757e1a8abfed0e83cba38957c7c52fff235676e9dd1d428
 DIST civetweb-1.12.tar.gz 11463079 BLAKE2B 1182f798a2f9cdb34754b3c0edf80160efda31f72d800b26b27ec36ff4a5623745495a52632a128aefda67c6b902250c4e01ec7debd73d4a95abfc42a1b17ea6 SHA512 d6f8d29011bc1accd5384856bef16c0f20305f622a8f8c127cdf3ae5c567db3aba0d76293cc8c77f90f4989c44b2896a45e533d2f2408cc49488d1d234d308f5
 EBUILD civetweb-1.11.ebuild 919 BLAKE2B f1fd8bbfaafbb7623895ef6084d9959a8203ca1f7f56283a057376e4bd69870d4117d0fd225cb07a8909799287107277a1b4efe8b9ac1dab6db632eb5a7318a2 SHA512 50577978d94dddf28657145055a3fd0513ec9e86779e84a5357128d4d2b7ad209b8d772990f52ada74a1d9b5a3148ef919044c7d2afd0a35a750af0ac458d1a6
-EBUILD civetweb-1.12.ebuild 764 BLAKE2B 06f6526a9adefea78f17bb96f6577bebf52bb010551a974422dfbccf5f13ad29ff96137a3fa31ef8317a12e42d5bc6efd146932daa08e79918644dfa5c117ed8 SHA512 72fb4e4963bf4595388ab0ff77a5d548b61f7649fd5de22dc39d639315cc148dff6f6d94c49f14308d4b23f9bbef84410822782e5c362a37e32e0eac7abb0ce0
+EBUILD civetweb-1.12.ebuild 762 BLAKE2B 8b8f7830459ef30c8f169804fd52f62c7cf9b93d23f0fa4134c34ab179277f7b65c7179818c25cf330becd8a4dfc5896920f6a419a7cf497328617d309ae344a SHA512 3630e80f4d7db922b3be4cf4035ca595e0c84ac84cd8af01cbc1857f3fa00b52c4ff6f0a7f5b4b4c99fa19039f7386f2ae42d9a7d9bcbbb034c92333aba6f58a
 MISC metadata.xml 404 BLAKE2B fabc0ad84971b528fe36760060c3daf34ef0e9e7a730a4ab7624813e8262ec2dc9e336f077d510877a8151b14934c3af2ad6a2617081fd6729b08b3e043111e3 SHA512 4444aa744d80abf7d64042a1a34fc425f76054a2d8c8e8d892007f4ef94742e0e367663f222bf39f76c611ec36af075b1c5972e5fea3c82d8b062494dfced5f4
diff --git a/www-servers/civetweb/civetweb-1.12.ebuild b/www-servers/civetweb/civetweb-1.12.ebuild
index f5dc3264ac3f..3e2f8cd4af8a 100644
--- a/www-servers/civetweb/civetweb-1.12.ebuild
+++ b/www-servers/civetweb/civetweb-1.12.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/civetweb/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="cxx +server ssl"
 
 RDEPEND="ssl? ( dev-libs/openssl:0= )"
diff --git a/www-servers/fnord/Manifest b/www-servers/fnord/Manifest
index 16b84f56ffdc..f0ddcd59b7f5 100644
--- a/www-servers/fnord/Manifest
+++ b/www-servers/fnord/Manifest
@@ -1,4 +1,4 @@
 AUX fnord-1.10-gentoo.diff 3204 BLAKE2B 98b868e50712d8048a3f3924d8af93f5a5b34d083cba7b2d64a4f02ccc672e20d8a3eaf5a1c2411537763d85ea74a577de6f8b5bb57bd2c1554e038bcbb00f5a SHA512 93921b050e8b165124b738fcd96c0d828289ee238284088c6859777fd5ca647f9156a0419e4cd6ee65df6e9d944913b8f1e7c6382c358b8c549425cac7414a7b
 DIST fnord-1.11.tar.bz2 28845 BLAKE2B 1f9ce7ca3476f03af0528f9ea6701be25babbd8a38398df3f87d1b1a18a28182a54bdfe814165ca6422f427bcdabd013f9eed2c1f178f0403829b38d618c2d08 SHA512 12a3751a2f98acb3ba2d468972bb785b656fa01bfb0828bc9ba5488dc7a2a66e9f226a6cc49ceda57aa7875d8d90954a9e79806c9506a7906cfff346cd400154
-EBUILD fnord-1.11-r1.ebuild 888 BLAKE2B c78974003e842e9c8f9d845ec8fddda411d0de0f2491448aedfdc6a319a97292b0f6b9f53ace71dc2c22ba0547ab1e00a30a19988cc727dc9c744dfd29ccc538 SHA512 0b8ea6bb2d88c58bc4b781127d98ad2c651eb557c899a418102dfa9fa4aa517205b0521d9edc3b266a47a95deacd0a60fb0e1746e21108bc13025063a428a4aa
+EBUILD fnord-1.11-r2.ebuild 797 BLAKE2B d2c6b61ec74e1ce9f666050f3fd1c90e09772f154579d405e5f4ca91e60e4079d48efba1ace259aa0116da1234f54ffbb6e797d94558d5ad9aeffd65a075f1f0 SHA512 9164533a2393b12f6ccbbbecbf337f32d71e105e8ecc431a76fcaca8839cb251b7903d8ebcd948969f58e85b408aec8d536c45764ca33478747e01487790faee
 MISC metadata.xml 242 BLAKE2B de3429346ad1b5e7b5cc5bb2ca71af997b3702565c6dbab9d02c358724423a4bdc916b0ea48180a2273404e59e4bfca367e1659e4c1e2f70f3cff0b111bd8b6b SHA512 688a7e67d3fcc02afd7795ace015bf7832ba3bc428cf64042b4ad9ea72d815996ea128b0a4cf97e8331dc3ad371c4565963d6c773d161e88cd6b6926b58aecec
diff --git a/www-servers/fnord/fnord-1.11-r1.ebuild b/www-servers/fnord/fnord-1.11-r2.ebuild
index 1caf64c5d572..0465b9d94b84 100644
--- a/www-servers/fnord/fnord-1.11-r1.ebuild
+++ b/www-servers/fnord/fnord-1.11-r2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-inherit flag-o-matic toolchain-funcs user
+inherit flag-o-matic toolchain-funcs
 
 DESCRIPTION="Yet another small httpd"
 HOMEPAGE="http://www.fefe.de/fnord/"
@@ -14,24 +14,21 @@ SLOT="0"
 KEYWORDS="~amd64 ~hppa ppc sparc x86"
 IUSE="auth"
 
-DEPEND=""
-RDEPEND="${DEPEND}
+RDEPEND="
+	acct-group/nofiles
+	acct-user/fnord
+	acct-user/fnordlog
+	sys-apps/ucspi-tcp
 	virtual/daemontools
-	sys-apps/ucspi-tcp"
+"
 
 DOCS=( TODO README README.auth SPEED CHANGES )
-PATCHES=( "${FILESDIR}/${PN}"-1.10-gentoo.diff )
 
-pkg_setup() {
-	enewgroup nofiles 200
-	enewuser fnord -1 -1 /etc/fnord nofiles
-	enewuser fnordlog -1 -1 /etc/fnord nofiles
-}
+PATCHES=( "${FILESDIR}/${PN}"-1.10-gentoo.diff )
 
 src_compile() {
 	# Fix for bug #45716
 	use sparc && replace-sparc64-flags
-
 	use auth && append-flags -DAUTH
 
 	emake DIET="" CC=$(tc-getCC) CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}"
diff --git a/www-servers/gatling/Manifest b/www-servers/gatling/Manifest
index 3395efb63754..70ad16272b2a 100644
--- a/www-servers/gatling/Manifest
+++ b/www-servers/gatling/Manifest
@@ -3,5 +3,5 @@ AUX gatling-0.15-ar.patch 754 BLAKE2B 08ebd3714234ced36751d0ddcb0d3391aa8cbc0f91
 AUX gatling.confd 659 BLAKE2B ac3a2bc798e8ee9172f7c807c7e80f5bc7ad12e1830f296f097078887e609facfcb6087c6d5cdaa162fd747d7f03d208a28ec30e12fb67e7dc938ed0e65f766b SHA512 e903cd9afbb575226c6de0da8ad673d4650a53cac7442505422c98c32a00457f3d48f2853355cd76ea0f83671cb973ddf90df900d86a15172291317109481fb3
 AUX gatling.initd-3 1970 BLAKE2B ba48e796b4fca2cd165756b3ef781feb47be18e43043d834e028d80b522f1fe6482db79bb89a7a7e57c1fdd80f6cdbb525ec0153af8600daf848d7408aa4ff6e SHA512 3b198ed6728add5f30e8ec16171cc7086d315448821b3a5487be1cf7b318735a77f0881d9aca0a5af179a2b8aff75fd0c0ce80836172a26c439cba2859c6ab1f
 DIST gatling-0.16.tar.xz 126844 BLAKE2B 33dd2e93833b216ffadae4dbd5650af87b23ed5d62caf181d8005acb4dce889b86d1afb711676377ba2b7c4fe08b8f2350a32965cf6292a268281b28c4310c27 SHA512 9446ea0ae862509b1a892e5bdef14d3a2320c3c3e846362b4679c0834aa906ab5b16ef54e4a7c8e7ee839d30317436dd411e891e3105035a9ee31b0facc0b8c1
-EBUILD gatling-0.16-r1.ebuild 1256 BLAKE2B d7bdc41661762a0eb8ba0d7d276b591f8e6fb2d71b6f74169e0aa435921beabe6b4fefda3dd6dd189494a87c3a2b36e7d7b3bc1884cd26f33b52ee14f6612772 SHA512 59ed22e6882620b42ed5512a59ebdacb2476ab35e96ec60d5f62d5bab256f8bfe7f84e500799a69d7d5621d3ad5cf55a14ff07caafa6404649443b68760d7aea
+EBUILD gatling-0.16-r1.ebuild 1253 BLAKE2B d6e82218be3c9aafb02d926b371bf81e345bb7a1c1d67f13a880aa1fa7aa4650c6f785fa105e2ff5215c44bda9224f3540b7d471cf9bdded7dd4312a2941766c SHA512 68c8202f04bf618d3893e299ced29e097ebfff41f360e389d7690ae87128db22c36358b72557d9cf3e3fe34d51c5cb44dd1034b5a50c6e1827e03aa36fc26ab9
 MISC metadata.xml 444 BLAKE2B dd65d9cb3f9b6babebc0e45c67e8bda05f48d49d8902f6a0da4d1d75f38ba2e1d627f0a1e9e35dac77466fd7edfe43435b7b99d7ee394268df1e4f5cc5b53ab5 SHA512 0f829523b85ea9fcd62743f72f7a985e532685d4989b0083191286cbc9a99db398fde3c63f86ad9bdeb6e75d559a777e85cf2df037456e5b0960b15c2511815a
diff --git a/www-servers/gatling/gatling-0.16-r1.ebuild b/www-servers/gatling/gatling-0.16-r1.ebuild
index 6616e0b4eca0..25265f0c79e5 100644
--- a/www-servers/gatling/gatling-0.16-r1.ebuild
+++ b/www-servers/gatling/gatling-0.16-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
 
-inherit eutils toolchain-funcs
+inherit toolchain-funcs
 
 DESCRIPTION="High performance web server"
 HOMEPAGE="https://www.fefe.de/gatling/"
@@ -44,7 +44,7 @@ src_compile() {
 	use ssl && targets+=' tlsgatling'
 
 	emake DIET="${DIET}" CC="$(tc-getCC)" \
-			CFLAGS="${CFLAGS} -I${ROOT}/usr/include/libowfat" \
+			CFLAGS="${CFLAGS} -I${ESYSROOT}/usr/include/libowfat" \
 			LDFLAGS="${LDFLAGS}" prefix=/usr ${targets}
 }
 
diff --git a/www-servers/gunicorn/Manifest b/www-servers/gunicorn/Manifest
index f1ab6b673cdf..e2dbfcb3955c 100644
--- a/www-servers/gunicorn/Manifest
+++ b/www-servers/gunicorn/Manifest
@@ -2,5 +2,5 @@ AUX gunicorn-20.1.0-tests_optional_modules.patch 622 BLAKE2B 27efd7afd2c69e65622
 DIST gunicorn-20.0.4.tar.gz 373841 BLAKE2B d6f0b5b901697ebc6ee987af5766174a845de8bfad03ce95638ed087b92175e9b2f0e9a49fda70f8f9c6fdc15e1ef1a431c069270af068fb29780abcedf63fc3 SHA512 706620f165e36c178a6d3e65f51a9bb7746abd40dfc7c0f1b3b523771be953dd03b36111f192407aef474ad44afdffd11b6502e51376d11465ffac2255822d5e
 DIST gunicorn-20.1.0.tar.gz 354960 BLAKE2B bae414a8da7a4dbdf79e0b46f517138534521a1a8544f4ea2e1e27e6778d2f6ad8d6a8af02590fedad47d305acdea53f1cdbc4deeda3619fc4a5ffef0932bea1 SHA512 4fd905f62adc30e044cf2a56a1a77e14bc633258267d6bfbd4f6a68494f93f377e9fb9ed94fab7f11f9d7813857a680974a88c4b6bf97d4f1b74792a81810111
 EBUILD gunicorn-20.0.4.ebuild 906 BLAKE2B 7b895c5e0ebe86439c7ee3f8cd3867a8758e4e4db4c46f27bdccf9cf8a1426fd608360fb9ddbd01e279384dac66cae45e07fefe3a0d728467305042c9cc0a1b9 SHA512 28e948172cdffed3cfbf7ee5746d4514e80c32583854522dbc07e6d1feda15330a99fc4d7f898afdae517e32d3627039a4a9ca028352d8e8400fa0185d57c3b2
-EBUILD gunicorn-20.1.0.ebuild 1304 BLAKE2B ccc3fd31910e8c6a7d94dae44700754ba4141b3af6321cbf84a51c52283c7205f033a7d9ea702a7300dca95080df3b0fa70cef2ca5aa1a30688412da327a7477 SHA512 70fc191a876713268c1606d45a55d67d2c8dc73913678377607f3eb8cc1a3d83010427970b767f966c74d3a73264522b939088a0e2c29fd140a44357d4587077
+EBUILD gunicorn-20.1.0.ebuild 1301 BLAKE2B d54c8d7dcf9dcfd7150fd901e4bcc95c79a003f26412eb3a698688eb43620c84828c2012bdc33f37c5518dbed13050c3f932715fec92b5b6d3d0ec9fa82e8b87 SHA512 df6704763afed0ef75a1153ae4e94b3d1a54660a77bcd838f3fb5214920f2251d55ab1dcbff5dd4d60542c54361c9229a70fa5b98749f653120be05493a105e5
 MISC metadata.xml 820 BLAKE2B d0d69bf646aea74e6b85daee66e739857ff027050bf3085c6f56eadaaca90297825234477d0b4b9540646edf92d7b5daabe523336545e756b5d1a9d17e34c95c SHA512 fc0e570d92321b0255fecb3511fa313a3caa8686f7956438e18ccaff802b0ea0edccc9a196f356fd9d24370100edfae0470d0afdeafa6a7398330829d8a95644
diff --git a/www-servers/gunicorn/gunicorn-20.1.0.ebuild b/www-servers/gunicorn/gunicorn-20.1.0.ebuild
index cb38379151a0..70043f376eef 100644
--- a/www-servers/gunicorn/gunicorn-20.1.0.ebuild
+++ b/www-servers/gunicorn/gunicorn-20.1.0.ebuild
@@ -40,8 +40,7 @@ python_install_all() {
 }
 
 pkg_postinst() {
-	elog "Note that alternative worker types need additional packages to be installed:"
+	optfeature_header "Alternative worker types need additional packages to be installed:"
 	optfeature "eventlet-based greenlets workers" "dev-python/eventlet"
 	optfeature "gevent-based greenlets workers" "dev-python/gevent"
-	elog
 }
diff --git a/www-servers/lighttpd/Manifest b/www-servers/lighttpd/Manifest
index 2d927e7e2817..89d2e8216ab0 100644
--- a/www-servers/lighttpd/Manifest
+++ b/www-servers/lighttpd/Manifest
@@ -10,5 +10,5 @@ AUX lighttpd.tmpfiles.conf 41 BLAKE2B a159ae17094377d927bcf51078d40c322e5213d620
 DIST lighttpd-1.4.55.tar.xz 765660 BLAKE2B 7b972de86e7d1a51438718e4d5bd49188c107b0f2e656ead597085ae84f3d41cdb662a7774c6655155d390c26f3e4f0b0dc4243c85cb0255a91d8ca57742f402 SHA512 023d5a54079e710a89a59e259c0b5798103ef6fce4544c36110dc4c5281ef429ef99369923d74123fcf8be37afe622d44cd7149078d21971ff26f3f4ee37c439
 DIST lighttpd-1.4.58.tar.xz 956828 BLAKE2B b8b0a111db64a8af429dd9922503991e55276808b58143ffce3268bc8b20a39cfec9d8c1e2917b34326ac5502801a6ca3b9bae26874f86b6749c363a09225ca3 SHA512 b7f18223e46bf78f866eb22f44a7702df07424271e085da9f0d03e626198c30e87a3959536d02e3588aa47ba4bc7db7c432307175fb3b25a2984f9cf692c0ca4
 EBUILD lighttpd-1.4.55-r100.ebuild 6978 BLAKE2B 349d99b2b1422cfb962124b02013b2af9f151442bc1da262e24c83855c4aa028d9701731a37be2fd9f66b4f45cfd226abfd34ad470b3d856c3e264a353a46550 SHA512 3cdbf07a0b2ca79283dd35db0b14029fc99b44ffaa9967412fb5c0021a5bcb2f77d653084961386553ba82bec1df5b680bb6b372d6ad556d067a4c376c642cd2
-EBUILD lighttpd-1.4.58.ebuild 7531 BLAKE2B 6e3a0fb9e4a7ce2dc1a8e6665d278cb20840f0826dcd0ff44b05fa3858b5462b640b290093f5650a5b3fbfd4e461464e593a448f13d7835a56297428a3283d87 SHA512 6e4c7986dd9fdd863e2f11377ef8869c18a2807431bcd2f71ff42839732bd664524249920d68c35958c324738344ec47daa28154f1de5627b3d92db914477682
+EBUILD lighttpd-1.4.58.ebuild 7525 BLAKE2B 0db0ce65e51ce0d51ab7288a5e6d5331156b7c168da6bf3c5729b14aedece35366526c48094c0713d8d130d661d0126bfc84f3ebf7066a85aa92c377771240cc SHA512 2eba45931fd8262191c4ceb264beb27bd3a34146f32ca9392cd24697f478a23e1f203395fd605e3bbfda1c8c50990f10383e320ec62d96f6ccaba9d90dff6502
 MISC metadata.xml 1718 BLAKE2B 40b67e4fc9a9fad8cb7008b32e24a1d57149ecc78514ec3dbcb9d3df4cd865283c8a6685acf6037bfeb04b0f3b189a32fee0e0cf98955d99525bb4a5b417fb0d SHA512 442d7ee6fc749d065c01f2e6f798465ab001a504d1104726322d5fd539114301cef2562b4721df9d40305f547b81d28fdaa8d3abeb327c045065e1a7a3820616
diff --git a/www-servers/lighttpd/lighttpd-1.4.58.ebuild b/www-servers/lighttpd/lighttpd-1.4.58.ebuild
index 2cfd54ccf4c8..825b9c477b1f 100644
--- a/www-servers/lighttpd/lighttpd-1.4.58.ebuild
+++ b/www-servers/lighttpd/lighttpd-1.4.58.ebuild
@@ -13,7 +13,7 @@ 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"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86"
 IUSE="brotli bzip2 dbi doc gdbm gnutls ipv6 kerberos ldap libev lua maxminddb minimal mbedtls mmap memcached mysql nss pcre php postgres rrdtool sasl selinux ssl sqlite test webdav xattr zlib"
 RESTRICT="!test? ( test )"
 
diff --git a/www-servers/mongrel2/Manifest b/www-servers/mongrel2/Manifest
index 131a7a1f3cf8..084a7937c400 100644
--- a/www-servers/mongrel2/Manifest
+++ b/www-servers/mongrel2/Manifest
@@ -1,6 +1,7 @@
 AUX mongrel2-1.11.0-fno-common.patch 585 BLAKE2B de37abde0ab62ee986008a7f8d8f50ca32572f73ee589b9d45437ff6d4746cb15abc4726641eac75b688bc8814b7f99d2be206861e8d9e220fbc144af0926674 SHA512 99812f7c1c996a1497f5b58c50181d988755c36d0be7e1b6eac31d34fb0189a1910d0da61ed62105772abda097c581f457012716963c673f79803d3eeed655b3
 AUX mongrel2-1.11.0-polarssl-platform-590512.patch 459 BLAKE2B 63917c58c7c29639d321c5f346273f09289f0a1359d82a238ece01506b85ba242396e2786bef2e8af7ee1c52bf40edd5a6456dcebcb5d9e4f144422c8700135d SHA512 7e7c609d4c2b2820ef1097b96da56c4e250df685af90af19f0a3c863f0b55b7b0f8834199f1d6e94bd04d970189807202429ae5e20f63f86b84419d0e3d7edab
-AUX systemtls.mak 4506 BLAKE2B 60a448a3f1ed77646003cacb8d5adcf34899532c00fd461a67337f2ded6cc7a6204f72a1b25b3787f692487e502eb313ee0bc7dafb04c902c81d82edfc8fe96b SHA512 9b1fc5bf23d60267d64c08e0f0956deee0c421b03556138f994822abdcb324702bde744559e6629488cb05669b3228078180cb4f30af8fa09c10bc110ce7e3e1
+AUX mongrel2-1.11.0-respect-FLAGS.patch 5246 BLAKE2B 7bafb8f27bf51a6151a70c709a4d1f3da6c725634f23ac461f95110f566e9e57dd351be08b44da40491ff5c61ecb40d87daeeba59bc9887604460d63701f60a3 SHA512 45fe23e4066eb78374cd4a162c473318e8c75a4e4d8b5bce508541577d7d30539bb58e8f858157fb58467ba9a833e3bda68c5ebc3cf3ed7f459ca51bf1ded31b
+AUX systemtls.mak 4570 BLAKE2B 74718f85f540074a125ff9bf994a535ac33b530c880ddca8f8b6746b8e27d8e2ccffbb9611d2ac178107070114e8f78f6be9a11cb8572a6af80c2335b8259c76 SHA512 eee6e802729540eef32bf24dc3eface59508b3d73fc28ced075856fd572ba412474ceedf98a54be070de85221658ca960724814e777c0aedd0abe5edefe833cc
 DIST mongrel2-1.11.0.tar.gz 1060770 BLAKE2B cbf27e148385e0f659015bf0fae3e027996ba2a4b3189658503faf7b3083c9356ea61cd7bb0d5516fecedd30f1cde8fc3ed74f5f1221a50442df1e209770b87c SHA512 60ee5036c2ac826a08bb1300969f5ad7ec2bc67c7f47635a3b458a0bad6d7e2fa37183c2708d512632c86101f537a4eb64eeef0775137705898480da70d61e90
-EBUILD mongrel2-1.11.0-r1.ebuild 803 BLAKE2B cd5144b8dccfb451fcb1d1778525055cea3a976bf39c9ed77a14d90117d2e9416d5d897e8b36fac07ae6dbcf4cfdc6c895e67bed0f29d54addc9a66183ba2e90 SHA512 59555351b9be616ca5ec4b3a469f3223df91392ec3f158e63b491ad25284e07e683f2e78aee180e106c7637c775380b21137afabb10dd306ba06c3e7a31cfe85
+EBUILD mongrel2-1.11.0-r1.ebuild 861 BLAKE2B 7eed460ae5b4d3ad74d70b15d17a18d9c6c580ea901812efc71ffaad7cbb11cb698d799844ba58e7f02f4e441b95e607eacd3f986a7144346f018b531ec30280 SHA512 6cff892c65d9e5cc59eb7a81fbb56832294d7ec7724157ae27297d0eeab1246fda3a89972a914cec740f0b1d441f39e6538069040495e624fd89600e12b93582
 MISC metadata.xml 256 BLAKE2B 46b1738febd71b398d37ff29c65a3852bb520b84bf6ece85b1ebba4549ab49e190e98fb2a52c99ab3816034077b545d09502339b9358c5963cdf0d7851d79ddd SHA512 6988e6bbe794ff5efe6cca6193f2aaf3cbb58699de631998432f07153fd53adf4254d2d94f4fef10bdf1851ff05fbdd7e2729555060ca9aced7dfc5490b8fd3b
diff --git a/www-servers/mongrel2/files/mongrel2-1.11.0-respect-FLAGS.patch b/www-servers/mongrel2/files/mongrel2-1.11.0-respect-FLAGS.patch
new file mode 100644
index 000000000000..17b5da340067
--- /dev/null
+++ b/www-servers/mongrel2/files/mongrel2-1.11.0-respect-FLAGS.patch
@@ -0,0 +1,146 @@
+--- a/examples/kegogi/Makefile
++++ b/examples/kegogi/Makefile
+@@ -1,4 +1,4 @@
+-CFLAGS=-g -I../../src -Isrc -Wall -Wextra
++CFLAGS+=-I../../src -Isrc -Wall -Wextra
+ LIBS=-lzmq -lsqlite3
+ 
+ all: kegogi
+@@ -8,10 +8,10 @@ install: all
+ 
+ kegogi: src/kegogi.o src/fuzzrnd.o src/kegogi_parser.o src/httpclient.o src/param.o src/kegogi_lexer.o src/kegogi_tokens.o
+ 	mkdir -p build
+-	$(CC) ${CFLAGS} -o build/kegogi src/kegogi.o src/kegogi_parser.o src/kegogi_lexer.o src/fuzzrnd.o src/httpclient.o src/param.o src/kegogi_tokens.o ${LIBS} ../../build/libm2.a
++	$(CC) $(CPPFLAGS) ${CFLAGS} $(LDFLAGS) -o build/kegogi src/kegogi.o src/kegogi_parser.o src/kegogi_lexer.o src/fuzzrnd.o src/httpclient.o src/param.o src/kegogi_tokens.o ${LIBS} ../../build/libm2.a
+ 
+ src/kegogi_lexer.o: src/kegogi_lexer.c
+-	$(CC) $(CFLAGS) -c src/kegogi_lexer.c -o src/kegogi_lexer.o
++	$(CC) $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) -c src/kegogi_lexer.c -o src/kegogi_lexer.o
+ 
+ src/kegogi_lexer.c: src/kegogi_lexer.rl src/kegogi_parser.h
+ 	ragel src/kegogi_lexer.rl -C -o src/kegogi_lexer.c
+--- a/tests/filters/Makefile
++++ b/tests/filters/Makefile
+@@ -1,12 +1,12 @@
+ PREFIX?=/usr/local
+-CFLAGS=-I../../src -I../../src/mbedtls/include $(OPTFLAGS) -fPIC -shared -nostartfiles -L../../build
+-LDFLAGS=$(OPTLIBS)
++CFLAGS+=-I../../src -I../../src/mbedtls/include -fPIC -shared -nostartfiles -L../../build
++LDFLAGS+=$(OPTLIBS)
+ 
+ all: test_filter.so test_filter_a.so test_filter_b.so test_filter_c.so
+ 
+ 
+ %.so : %.c ../../build/libm2.a
+-	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $< ../../build/libm2.a
++	$(CC) $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) -o $@ $< ../../build/libm2.a
+ 
+ clean:
+ 	rm -f *.so
+--- a/tools/config_modules/Makefile
++++ b/tools/config_modules/Makefile
+@@ -1,6 +1,6 @@
+ PREFIX?=/usr/local
+-CFLAGS=-I../../src -I../../src/mbedtls/include $(OPTFLAGS) -fPIC -shared -nostartfiles -L../../build
+-LDFLAGS=$(OPTLIBS)
++CFLAGS+=-I../../src -I../../src/mbedtls/include -fPIC -shared -nostartfiles -L../../build
++LDFLAGS+=$(OPTLIBS)
+ 
+ MONGO_SRC = mongo-c-driver/src/bson.c \
+             mongo-c-driver/src/encoding.c \
+@@ -22,11 +22,11 @@ fetch_mongo_c_driver:
+ mongodb.so: CFLAGS += $(MONGO_CFLAGS)
+ mongodb.so: fetch_mongo_c_driver
+ mongodb.so: mongodb.c
+-	$(CC) $(CFLAGS) -c $(MONGO_SRC)
+-	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $< bson.o encoding.o gridfs.o md5.o mongo.o env_posix.o numbers.o ../../build/libm2.a
++	$(CC) $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) -c $(MONGO_SRC)
++	$(CC) $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) -o $@ $< bson.o encoding.o gridfs.o md5.o mongo.o env_posix.o numbers.o ../../build/libm2.a
+ 
+ %.so : %.c
+-	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $< ../../build/libm2.a
++	$(CC) $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) -o $@ $< ../../build/libm2.a
+ 
+ clean:
+ 	rm -f *.o *.so
+--- a/tools/filters/Makefile
++++ b/tools/filters/Makefile
+@@ -1,12 +1,12 @@
+ PREFIX?=/usr/local
+-CFLAGS=-I../../src -I../../src/mbedtls/include $(OPTFLAGS) -g -fPIC -shared -nostartfiles -L../../build
+-LDFLAGS=$(OPTLIBS)
++CFLAGS+=-I../../src -I../../src/mbedtls/include -fPIC -shared -nostartfiles -L../../build
++LDFLAGS+=$(OPTLIBS)
+ 
+ all: null.so rewrite.so sendfile.so
+ 
+ 
+ %.so : %.c
+-	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $< ../../build/libm2.a
++	$(CC) $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) -o $@ $< ../../build/libm2.a
+ 
+ clean:
+ 	rm -f *.so
+--- a/tools/m2sh/Makefile
++++ b/tools/m2sh/Makefile
+@@ -1,4 +1,4 @@
+-CFLAGS=-DNDEBUG -DNO_LINENOS -pthread -g -I../../src -Isrc -Wall $(OPTFLAGS)
++CFLAGS+=-DNDEBUG -DNO_LINENOS -pthread -g -I../../src -Isrc -Wall
+ LIBS=-lzmq -lsqlite3 ../../build/libm2.a $(OPTLIBS)
+ 
+ PREFIX?=/usr/local
+@@ -11,7 +11,7 @@ LIB_OBJ=$(filter-out src/m2sh.o,${OBJECTS})
+ 
+ all: ../lemon/lemon tests build/m2sh
+ 
+-dev: CFLAGS=-g -Wall -Wextra -Isrc -I../../src $(OPTFLAGS)
++dev: CFLAGS+=-Wall -Wextra -Isrc -I../../src $(OPTFLAGS)
+ dev: all
+ 
+ install: build/m2sh
+@@ -19,15 +19,15 @@ install: build/m2sh
+ 
+ build/libm2sh.a: ${LIB_OBJ}
+ 	mkdir -p build
+-	ar rcs $@ ${LIB_OBJ}
+-	ranlib $@
++	$(AR) rcs $@ ${LIB_OBJ}
++	$(RANLIB) $@
+ 
+ build/m2sh: ../lemon/lemon ../../build/libm2.a ${OBJECTS}
+ 	mkdir -p build
+-	$(CC) $(CFLAGS) -o build/m2sh ${OBJECTS} ../../build/libm2.a $(LIBS)
++	$(CC) $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) -o build/m2sh ${OBJECTS} ../../build/libm2.a $(LIBS)
+ 
+ ../lemon/lemon: ../lemon/lemon.c
+-	$(CC) -O2 ../lemon/lemon.c -o ../lemon/lemon
++	$(CC) $(CPPFLAGS) $(LDFLAGS) ../lemon/lemon.c -o ../lemon/lemon
+ 
+ tests: build/libm2sh.a ${TESTS}
+ 	sh ./tests/runtests.sh
+@@ -39,7 +39,7 @@ tests: build/libm2sh.a ${TESTS}
+ 	ragel -G2 $<
+ 
+ $(TESTS): %: %.c build/libm2sh.a
+-	$(CC) $(CFLAGS) -o $@ $< build/libm2sh.a ../../build/libm2.a $(LIBS)
++	$(CC) $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) -o $@ $< build/libm2sh.a ../../build/libm2.a $(LIBS)
+ 
+ ../../build/libm2.a:
+ 	cd ../.. && make clean all
+--- a/tools/procer/Makefile
++++ b/tools/procer/Makefile
+@@ -1,4 +1,4 @@
+-CFLAGS=-DNDEBUG -pthread -g -I../../src -Wall $(OPTFLAGS)
++CFLAGS+=-DNDEBUG -pthread -g -I../../src -Wall
+ PREFIX?=/usr/local
+ LIBS?=-lzmq 
+ SOURCES=$(wildcard *.c)
+@@ -8,7 +8,7 @@ all: procer
+ 
+ 
+ procer: ../../build/libm2.a ${OBJECTS}
+-	$(CC) $(OPTFLAGS) $(OPTLIBS) -o $@ ${OBJECTS} ../../build/libm2.a ${LIBS}
++	$(CC) $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) -o $@ ${OBJECTS} ../../build/libm2.a ${LIBS}
+ 
+ clean:
+ 	rm -f *.o procer
diff --git a/www-servers/mongrel2/files/systemtls.mak b/www-servers/mongrel2/files/systemtls.mak
index e449b762af3d..a536094b3f57 100644
--- a/www-servers/mongrel2/files/systemtls.mak
+++ b/www-servers/mongrel2/files/systemtls.mak
@@ -43,12 +43,12 @@ builddirs:
 	@mkdir -p bin
 
 bin/mongrel2: build/libm2.a src/mongrel2.o
-	$(CC) $(CFLAGS) $(LDFLAGS) src/mongrel2.o -o $@ $< $(LIBS)
+	$(CC) $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) src/mongrel2.o -o $@ $< $(LIBS)
 
 build/libm2.a: CFLAGS += -fPIC
 build/libm2.a: ${LIB_OBJ}
-	ar rcs $@ ${LIB_OBJ}
-	ranlib $@
+	$(AR) rcs $@ ${LIB_OBJ}
+	$(RANLIB) $@
 
 clean:
 	rm -rf build bin lib ${OBJECTS} ${TESTS} tests/config.sqlite
@@ -88,7 +88,7 @@ tests/config.sqlite: src/config/config.sql src/config/example.sql src/config/mim
 	sqlite3 $@ < src/config/mimetypes.sql
 
 $(TESTS): %: %.c build/libm2.a
-	$(CC) $(CFLAGS) -o $@ $< build/libm2.a $(LIBS)
+	$(CC) $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) -o $@ $< build/libm2.a $(LIBS)
 
 src/state.c: src/state.rl src/state_machine.rl
 src/http11/http11_parser.c: src/http11/http11_parser.rl
@@ -133,4 +133,4 @@ ragel:
 	ragel -G2 src/http11/httpclient_parser.rl
 
 %.o: %.S
-	$(CC) $(CFLAGS) -c $< -o $@
+	$(CC) $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) -c $< -o $@
diff --git a/www-servers/mongrel2/mongrel2-1.11.0-r1.ebuild b/www-servers/mongrel2/mongrel2-1.11.0-r1.ebuild
index 5ba0b5486632..0317876c263d 100644
--- a/www-servers/mongrel2/mongrel2-1.11.0-r1.ebuild
+++ b/www-servers/mongrel2/mongrel2-1.11.0-r1.ebuild
@@ -22,6 +22,7 @@ RDEPEND="${DEPEND}"
 PATCHES=(
 	"${FILESDIR}"/${P}-polarssl-platform-590512.patch
 	"${FILESDIR}"/${P}-fno-common.patch
+	"${FILESDIR}"/${PN}-1.11.0-respect-FLAGS.patch
 )
 
 src_prepare() {
@@ -30,7 +31,7 @@ src_prepare() {
 }
 
 src_configure() {
-	tc-export CC
+	tc-export AR CC RANLIB
 	default
 }
 
diff --git a/www-servers/monkeyd/Manifest b/www-servers/monkeyd/Manifest
index 0a7cb851ff59..1c538b1a94be 100644
--- a/www-servers/monkeyd/Manifest
+++ b/www-servers/monkeyd/Manifest
@@ -4,6 +4,6 @@ AUX monkeyd.confd 172 BLAKE2B 12259f30705d5f9e20971a4966056481636b5134951a850c1a
 AUX monkeyd.initd 601 BLAKE2B 178c97cb2d8281a971c43ec78d5904238b180ad43ea47a7aaf272010fcceb9942a3b6b2089ea7b8244d265a1f4d241fb82b483073f75204356fd775769992625 SHA512 e356742c537b5bbc8d9696e5fdad0c08d93ace5085f8939fa50d97498ebe0d85712af5da675e76c642296856768081ee14d6f0d3d73a17ce4642cf46e9056a79
 AUX monkeyd.initd-r1 608 BLAKE2B c6ce981294e6e852d346166ba71493470f8ac3604cf597a35a8d38a0ab1fe4c808de018a94149832d0f647257cff42c189dbfc6ef9876a06a338c4cfdeb1c3ba SHA512 d1a30f0033d9f2a0957028a6873b71903d8051340ac272ccbaf12daba9a89bf0c2e476b8aa22a0e60697ffd10ab5c1d6a4aa0ff7b204f8b4adc76ebe91b8abaa
 DIST monkey-1.6.9.tar.gz 1972040 BLAKE2B f1fe4791bfdba14905797e36563d76a7b551fb3f8bf4d387c598f6c19f58e7759044e4ad2664ac29a546ce76b210fa61285198c711751c7a47c124be507898a7 SHA512 3540a17fffe57a9d4b88b6243c634dcf6a27ed894ae2a0d5d42a4881221a9d59ae67d4c7fcf087535360d20ccdadab16947cf3a7dc6d4e864d487f598eb0ba62
-EBUILD monkeyd-1.6.9-r1.ebuild 4107 BLAKE2B f1ac0315644764dff00d27760bdec2e01d6ebbe4942ccf05a4ceb7c249d3a97ece242ec71b486ef42fcf2974d27c49d10685749884b5c0118a321c043c1c755a SHA512 a867b106b274eb7a8d59d9ccdd182fe463af64f9aba68306242002c2f76bce232ba7b01e5f1206064017cd40e42dabef7f4401fa69eead4f7fcc193271251816
-EBUILD monkeyd-9999.ebuild 4088 BLAKE2B b5459e1d670598a32f703582b17af660d93ed0312f89ee66b234786a1c62fe188ecb0eb4fc894268f0fd3988d832bcdf9069a98388b7a5ee9076bf1034a3b65f SHA512 9681fdb303c288e244e29c23b7c97c6a8632a4ee96d8ebb4f7697a68fa83ab3f293ce8d238192cde88991a11294bf00b728cacd2d217ff81ccabb44d5e5e7f75
+EBUILD monkeyd-1.6.9-r1.ebuild 4107 BLAKE2B 6381f3178e1e63b1879d8d4c46b598bdf4893723423798cb44fbec358badcfc0e982299bfe319cd596e6cea3321718db55290050bdba0fb3f53ce6aabddf56a1 SHA512 6370c49f6bb6a1f64a8af6fd2413fb800bf95fe1a1d8aff4a4cac4e4af8b241c3648f5d9df9eb6535876f1d05dee0cdc62fd219353e3e04b4295bbef213e9ec3
+EBUILD monkeyd-9999.ebuild 4088 BLAKE2B 5c5bf381472834ce24fa21e1180f7edc95cff56c65d1f9e04383ef6aa7ab23a3edaa3e3e7bd5655179aee74fcc1825b328c9c17302b722b236a8273ef5acc8a7 SHA512 a5bda2a6c7683a7bed4e86f4f3bad7dcf0175ece0d1e368e44f21dc965eb7fee84e85a1fcef62a64135245698442b35ea9177bf0f30e1c59f9ceb9ce75660d0a
 MISC metadata.xml 394 BLAKE2B f5849f3a0f249bfcfe85c51bda735406b5d10e97bba70c0427b57994dda956c5b402e98aee9bf9359e966a8d40f72b44d04622217020a5e26dac44497ca487d6 SHA512 9431b7f6722baa7c18ab2341a35aed3978f54e92c0b2a686bef0f7dc20934a14f93b6a1f1208b47b720f11e5f901e634c3b278eb540dfcc06c3a7c668fc0a209
diff --git a/www-servers/monkeyd/monkeyd-1.6.9-r1.ebuild b/www-servers/monkeyd/monkeyd-1.6.9-r1.ebuild
index 515772116e8b..e211f86a380c 100644
--- a/www-servers/monkeyd/monkeyd-1.6.9-r1.ebuild
+++ b/www-servers/monkeyd/monkeyd-1.6.9-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=5
 
-inherit eutils flag-o-matic toolchain-funcs user multilib
+inherit epatch flag-o-matic toolchain-funcs user multilib
 
 DESCRIPTION="A small, fast, and scalable web server"
 HOMEPAGE="http://www.monkey-project.com/"
diff --git a/www-servers/monkeyd/monkeyd-9999.ebuild b/www-servers/monkeyd/monkeyd-9999.ebuild
index 1ec59af14bc6..d818807591ad 100644
--- a/www-servers/monkeyd/monkeyd-9999.ebuild
+++ b/www-servers/monkeyd/monkeyd-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=5
 
-inherit eutils flag-o-matic toolchain-funcs user multilib
+inherit epatch flag-o-matic toolchain-funcs user multilib
 
 DESCRIPTION="A small, fast, and scalable web server"
 HOMEPAGE="http://www.monkey-project.com/"
diff --git a/www-servers/moonbridge/Manifest b/www-servers/moonbridge/Manifest
new file mode 100644
index 000000000000..6d617ccab457
--- /dev/null
+++ b/www-servers/moonbridge/Manifest
@@ -0,0 +1,4 @@
+AUX moonbridge-1.0.1-gentoo.patch 1093 BLAKE2B ea5cc2b18b4c9ec2ba9776cb34f9d2b5990e98df09ae4ba2bbf3e1f881ceb7b076da77eed6ed2cb0ec5589e6906e926293c022bddfbb549c4c13baeaf587a956 SHA512 a3b1c0cabe61b4dc9aafc50707ffe3024fd865bbed975f4b94a4421101c6f9fc9cca105cc6b6ce8a2b09f404c41c4add815cc8333bfa8082abdb94aecf1071b4
+DIST moonbridge-v1.0.1.tar.gz 48837 BLAKE2B ec0f433c220627b38e610358dbdb4f6a7406fcf5fc10b52001387d1d8a7fd2b2ef8df66cded97159b0360512cbf409a672f4bbd7db9decdb32ef843194c7e6b4 SHA512 2beba27da8b4f5d760f620648be32acb85d57c2498edc9e97bf380d675397ccab7a74eec6630f91130f999d66dbf868bb7ff708a409aaf8840149cd05614e37b
+EBUILD moonbridge-1.0.1.ebuild 1045 BLAKE2B ffe9d039fc72fc8b0b4689f4bb9da54bd9e1babdb544c05c628a557d6e2564355c547c3a2f061ad31cd37e94baecba6cf21b386533afdaeb2d6e4e760d54d5e6 SHA512 d70f93e1f1055895623522fc8d6cd9c40b7ea70d9780f1e029751a058f30603c1455535e9ac94019a05b075c5603c96eed0e19970f4acc62682e16cfd53aebc7
+MISC metadata.xml 247 BLAKE2B 93b9b87f9c12d46be11f0300dc77582b56ff89eb92f5d48f9fe7a68fda6f5124553440611219b18caefd2468859745ddd09fb4a0359ce7550ce901505688aaba SHA512 70716ee2f6b85358bae9fde979ad9d5a60541209b385198044403477d1374d0b1a2516e814951c21fce41f1cac38711e5c6fd95706097da8e26cac421af466bb
diff --git a/www-servers/moonbridge/files/moonbridge-1.0.1-gentoo.patch b/www-servers/moonbridge/files/moonbridge-1.0.1-gentoo.patch
new file mode 100644
index 000000000000..5691a16b47b2
--- /dev/null
+++ b/www-servers/moonbridge/files/moonbridge-1.0.1-gentoo.patch
@@ -0,0 +1,19 @@
+--- a/Makefile	2021-04-14 20:14:37.824271249 +0200
++++ b/Makefile	2021-04-14 20:15:18.498590911 +0200
+@@ -53,13 +53,13 @@
+ all:: moonbridge moonbridge_io.so
+ 
+ moonbridge: moonbridge.c moonbridge_io.h moonbridge_io.o
+-	cc -Wall -Wno-unused-result -O2 -Wl,-E -I $(LUA_INCLUDE) -L $(LUA_LIBDIR) -o moonbridge $(MOONBR_LUA_PATH_DEFINE) $(MOONBR_LUA_CPATH_DEFINE) moonbridge.c -lm -l$(LUA_LIBRARY) $(UTIL_FLAGS) moonbridge_io.o
++	$(CC) -Wall -Wno-unused-result $(CFLAGS) -Wl,-E -I $(LUA_INCLUDE) -L $(LUA_LIBDIR) -o moonbridge $(MOONBR_LUA_PATH_DEFINE) $(MOONBR_LUA_CPATH_DEFINE) moonbridge.c $(LUA_LIBRARY) $(UTIL_FLAGS) moonbridge_io.o
+ 
+ moonbridge_io.o: moonbridge_io.c moonbridge_io.h
+-	cc -c -Wall -O2 -fPIC -I $(LUA_INCLUDE) -o moonbridge_io.o moonbridge_io.c
++	$(CC) -c -Wall $(CFLAGS) -fPIC -I $(LUA_INCLUDE) -o moonbridge_io.o moonbridge_io.c
+ 
+ moonbridge_io.so: moonbridge_io.o
+-	ld -shared -o moonbridge_io.so moonbridge_io.o $(UTIL_FLAGS)
++	$(CC) -shared -o moonbridge_io.so moonbridge_io.o $(UTIL_FLAGS) $(LUA_LIBRARY)
+ 
+ clean::
+ 	rm -f moonbridge moonbridge_io.o moonbridge_io.so
diff --git a/www-servers/ocsigenserver/metadata.xml b/www-servers/moonbridge/metadata.xml
index 42c018ed1037..633b09e480d2 100644
--- a/www-servers/ocsigenserver/metadata.xml
+++ b/www-servers/moonbridge/metadata.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<!-- maintainer-needed -->
-	<upstream>
-		<remote-id type="github">ocsigen/ocsigenserver</remote-id>
-	</upstream>
+	<maintainer type="person">
+		<email>tupone@gentoo.org</email>
+		<name>Alfredo Tupone</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/www-servers/moonbridge/moonbridge-1.0.1.ebuild b/www-servers/moonbridge/moonbridge-1.0.1.ebuild
new file mode 100644
index 000000000000..206544b88f68
--- /dev/null
+++ b/www-servers/moonbridge/moonbridge-1.0.1.ebuild
@@ -0,0 +1,49 @@
+# Copyright 2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+LUA_COMPAT=( lua5-{2,3} )
+
+inherit lua-single
+
+MYP=${PN}-v${PV}
+
+DESCRIPTION="Network Server for Lua Applications"
+HOMEPAGE="https://www.public-software-group.org/moonbridge"
+SRC_URI="https://www.public-software-group.org/pub/projects/${PN}/v${PV}/${MYP}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+REQUIRED_USE="${LUA_REQUIRED_USE}"
+DEPEND="
+	${LUA_DEPS}
+	dev-libs/libbsd"
+RDEPEND="${DEPEND}"
+BDEPEND="sys-devel/pmake
+	virtual/pkgconfig"
+
+S="${WORKDIR}"/${MYP}
+
+PATCHES=( "${FILESDIR}"/${P}-gentoo.patch )
+
+DOCS=( README reference.txt )
+
+src_compile() {
+	pmake CC=$(tc-getCC) LUA_INCLUDE="$(lua_get_include_dir)" \
+		MOONBR_LUA_PATH=/usr/lib/moonbridge/?.lua \
+		LUA_LIBRARY="$(lua_get_LIBS)" LUA_LIBDIR=/usr/$(get_libdir)
+}
+
+src_install() {
+	einstalldocs
+	docinto examples
+	dodoc example_*
+	dodoc helloworld.lua
+	dobin ${PN}
+	insinto /usr/lib/${PN}
+	doins moonbridge_http.lua
+	docompress -x /usr/share/doc/${PF}/examples
+}
diff --git a/www-servers/nginx-unit/Manifest b/www-servers/nginx-unit/Manifest
index 76d23f97b30d..c484478ba626 100644
--- a/www-servers/nginx-unit/Manifest
+++ b/www-servers/nginx-unit/Manifest
@@ -1,6 +1,4 @@
 AUX nginx-unit.initd 288 BLAKE2B 94caaeee62d93cdb3b9240bc6563fabe9b273b2125f9ec0c1ae0a2b079bef89b94f7e3a748d649a0840595f46047cee7ea388bd9514d1da88bb4a041a4a2c8ef SHA512 52a788e21a9aaa90a470a7861cd9856e3c2d2c52e3b4a23276c8b43e2a22f6f5aaec78caaf5f449463f1b856e0ffd83515e583f0ced00eada2d0afc00949ca77
-DIST nginx-unit-1.21.0.tar.gz 802826 BLAKE2B 9d0af079b84cd769b90d4735825765571a384d69fb8c6201d6ab2f943778a7ca19b408359e12a433d192aeefad9f7e8f760cde0568101858dabadfbb9b598784 SHA512 12e9e8b221ffe8014931fe46c7faa9398de6ad08bbc07e5f8e50f086e4a22419960522d33bece493e17ae544b499acb4ba29cb6cb731c0bb7fbdc6cdc44bf210
 DIST nginx-unit-1.22.0.tar.gz 824763 BLAKE2B 3ef343d62f3cfe793840c78fe18fd68ecad93170c87df1769636e8516df21901712d7e82caa5bafc3bf76231f32531cb7b0c1bdbe04706ee176a1e57526c50eb SHA512 7418e9dd86c10d64184f5a2f3e26c27bacc53b90ba35658fba6af00a57df89645c16c16b510d3e570eee6f8fdeef4ec7f92971f7231093e3da118e858ed386f5
-EBUILD nginx-unit-1.21.0.ebuild 1978 BLAKE2B 20751bad9b41b74c52d48e206829526f14bccd4930a3ee3ae20a855621e8980ad65098942e4a1bd0fdab8a1273b4c897072f7d8f7adaee39b900f12d231c38c6 SHA512 6c2c5862500c70bab9c1377657bb5b5036892b3e13233eb5b89efc30d0f6d5654a75e32d03a0b65da0205582daecc35e74e7981237a093803066c159a36ab02b
-EBUILD nginx-unit-1.22.0.ebuild 1986 BLAKE2B 187d0eee467c1247383c25deab5183517880623051cda2e3315c751ce16909ca96e61d06cf7afc1486749ad0912ae754c93483e4362a8a9ef1ad41131563060f SHA512 c3a6511a72279714d0209f8270fb114812bf2dc173905a396b21209bdb23345e404d08d1909bc017eed19c04a3cbfd3e651eae5dbff7a8e181fed32af29a426e
+EBUILD nginx-unit-1.22.0.ebuild 1985 BLAKE2B 49eff8837a6437e5c0434fd14ea921aa7bc2837cfb51bb45a94f1f14edccab1bffbcfab141604afc67d1068f2bd0d53a4517bdeeb1dd7c7ddc06359e09db660e SHA512 8c1da93fe2765c80ebd56fddd68ab1b495410f69b7f4b369cef4e9d213ab3f52c303a0310cac6917e7b7b7ac6fc12c9ad19c0e4d0d5cd3f90a17966f452f7b79
 MISC metadata.xml 979 BLAKE2B ddf33bc4fb2cf4b03aab115c50d8903947e7798f36ea07830d2cd9d7cbe19479c08bdc0cce3376297232731c6cfa83ee76577ffc5ed74a80891dbf69463821c8 SHA512 e4dd1b43188c2b7858c35ca9ed016d7b423179dc651af19c0c0f2b8dfb45103b20fcfd685b3ec21f8cf839c677f2548040f7c155fb984f0873750301b7cb6d63
diff --git a/www-servers/nginx-unit/nginx-unit-1.21.0.ebuild b/www-servers/nginx-unit/nginx-unit-1.21.0.ebuild
deleted file mode 100644
index 4677a0620547..000000000000
--- a/www-servers/nginx-unit/nginx-unit-1.21.0.ebuild
+++ /dev/null
@@ -1,82 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=(python3_{7,8,9})
-
-inherit flag-o-matic python-single-r1 toolchain-funcs
-
-MY_P="unit-${PV}"
-DESCRIPTION="Dynamic web and application server"
-HOMEPAGE="https://unit.nginx.org"
-SRC_URI="https://unit.nginx.org/download/${MY_P}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64"
-MY_USE="perl python ruby"
-MY_USE_PHP="php7-2 php7-3 php7-4"
-IUSE="${MY_USE} ${MY_USE_PHP} ssl"
-REQUIRED_USE="|| ( ${IUSE} )
-	python? ( ${PYTHON_REQUIRED_USE} )"
-
-DEPEND="perl? ( dev-lang/perl:= )
-	php7-2? ( dev-lang/php:7.2[embed] )
-	php7-3? ( dev-lang/php:7.3[embed] )
-	php7-4? ( dev-lang/php:7.4[embed] )
-	python? ( ${PYTHON_DEPS} )
-	ruby? (
-		dev-lang/ruby:*
-		dev-ruby/rubygems:*
-	)
-	ssl? ( dev-libs/openssl:0 )"
-RDEPEND="${DEPEND}"
-S="${WORKDIR}/${MY_P}"
-
-pkg_setup() {
-	use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	eapply_user
-	sed -i '/^CFLAGS/d' auto/make || die
-}
-
-src_configure() {
-	local opt=(
-		--control=unix:/run/${PN}.sock
-		--log=/var/log/${PN}
-		--modules=$(get_libdir)/${PN}
-		--pid=/run/${PN}.pid
-		--prefix=/usr
-		--state=/var/lib/${PN}
-	)
-	use ssl && opt+=( --openssl )
-	export AR="$(tc-getAR)"
-	export CC="$(tc-getCC)"
-	./configure ${opt[@]} --ld-opt="${LDFLAGS}" || die "Core configuration failed"
-	# Modules require position-independent code
-	append-cflags $(test-flags-CC -fPIC)
-	for flag in ${MY_USE} ; do
-		if use ${flag} ; then
-			./configure ${flag} || die "Module configuration failed: ${flag}"
-		fi
-	done
-	for flag in ${MY_USE_PHP} ; do
-		if use ${flag} ; then
-			local php_slot="/usr/$(get_libdir)/${flag/-/.}"
-			./configure php \
-				--module=${flag} \
-				--config=${php_slot}/bin/php-config \
-				--lib-path=${php_slot}/$(get_libdir) || die "Module configuration failed: ${flag}"
-		fi
-	done
-}
-
-src_install() {
-	default
-	diropts -m 0770
-	keepdir /var/lib/${PN}
-	newinitd "${FILESDIR}/${PN}.initd" ${PN}
-}
diff --git a/www-servers/nginx-unit/nginx-unit-1.22.0.ebuild b/www-servers/nginx-unit/nginx-unit-1.22.0.ebuild
index faa05dcce8d4..24026c7a572a 100644
--- a/www-servers/nginx-unit/nginx-unit-1.22.0.ebuild
+++ b/www-servers/nginx-unit/nginx-unit-1.22.0.ebuild
@@ -15,7 +15,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 MY_USE="perl python ruby"
 MY_USE_PHP="php7-2 php7-3 php7-4"
 IUSE="${MY_USE} ${MY_USE_PHP} ssl"
diff --git a/www-servers/nginx/Manifest b/www-servers/nginx/Manifest
index e7f224889f70..4e4c5d2372ec 100644
--- a/www-servers/nginx/Manifest
+++ b/www-servers/nginx/Manifest
@@ -11,13 +11,8 @@ AUX nginx.logrotate-r1 257 BLAKE2B d62c57377efd5259b6c776861d921b6e4ea026387157d
 AUX nginx.service-r1 356 BLAKE2B 05d89efcc73b70a26655f306f1e074e61c81063cb4e949161efbe95dc375e63807233f38c9af6723801e8f653cfad08f62fbec225b061d1179b7d05fe761afc4 SHA512 e51f4e88abe10555afe79d4d029651a4de42a5dc1dddaf951f13c021453da00e0c56a3fa2129d08fcd090909a54564e76887c93fdf72952021f5a2b09f6097eb
 DIST modsecurity-2.9.3.tar.gz 4307670 BLAKE2B 337ea15cc8805af7ab43aed8aecf4c72ccc586d0d7e9d9b91f036a61baa70d1ac8b4ad8045a2bb7a13515912a15fba7d3cdb9670ae6730de43b1e44ee90ded6d SHA512 4e1ea5dd8edadf8f630e4fe92a200d3a8e78963fce3128b5975a1e1ecd0e8bf9ceecd9905c95f8c508932ccd837f1d8ae8bb2ba423307718c3c6a4ae9b783ddd
 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-1.19.6.tar.gz 1055982 BLAKE2B 6d818122b3bdf46b6c9ecb83a00d470b3db0f26f05140340c033d1d0851d679d077ce1853f8d0a1c0140bfdac2764e5702913e87149dccefda2c6f7bf8ac8845 SHA512 1249c56b124a8de71f5d722e53d599f3b0cb14dc0f95b1eb905a6a8019b2d33f8e76874de2a88d49c4c82ee4fa7aabd42e5044a0a110892c23b50f71cb632148
-DIST nginx-1.19.7.tar.gz 1056631 BLAKE2B f7a62a2b7c1a8c91a01e54954323cddc7a948ab5b65f51594549b8b67e50ea954c4cd5b740f538472c6de7c4041b39b22a48beac37083900e6f0a015408316bc SHA512 660f03533581f350bbfe9a519fd0ee59c543c78be98aa5287df20a89653545b29fc98282548eab1741fb1d5c26da140166b6712ee06e498ba518019588f9b747
-DIST nginx-1.19.8.tar.gz 1060155 BLAKE2B c540cfb86886ad60beefcaffa7c9ad4f79807bdff3fed9f6c2f23d38d46aaba4f0489ada289f14881f206de290a37b58934254e9690a707ac639204602530218 SHA512 da548dc459f7a921e2f6ea54f543496244e820acbdf3effc4db331717f69b710181fbfdac3be101cd7d1c39e3ca37a94f9a9c4017f11da843ed85a34acf26bc2
+DIST nginx-1.19.10.tar.gz 1061062 BLAKE2B e6ba3023f34235ef3fc54cdaeda6ba357cab2f8bc3d639c218a87ba5ce3d5650d9f2356cc5fef5ce84db8977f5d46057d83c2730a9239b5759cbef665813872d SHA512 aa5b6e94d06e450358f105982a64b8498d1872c0e9b6f05b96b5a7057bdccc9b8078a781bc947e7a1c87737b20ec207de822e7992a25875a548a4b3ea3ae8eea
+DIST nginx-1.19.9.tar.gz 1060580 BLAKE2B 896f58de8051dcf76fc65b9e8263099e7d4c797832b5f9c354fe2440ff4a3155c0d9139a4022e4d828d17f11259be6853b264e22e43a986d249b5dc53a075d35 SHA512 a418aa22046f641afd95ee661c77c469d21c9957aa5ab74c4186526fcd18e0d701ee933a76ab143081b4b3f8815484074c2609aa257646218bf6b4b739b3cb88
 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
@@ -42,18 +37,8 @@ DIST ngx_metrics-0.1.1.tar.gz 2964 BLAKE2B 95d71ea26c949c345b83e353bd66a20df18cc
 DIST ngx_mogilefs_module-1.0.4.tar.gz 11208 BLAKE2B e0729b66554c8890727190a624d4c9aef6499dfc2e301541a9bfc15690caf6d3155c8a4b8f7a1555a7655b47aa0cd1b797aeb8ba82efa92ab80808218a0bdcff SHA512 b8cb7eaf6274f4e2247dbcb39db05072d2b2d4361256a325fafab5533d7ce0c4ae9e2905b954dfcfa4789c9cab5cccf2ac1c3a1f02f6a327ed95b562d7773ed1
 DIST ngx_rtmp-1.2.1.tar.gz 519919 BLAKE2B 744ccb8031eb9653f158f9eceba64fc9c8af7b9a42e64ef996ab3bbbe1402e5ffd3efcc8e4aaca437eb5e208e4b6f2d8643fcca953b32f32543eaa1ae4d9505c SHA512 4a0af5e9afa4deb0b53de8de7ddb2cfa6430d372e1ef9e421f01b509548bd134d427345442ac1ce667338cc2a1484dc2ab732e316e878ac7d3537dc527d5f922
 DIST njs-0.4.3.tar.gz 460997 BLAKE2B 373a4aca51ada84d628ae6b6254c9268b4cec4ac8870f81ba43ff693f20148a9ca862038e57a68c22cbff29ea613785e83778cc708cf1b47103e9f950a198289 SHA512 b3b4294817997a06661f00f53d38e0cde08e022f41b3663f9d17a91b343fb944e21184114f09d89995096faee491187c3ae424407f2855ed0670c0cccf928cd7
-DIST njs-0.4.4.tar.gz 486870 BLAKE2B 9390bfe35249ea34b9edd4b7c2360a25c9ecb232e10f35a2324fd8586f5f74e2083d5bd7481c084065d0651ba4fed56958bc2cd1f002d12622238ebc81b9f7c5 SHA512 1bf88d23f99532bb32e96de79e49cc27b60d6231207eb06ea2f6a6884d725f7bbe7b426664aa4c872f7c40549f81489c04c2ae4a7ddd2d03c8cf1d66b9c62c78
-DIST njs-0.5.0.tar.gz 505568 BLAKE2B 5dc2a91bffa4eb2364d96e26def0959b111cc8bf88841f581e3c0d43fcb88ba1ea24b24339cb1f51b8290c08dd930dc18a274a7ab6a21ee4ba8b0e6c4f5a1ba0 SHA512 182a64ba519b1a1d29ac71ffe2c9ef8e5a6f9aaf3db9f327ac926114db73b339a424801b558068fc7ae06ae88a4dea0a601c749db4b6f2b579e427181e41d11b
-DIST njs-0.5.1.tar.gz 516345 BLAKE2B b861ff1e62eddeb8aabf6908253dba1393a32a04636a082dee979a52d320a7ecb12f961213652886a210ee9569460a3214d823cb5f7c3b025378b7cf6d64659f SHA512 bbc06e57a152a5dc5c71305a4bec80d6d3d6f886a82d6c39d82aa8f52add56029b7f38199f11789648539bcbba2a488dc6e64874fef0222479775708559f4da9
-DIST njs-0.5.2.tar.gz 519331 BLAKE2B d2315ce563650a3985c1e40e3fcf17cdd69de5379f4213674db39bb2c7fb3f62df710e3bfccc0391e4bba2c19362f69d6574b4691e858c60af398c1131e3b79a SHA512 47ac82edd63059a38753371deafb5efe8e1c71f2533f1bf78e8ed56d6e7bfea801cb4a1213597bd73fc3e51263b394750efa29c5f1f3581c62f99c935fdfec99
-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-r1.ebuild 40431 BLAKE2B cf9bfea11e1845eb2c810c474dde72f275166bb55c48cb9658f71a512ede464b953dcc3f3fd9b0e0763190d856a4aa0585414f0bcf91cc5e29dde9e259dab9c7 SHA512 d92bacc4b3d5e97e7b85485507f8483f9f5166b43c4ed95c3e04a50b77aeaf10ce2a4609cf1d25357a88bb4516e5f05b020f37d666a81e1976a689e34ab8e794
-EBUILD nginx-1.19.5.ebuild 40431 BLAKE2B f78ec32446bf5017b58fda56370b72d1b2fc7176f2b4fcec70e4b22a00b124b96eb4d2d28182ecbf13ccd1c6ce43ee7324b36608ae13fdc1fd6d3ca947e0b52b SHA512 6445a587721d55fd09505970db538cbd2cdb9d72820526869a2d910a049b479f01ea968434eb7f2f1c4889f03fcf6921025530a686693a380f381017e40b34fb
-EBUILD nginx-1.19.6-r100.ebuild 40436 BLAKE2B 643795722ca90b1d70f6a0a4917c9166f06802ae13a8a93b10e1a4e3b7eb4410091aba0980365b4d82a8117e625b5fe9c4468e7806769c7717284abaf67ea68c SHA512 9317b221e52c5097062f413c01be6dc3661a55215acba1933601cb0df002abf642413074752a052bf2740110bd754a8f62aae90468e4b7bc0e7ec4409026ffab
-EBUILD nginx-1.19.6.ebuild 40431 BLAKE2B cf9bfea11e1845eb2c810c474dde72f275166bb55c48cb9658f71a512ede464b953dcc3f3fd9b0e0763190d856a4aa0585414f0bcf91cc5e29dde9e259dab9c7 SHA512 d92bacc4b3d5e97e7b85485507f8483f9f5166b43c4ed95c3e04a50b77aeaf10ce2a4609cf1d25357a88bb4516e5f05b020f37d666a81e1976a689e34ab8e794
-EBUILD nginx-1.19.7.ebuild 40436 BLAKE2B 9c8e3bcf2329c8a8ec88cbd1e3c2a801212195f4b004f23530da65c5893f94e7ec7cdc6e8713ffd4a84061d6b1a98e503c27b521595c2df629c72b4a35ea1acb SHA512 a2b8915f3e8359d21853152494ac033b9ec96c0d675a751f2f9906a71bcd550fea6f725633311b1cfe2262b2dce9bd523f0e59aa6f7f2daff4d14d1be0893c89
-EBUILD nginx-1.19.8.ebuild 40436 BLAKE2B 8d7c0d16ce37a2e0b69a963cbc074ff9583e2ac80fce6ce612e1d10e0c48f03933ed4600084d8d13524340247697e3c724024ce79d6c0ddf0775717d62c5e009 SHA512 2cec93a5f7a075fa3de7fdf3be679a86290a1e52d99eaa34845d1944ef2bab7dcd94b87ee741c56386d27ce58957b75a102b9e94fbdfa123fceb892996636dbb
+DIST njs-0.5.3.tar.gz 519938 BLAKE2B 1d06f8a20f6c37977e3b4b9afa0f136761a6998b85739a9853bb41d70ea6af42f49541035961fd0251eda2e10579f7bf983eaec2f9e19460138e53f44b9e6788 SHA512 b1d2e7498c37cc1df18e0f65866391637bf75d3d251fc7d7ad1ef5c76457697f49eaea088e1d157c94a6e779e9b8cc07b3f5aaac965666624506f517f6878c23
+EBUILD nginx-1.18.0-r2.ebuild 40484 BLAKE2B f0379273dc6fd4291346e5cf6554bb738edee778ae388985e5bd22b9695e099038822ea0b9de96cc1f3b973ab54ca18a0a1b2c21a234b6c8e8da664165b67614 SHA512 fc6a75bc744a3bb876b3eeaa1d275ec0efb6afde6e95fa29e7368d566b605392c1692e2110626a17cff319c5447a85918513d18d524a5a780c402f8cea0a43ee
+EBUILD nginx-1.19.10.ebuild 40442 BLAKE2B 69dc967f94b33dcf158da4408b369bb4fa3e6ad69594bafbc4729fb61bc873f571cec7ad628f00081ae22dde9be2133368978af5d822d2b1c9b00bde68dfe2a2 SHA512 082d25b415b6ca1bde49bf0009022b06b5a6144331e4d714fd08921da393501aef2396915aa1c832887ae42907b3590e25db6f4df1b667e4c393ec553bd0b259
+EBUILD nginx-1.19.9.ebuild 40442 BLAKE2B 69dc967f94b33dcf158da4408b369bb4fa3e6ad69594bafbc4729fb61bc873f571cec7ad628f00081ae22dde9be2133368978af5d822d2b1c9b00bde68dfe2a2 SHA512 082d25b415b6ca1bde49bf0009022b06b5a6144331e4d714fd08921da393501aef2396915aa1c832887ae42907b3590e25db6f4df1b667e4c393ec553bd0b259
 MISC metadata.xml 1193 BLAKE2B aeb293cf75ed650c946910222d6396f726dc5ed49f1213e6a5664613d78e3b27616399bc1c9f0a360f5303b16931da7016cdf540b24601afafc3ada4428b33a9 SHA512 a96002bc9845bc465542c753c738899b77ad7a32fac7f5f9a7049336868bc41199e926422e3dc23e47f34656c9aaea255511d2ef91e9d59f48c9cd0b4a3c4903
diff --git a/www-servers/nginx/nginx-1.18.0-r2.ebuild b/www-servers/nginx/nginx-1.18.0-r2.ebuild
index c4aa1254fc98..b8b349e004ff 100644
--- a/www-servers/nginx/nginx-1.18.0-r2.ebuild
+++ b/www-servers/nginx/nginx-1.18.0-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
@@ -680,8 +680,8 @@ src_configure() {
 		--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)" \
+		--with-cc-opt="-I${SYSROOT}${EPREFIX}/usr/include${WITHOUT_IPV6}" \
+		--with-ld-opt="-L${SYSROOT}${EPREFIX}/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 \
diff --git a/www-servers/nginx/nginx-1.19.6-r100.ebuild b/www-servers/nginx/nginx-1.19.10.ebuild
index 60f48de8f52d..11e748bc8c24 100644
--- a/www-servers/nginx/nginx-1.19.6-r100.ebuild
+++ b/www-servers/nginx/nginx-1.19.10.ebuild
@@ -157,7 +157,7 @@ GEOIP2_MODULE_URI="https://github.com/leev/ngx_http_geoip2_module/archive/${GEOI
 GEOIP2_MODULE_WD="${WORKDIR}/ngx_http_geoip2_module-${GEOIP2_MODULE_PV}"
 
 # njs-module (https://github.com/nginx/njs, as-is)
-NJS_MODULE_PV="0.5.0"
+NJS_MODULE_PV="0.5.3"
 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}"
@@ -683,8 +683,8 @@ src_configure() {
 		--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)" \
+		--with-cc-opt="-I${ESYSROOT}/usr/include${WITHOUT_IPV6}" \
+		--with-ld-opt="-L${ESYSROOT}/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 \
diff --git a/www-servers/nginx/nginx-1.19.2-r1.ebuild b/www-servers/nginx/nginx-1.19.2-r1.ebuild
deleted file mode 100644
index a23f3375b041..000000000000
--- a/www-servers/nginx/nginx-1.19.2-r1.ebuild
+++ /dev/null
@@ -1,1087 +0,0 @@
-# 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/eustas/ngx_brotli, BSD-2)
-HTTP_BROTLI_MODULE_PV="25f86f0bac1101b6512135eac5f93c49c63609e3"
-HTTP_BROTLI_MODULE_P="ngx_brotli-${HTTP_BROTLI_MODULE_PV}"
-HTTP_BROTLI_MODULE_URI="https://github.com/google/ngx_brotli/archive/${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.3"
-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 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.3.ebuild b/www-servers/nginx/nginx-1.19.3.ebuild
deleted file mode 100644
index 2f271e65ba7a..000000000000
--- a/www-servers/nginx/nginx-1.19.3.ebuild
+++ /dev/null
@@ -1,1087 +0,0 @@
-# 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.4.ebuild b/www-servers/nginx/nginx-1.19.4.ebuild
deleted file mode 100644
index 2f271e65ba7a..000000000000
--- a/www-servers/nginx/nginx-1.19.4.ebuild
+++ /dev/null
@@ -1,1087 +0,0 @@
-# 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-r1.ebuild b/www-servers/nginx/nginx-1.19.5-r1.ebuild
deleted file mode 100644
index 46d444142cc3..000000000000
--- a/www-servers/nginx/nginx-1.19.5-r1.ebuild
+++ /dev/null
@@ -1,1087 +0,0 @@
-# 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.5.0"
-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
deleted file mode 100644
index 2f271e65ba7a..000000000000
--- a/www-servers/nginx/nginx-1.19.5.ebuild
+++ /dev/null
@@ -1,1087 +0,0 @@
-# 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.6.ebuild b/www-servers/nginx/nginx-1.19.6.ebuild
deleted file mode 100644
index 46d444142cc3..000000000000
--- a/www-servers/nginx/nginx-1.19.6.ebuild
+++ /dev/null
@@ -1,1087 +0,0 @@
-# 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.5.0"
-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.8.ebuild b/www-servers/nginx/nginx-1.19.8.ebuild
deleted file mode 100644
index ef29be90f4d7..000000000000
--- a/www-servers/nginx/nginx-1.19.8.ebuild
+++ /dev/null
@@ -1,1090 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# 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}"
-LUA_COMPAT=( luajit )
-
-# 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.5.2"
-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 lua-single ssl-cert toolchain-funcs perl-module flag-o-matic user systemd 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 +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? ( ${LUA_DEPS} )
-	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}
-	arm? ( dev-libs/libatomic_ops )
-	libatomic? ( dev-libs/libatomic_ops )"
-BDEPEND="nginx_modules_http_brotli? ( virtual/pkgconfig )
-	nginx_modules_http_security? ( ${AUTOTOOLS_DEPEND} )"
-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? (
-		${LUA_REQUIRED_USE}
-		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
-
-	use nginx_modules_http_lua && lua-single_pkg_setup
-}
-
-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 nginx_modules_http_lua; then
-			sed -i \
-				-e "s|^\(LUA_PKGNAMES\)=.*|\1=\"${ELUA}\"|" \
-				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=$(dirname $(lua_get_shared_lib))
-		export LUAJIT_INC=$(lua_get_include_dir)
-		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 lua_single_target_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=$(ver_cut 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 ver_test ${_replacing_version} -ge 1.4.1-r2; 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 ver_test ${_replacing_version_branch} -lt 1.10; 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}" ]] || ver_test ${_replacing_version} -ge ${_fixed_in_pvr}; 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 ver_test ${_replacing_version_branch} -lt 1.10; 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}" ]] || ver_test ${_replacing_version} -ge ${_fixed_in_pvr}; 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.7.ebuild b/www-servers/nginx/nginx-1.19.9.ebuild
index 9b3d0583c9e4..11e748bc8c24 100644
--- a/www-servers/nginx/nginx-1.19.7.ebuild
+++ b/www-servers/nginx/nginx-1.19.9.ebuild
@@ -157,7 +157,7 @@ GEOIP2_MODULE_URI="https://github.com/leev/ngx_http_geoip2_module/archive/${GEOI
 GEOIP2_MODULE_WD="${WORKDIR}/ngx_http_geoip2_module-${GEOIP2_MODULE_PV}"
 
 # njs-module (https://github.com/nginx/njs, as-is)
-NJS_MODULE_PV="0.5.1"
+NJS_MODULE_PV="0.5.3"
 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}"
@@ -683,8 +683,8 @@ src_configure() {
 		--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)" \
+		--with-cc-opt="-I${ESYSROOT}/usr/include${WITHOUT_IPV6}" \
+		--with-ld-opt="-L${ESYSROOT}/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 \
diff --git a/www-servers/ocsigenserver/Manifest b/www-servers/ocsigenserver/Manifest
deleted file mode 100644
index cb7c5cfeef44..000000000000
--- a/www-servers/ocsigenserver/Manifest
+++ /dev/null
@@ -1,7 +0,0 @@
-AUX lwt3.patch 2699 BLAKE2B d4f1062d6a31da61d54b6fe5de7e92ac19551a904d4acf6dcbde6f4e40b3b7502c0f374ababf91fdc5d5a2ee6c76a8a4f469f9bd80c022a679d9e49922ad32fe SHA512 cd628dd3ec62a23d8f57eb49e20f748725ca7a120e8ebecdbfda024235dc5a003c2c01d21f61061e717f1642038c8d02be4af2b1da1c29da56ce62e4a18a80ab
-AUX ocsigenserver.confd 491 BLAKE2B eb425c948e00676e33405d34d5192dfc1f0a0d6510084eed92a286e58bb23c8e571007bf0b5e1b7dfa968c7f79efc4ec68700a00beeed44d8316f4ea9d224e63 SHA512 c48a502565eb0dbba52508227cfd45d1aa6cb4db04a7ad16af714eb7d7ddec7699a3bbb5b8c188a34d159c4c98c9961f862abf34cd0576341c4d2069c3b371ec
-AUX ocsigenserver.initd 1108 BLAKE2B 79199aa0799649bd786a03a54ed033ba2b09bdb75ab548eab2c7cc3e007aa65dad68dffd0a186223e4f87093d65e72036acc99b5f6efd098936ea1f17c48def2 SHA512 087fc49090e39c5b3f554119edbf785bfa12fe3d1b95561fa4a1e08da28bc16efba0d1b0d6ead5b39bf39390f678f63ccd2d637b53ad74a2a7b12e6c3b2c73c4
-DIST ocsigenserver-2.8.tar.gz 1265240 BLAKE2B bc1b7da3579d8853f4c259a8a4d4924e08c5552a68a5b40ce00400147efade8c91d01083f117fe0a78cfb8eb44ce3b9e98b34ee2390bd4171d6606b62999ec29 SHA512 80d5125a93239c73756b03a0f50d83e691810f93a15525daef2f7ccd69279e348f03486c26319a9511c1a746f375317082a89ba37ce0ba22872d6db7d3fddf1b
-EBUILD ocsigenserver-2.8.ebuild 2249 BLAKE2B 687991ab982052ab72d4edf808ba136da9d66a501541b44f431b4d61361345fc94e211db4240afc79c387f4d1b69fbb963586e62e3110d980615bd7598fde742 SHA512 ed55490b311b1618e991ba78a16f1753255e65b7f30e6af255d08cde891e124ff2d8ac940a1fb42ddeed1ee616a2e04b3e8ad2367cbf836adaf7f1b20d07cde0
-EBUILD ocsigenserver-9999.ebuild 2249 BLAKE2B 687991ab982052ab72d4edf808ba136da9d66a501541b44f431b4d61361345fc94e211db4240afc79c387f4d1b69fbb963586e62e3110d980615bd7598fde742 SHA512 ed55490b311b1618e991ba78a16f1753255e65b7f30e6af255d08cde891e124ff2d8ac940a1fb42ddeed1ee616a2e04b3e8ad2367cbf836adaf7f1b20d07cde0
-MISC metadata.xml 253 BLAKE2B c3578c0dea5e976e1b66de4f6c8347b5a49256e3aee11b491bf2046e9706aae9ded2180a78a2a3cd6e6d4884708f39834e4d3aad9b8b46cea1312cec79b62608 SHA512 96b6f201b05cfb92365b1eb21a0e037acb0ac1d186462395cde751309bf1ec9c43079fc1389cc47c0e03c5fd0d2aeda3eb25165d85452c65f4b54d85f5515a73
diff --git a/www-servers/ocsigenserver/files/lwt3.patch b/www-servers/ocsigenserver/files/lwt3.patch
deleted file mode 100644
index 3fb6b9d8e7a6..000000000000
--- a/www-servers/ocsigenserver/files/lwt3.patch
+++ /dev/null
@@ -1,78 +0,0 @@
-Index: ocsigenserver-2.8/Makefile.options
-===================================================================
---- ocsigenserver-2.8.orig/Makefile.options
-+++ ocsigenserver-2.8/Makefile.options
-@@ -30,7 +30,7 @@ endif
- 
- BASE_PACKAGE := lwt ipaddr bytes
- 
--SERVER_PACKAGE := lwt.ssl           \
-+SERVER_PACKAGE := lwt_ssl           \
- 		  bytes			\
- 	          ${LWT_PREEMPTIVE_PACKAGE} \
-                   ipaddr            \
-Index: ocsigenserver-2.8/configure
-===================================================================
---- ocsigenserver-2.8.orig/configure
-+++ ocsigenserver-2.8/configure
-@@ -410,8 +410,8 @@ check_library ssl "See: http://sourcefor
- 
- check_library lwt "See: http://ocsigen.org/lwt"
- check_library lwt.unix  "Missing support for 'unix' in lwt."
--check_library lwt.react "Missing support for 'react' in lwt."
--check_library lwt.ssl   "Missing support for 'ssl' in lwt."
-+check_library lwt_react "Missing support for 'react' in lwt."
-+check_library lwt_ssl   "Missing support for 'ssl' in lwt."
- check_library lwt.preemptive "Missing support for 'preemptive' in lwt."
- 
- check_library netstring \
-Index: ocsigenserver-2.8/src/extensions/Makefile
-===================================================================
---- ocsigenserver-2.8.orig/src/extensions/Makefile
-+++ ocsigenserver-2.8/src/extensions/Makefile
-@@ -4,8 +4,8 @@ PACKAGE  :=		\
- 	bytes		\
- 	lwt.unix	\
- 	ipaddr		\
--	lwt.ssl		\
--	lwt.react	\
-+	lwt_ssl		\
-+	lwt_react	\
- 	netstring	\
- 	netstring-pcre	\
- 	tyxml.parser
-Index: ocsigenserver-2.8/src/files/META.in
-===================================================================
---- ocsigenserver-2.8.orig/src/files/META.in
-+++ ocsigenserver-2.8/src/files/META.in
-@@ -37,7 +37,7 @@ package "baselib" (
- )
- 
- package "http" (
--  requires = "%%NAME%%.baselib,lwt.ssl,tyxml"
-+  requires = "%%NAME%%.baselib,lwt_ssl,tyxml"
-   version = "[distributed with Ocsigen server]"
-   description = "HTTP library for Ocsigen server"
-   archive(byte) = "http.cma"
-@@ -188,7 +188,7 @@ package "ext" (
- 
-   package "comet" (
-     exists_if = "ocsigen_comet.cmo,ocsigen_comet.cmx"
--    requires = "ocsigenserver,lwt.react"
-+    requires = "ocsigenserver,lwt_react"
-     version = "[distributed with Ocsigen server]"
-     description = "Comet server-to-client communication"
-     archive(byte) = "ocsigen_comet.cmo"
-Index: ocsigenserver-2.8/src/http/Makefile
-===================================================================
---- ocsigenserver-2.8.orig/src/http/Makefile
-+++ ocsigenserver-2.8/src/http/Makefile
-@@ -3,7 +3,7 @@ PACKAGE  := \
- 	bytes \
- 	netstring \
- 	netstring-pcre \
--	lwt.ssl \
-+	lwt_ssl \
- 	tyxml
- 
- LIBS     := -I ../baselib ${addprefix -package ,${PACKAGE}}
diff --git a/www-servers/ocsigenserver/files/ocsigenserver.confd b/www-servers/ocsigenserver/files/ocsigenserver.confd
deleted file mode 100644
index 70638b7c8709..000000000000
--- a/www-servers/ocsigenserver/files/ocsigenserver.confd
+++ /dev/null
@@ -1,25 +0,0 @@
-# /etc/conf.d/ocsigenserver : config file for /etc/init.d/ocsigenserver
-
-# Path for the ocsigen binary (add opt for native executable)
-
-#DAEMON=/usr/bin/ocsigenserver.opt
-DAEMON=/usr/bin/ocsigenserver
-
-# Name for ocsigen daemon
-
-NAME=ocsigenserver
-
-# Locstion of Ocsigen config file
-
-CONF=/etc/$NAME/ocsigenserver.conf
-
-# PID file location
-
-PIDFILE=/var/run/$NAME.pid
-
-# Add here any additional aptions for ocsigen
-
-OCSIGEN_OPTS=""
-
-# Command pipe
-COMMANDPIPE=/var/run/ocsigenserver_command
diff --git a/www-servers/ocsigenserver/files/ocsigenserver.initd b/www-servers/ocsigenserver/files/ocsigenserver.initd
deleted file mode 100644
index 57d3343159f5..000000000000
--- a/www-servers/ocsigenserver/files/ocsigenserver.initd
+++ /dev/null
@@ -1,59 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-extra_commands="depend checkconfig reload"
-
-depend() {
-	need net
-	use logger
-	after bootmist
-}
-
-
-checkconfig() {
-	if [ ! -f "$DAEMON" ] ; then
-		ewarn "Unable to find $DAEMON"
-		return 1
-	fi
-	if [ ! -f "$CONF" ] ; then
-		ewarn $CONF " does not exist."
-		return 1
-	fi
-}
-
-start() {
-	checkconfig || return 1
-
-	ebegin "Creating command pipe (${COMMANDPIPE})"
-	mkfifo -m 660 "${COMMANDPIPE}"
-	chown ocsigenserver:ocsigenserver "${COMMANDPIPE}"
-	eend $?
-
-	ebegin "Starting ocsigen"
-	start-stop-daemon --start --exec $DAEMON -- \
-			--pidfile $PIDFILE \
-			--daemon \
-			$OCSIGEN_OPTS
-	eend $?
-}
-
-stop() {
-	ebegin "Stopping ocsigen"
-	start-stop-daemon --stop --pidfile $PIDFILE
-	eend $?
-	ebegin "Removing command pipe (${COMMANDPIPE})"
-	rm -f "${COMMANDPIPE}"
-	eend $?
-}
-
-reload() {
-	if [ ! -f "$PIDFILE" ] ; then
-		ewarn "$PIDFILE not found!!"
-		ewarn "Ocsigen is not running. Not reloading."
-		return 1
-	fi
-	ebegin "Reloading ocsigen"
-	echo reload > /var/run/ocsigen_command
-	eend $?
-}
diff --git a/www-servers/ocsigenserver/ocsigenserver-2.8.ebuild b/www-servers/ocsigenserver/ocsigenserver-2.8.ebuild
deleted file mode 100644
index 7a0c0069f540..000000000000
--- a/www-servers/ocsigenserver/ocsigenserver-2.8.ebuild
+++ /dev/null
@@ -1,99 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils multilib findlib user
-
-if [ "${PV#9999}" != "${PV}" ] ; then
-	inherit git-r3
-	SRC_URI=""
-	EGIT_REPO_URI="https://github.com/ocsigen/ocsigenserver"
-else
-	SRC_URI="https://github.com/ocsigen/ocsigenserver/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64"
-fi
-
-DESCRIPTION="Ocaml-powered webserver and framework for dynamic web programming"
-HOMEPAGE="http://www.ocsigen.org"
-
-LICENSE="LGPL-2.1-with-linking-exception"
-SLOT="0/${PV}"
-IUSE="debug doc dbm +ocamlopt +sqlite zlib postgres"
-REQUIRED_USE="|| ( sqlite dbm postgres )"
-RESTRICT="strip installsources"
-
-DEPEND=">=dev-ml/lwt-2.5.0:=[camlp4(+)]
-		dev-ml/lwt_react:=
-		dev-ml/lwt_ssl:=
-		>=dev-ml/react-0.9.3:=
-		zlib? ( >=dev-ml/camlzip-1.03-r1:= )
-		dev-ml/cryptokit:=
-		>=dev-ml/ocamlnet-3.6:=[pcre]
-		>=dev-ml/pcre-ocaml-6.2.5:=
-		>=dev-ml/tyxml-4:=[camlp4(+)]
-		>=dev-lang/ocaml-3.12:=[ocamlopt?]
-		dev-ml/ocaml-ipaddr:=
-		postgres? ( dev-ml/pgocaml:=[camlp4(+)] )
-		dbm? ( dev-ml/camldbm:= )
-		sqlite? ( dev-ml/ocaml-sqlite3:= )"
-RDEPEND="${DEPEND}"
-
-pkg_setup() {
-	enewgroup ocsigenserver
-	enewuser ocsigenserver -1 -1 /var/www ocsigenserver
-}
-
-src_prepare() {
-	epatch "${FILESDIR}/lwt3.patch"
-}
-
-src_configure() {
-	sh configure \
-		--prefix /usr \
-		--temproot "${ED}" \
-		--bindir /usr/bin \
-		--docdir /usr/share/doc/${PF} \
-		--mandir /usr/share/man/man1 \
-		--libdir /usr/$(get_libdir)/ocaml \
-		$(use_enable debug) \
-		$(use_with zlib camlzip) \
-		$(use_with sqlite) \
-		$(use_with dbm) \
-		$(use_with postgres pgsql) \
-		--with-preempt \
-		--ocsigen-group ocsigenserver \
-		--ocsigen-user ocsigenserver  \
-		--name ocsigenserver \
-		|| die "Error : configure failed!"
-}
-
-src_compile() {
-	if use ocamlopt; then
-		emake
-	else
-		emake byte
-	fi
-	use doc && emake doc
-}
-
-src_install() {
-	findlib_src_preinst
-	if use ocamlopt; then
-		emake install
-	else
-		emake install.byte
-	fi
-	if use doc ; then
-		emake install.doc
-	fi
-	emake logrotate
-
-	newinitd "${FILESDIR}"/ocsigenserver.initd ocsigenserver
-	newconfd "${FILESDIR}"/ocsigenserver.confd ocsigenserver
-
-	dodoc README.md
-
-	# We create it at runtime
-	rm -f "${ED}/var/run/ocsigenserver_command" || die
-}
diff --git a/www-servers/ocsigenserver/ocsigenserver-9999.ebuild b/www-servers/ocsigenserver/ocsigenserver-9999.ebuild
deleted file mode 100644
index 7a0c0069f540..000000000000
--- a/www-servers/ocsigenserver/ocsigenserver-9999.ebuild
+++ /dev/null
@@ -1,99 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils multilib findlib user
-
-if [ "${PV#9999}" != "${PV}" ] ; then
-	inherit git-r3
-	SRC_URI=""
-	EGIT_REPO_URI="https://github.com/ocsigen/ocsigenserver"
-else
-	SRC_URI="https://github.com/ocsigen/ocsigenserver/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64"
-fi
-
-DESCRIPTION="Ocaml-powered webserver and framework for dynamic web programming"
-HOMEPAGE="http://www.ocsigen.org"
-
-LICENSE="LGPL-2.1-with-linking-exception"
-SLOT="0/${PV}"
-IUSE="debug doc dbm +ocamlopt +sqlite zlib postgres"
-REQUIRED_USE="|| ( sqlite dbm postgres )"
-RESTRICT="strip installsources"
-
-DEPEND=">=dev-ml/lwt-2.5.0:=[camlp4(+)]
-		dev-ml/lwt_react:=
-		dev-ml/lwt_ssl:=
-		>=dev-ml/react-0.9.3:=
-		zlib? ( >=dev-ml/camlzip-1.03-r1:= )
-		dev-ml/cryptokit:=
-		>=dev-ml/ocamlnet-3.6:=[pcre]
-		>=dev-ml/pcre-ocaml-6.2.5:=
-		>=dev-ml/tyxml-4:=[camlp4(+)]
-		>=dev-lang/ocaml-3.12:=[ocamlopt?]
-		dev-ml/ocaml-ipaddr:=
-		postgres? ( dev-ml/pgocaml:=[camlp4(+)] )
-		dbm? ( dev-ml/camldbm:= )
-		sqlite? ( dev-ml/ocaml-sqlite3:= )"
-RDEPEND="${DEPEND}"
-
-pkg_setup() {
-	enewgroup ocsigenserver
-	enewuser ocsigenserver -1 -1 /var/www ocsigenserver
-}
-
-src_prepare() {
-	epatch "${FILESDIR}/lwt3.patch"
-}
-
-src_configure() {
-	sh configure \
-		--prefix /usr \
-		--temproot "${ED}" \
-		--bindir /usr/bin \
-		--docdir /usr/share/doc/${PF} \
-		--mandir /usr/share/man/man1 \
-		--libdir /usr/$(get_libdir)/ocaml \
-		$(use_enable debug) \
-		$(use_with zlib camlzip) \
-		$(use_with sqlite) \
-		$(use_with dbm) \
-		$(use_with postgres pgsql) \
-		--with-preempt \
-		--ocsigen-group ocsigenserver \
-		--ocsigen-user ocsigenserver  \
-		--name ocsigenserver \
-		|| die "Error : configure failed!"
-}
-
-src_compile() {
-	if use ocamlopt; then
-		emake
-	else
-		emake byte
-	fi
-	use doc && emake doc
-}
-
-src_install() {
-	findlib_src_preinst
-	if use ocamlopt; then
-		emake install
-	else
-		emake install.byte
-	fi
-	if use doc ; then
-		emake install.doc
-	fi
-	emake logrotate
-
-	newinitd "${FILESDIR}"/ocsigenserver.initd ocsigenserver
-	newconfd "${FILESDIR}"/ocsigenserver.confd ocsigenserver
-
-	dodoc README.md
-
-	# We create it at runtime
-	rm -f "${ED}/var/run/ocsigenserver_command" || die
-}
diff --git a/www-servers/resin/Manifest b/www-servers/resin/Manifest
index 56ab6d2d183f..ddd902926d94 100644
--- a/www-servers/resin/Manifest
+++ b/www-servers/resin/Manifest
@@ -2,5 +2,5 @@ AUX resin-4.0.48-build.xml.patch 2186 BLAKE2B 1864f7896312c7b2952f5aac8d73924b90
 AUX resin-4.0.48.conf 542 BLAKE2B 96cc8e582b5e5af4b72d29652fa690928bedf51f8ee74d7acfd16244690eb9f346cb616e20e8711f9b85b77ee1145e74d0dca04d026e04808ded22345c7b6b67 SHA512 61b34c022712f31d3cadcf8e78095900085c8cde5ba5b8cc46d603019f461ae3271fc41a9f6b63d89aeb675de9fb72b27123fc6c6774eaee5349d37cc2c9693f
 AUX resin-4.0.48.init 791 BLAKE2B dd8f14fdbdb5e7be3b8511d33db86781c4595a2f925be613d31036588c2444acfe149a1e215a9d26978fa612ef223c325d6f1bdefc19722c429bdbccdb663b11 SHA512 9fa5db204bf4a3a6e040493dda96adcf86e9fff271b6a98951b03c15f00a18a62c9469d48e155bf7847229e005f8c570fd10737bb120271122a2d746ea22e13a
 DIST resin-4.0.48-src.zip 40883010 BLAKE2B 33588d8ccb5692efd70ede4e25949aa71b61640c090379b36ec5160c16d90da465853c56015304435f15298a358c8a3ee9ad54b423ae0547c1a7f43ac4e4bb40 SHA512 a992ebbff8af9f10e825a259e831dc340f9d74c5a117033a7eda2eb59a453d9e7d0e5e6feaf7bb36526ac65c8a7e1f55f737bb68af3e7e9647381ada995542ee
-EBUILD resin-4.0.48-r1.ebuild 4258 BLAKE2B f1ec2a03504713d5b689089b69525ab7e565a955e978b2e92895b530d611bcaaf5a92541964c4cbe22115f33cecb0d84d3693ff04e8a0c535c91e67257d4ccf7 SHA512 b7586f597577b44517ed1c870bb1aeb59e934edabc3308aaa6ddf4dbf77def619ce1dccd185e8f89381ff6a41f3fcecc808a858306e652cf25bb0592d94cbd29
+EBUILD resin-4.0.48-r1.ebuild 4255 BLAKE2B 3a07b03177c0eb689a017164a07615b1e13ce18ab57d30129aedbe55b11bf27330ee28abfccadf3fa6ee1376d8fe0f6d943705d851624d835dd50e40c8a2b222 SHA512 1d00de7cde95edeb7a16ef02d16a4fb9099bc7b9d72a225c7c5bfdb03f1338e6e334f0a88c278fedfd9c65b6ea477595ef6bf660ec079838ec4992d0df9a5c32
 MISC metadata.xml 305 BLAKE2B cd9ab46596ac556fb225d0d9d087c89a8f46a185aa3ed9524d6258d04b8690373efc1a587b28da5bb0485edbaa18e5f7db1b6dcc84656df09a01b7401027c48c SHA512 2f36d477675c49a8b3475b49891dd9eb45c02cbc5d83a3f60c3ba3b35252a3bdc34214dbdf2c3fb8da37138fec49281f95c3c70055fdf47a8cace006a46137e9
diff --git a/www-servers/resin/resin-4.0.48-r1.ebuild b/www-servers/resin/resin-4.0.48-r1.ebuild
index f6273d76edc8..a0c767c66282 100644
--- a/www-servers/resin/resin-4.0.48-r1.ebuild
+++ b/www-servers/resin/resin-4.0.48-r1.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
 
 JAVA_PKG_IUSE="source"
 
-inherit java-pkg-2 java-ant-2 eutils flag-o-matic multilib user
+inherit java-pkg-2 java-ant-2 epatch flag-o-matic multilib user
 
 DESCRIPTION="A fast Servlet and JSP engine"
 HOMEPAGE="http://www.caucho.com"
diff --git a/www-servers/tomcat/Manifest b/www-servers/tomcat/Manifest
index a1962d27ccdb..98f3aa1243cf 100644
--- a/www-servers/tomcat/Manifest
+++ b/www-servers/tomcat/Manifest
@@ -2,28 +2,31 @@ AUX tomcat-10.0.2-build.xml.patch 11108 BLAKE2B 9c8db2ed4008def42bcfdcfd99fbaf01
 AUX tomcat-10.0.4-build.xml.patch 11459 BLAKE2B 841a96b09280a8790cf5bff7718219027abf793d3bf2f93c72086ca709102775995d06a4eeadcfab297742f6c0e74ac74736407606074cf6106b5948a8359ace SHA512 54e0c3ad71afa28b14c1644438daa0df0d2e6b95b55fd83d8776b30bb6ed3f8735bc18d5a8d9da6c56323c297245a34c441e126e7d1e1d2deeb331c8c382ba30
 AUX tomcat-7.0.99-build.xml.patch 5913 BLAKE2B 21316c4ce76bd3e87c2749354cbd455c1322431649b276b59a93f10b97f59d03690f3531c2fd3a8ce67b81969544d498bf04e829407005dbed867067f8970347 SHA512 f8d0cb4ba0effdeea3db4049381efc84513551a1e28551b59a254340a8add306824d1dba344f6eaddc93e8b61fc0b71e1a8d0bcfc860500134cc19072deef30e
 AUX tomcat-8.5.57-build.xml.patch 10554 BLAKE2B 40df509d8f5e3022a9d384d8d939800062ec383ea000f1224dfd5816a76af12dbde7d36826659707ae7e2a2bf0c19c1e8bc96bec5854bcd2422910530a0530fd SHA512 c1e3b73e2aece5e849219c663a01a31bd2f6355d37b51e18b68d42a05be2a49d173520450ac1aeef7b394fe860135afda225d450b4e98d912fe90231c9d70601
+AUX tomcat-8.5.65-build.xml.patch 10854 BLAKE2B 9576793618aac5bd3653ed6f873aa13578b6da6cf865213041a00f90b4b9fb5208eda32b7733d5d5bc2b90b6517c8f927802ffdab10c0090387318a156ea3fd4 SHA512 6bb7a0ada97e8fd68950c6edf819a35dbeda2dc6e63775b63e33b84d795402afb64741b2db4d17b7fba21bfa513065401028fa7862044facf88a23a0b32380d2
 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-9.0.43-insufficient-ecj.patch 2304 BLAKE2B b25d68db5020f7ec118c1fc03e12049da99f84fbebc2fa636c896d5647cf8cdc6e136a27f611f0de975e9c2243b516144be7853a8aab05496fc32112d31478b3 SHA512 60fee887ba9e83f92dd87d75a7c0fad05b5a7458ddb94c9e718aecffd9b968beaf7ce8c2b7e9bb31b9286d5cd77f89afd3775c0ccbc1fff58bfa2b70066d06b6
+AUX tomcat-9.0.45-build.xml.patch 11406 BLAKE2B 1a4f204a6c9625c5942795cddcf71147fb962354572496733cb96d3230d867ef2f711cb95cd68f6351586e1fec4b8784473f44b0ad3e9833018345183049a48c SHA512 80cc5ae7dc2f53aaf48e3d81ad7d1f3b7756b22597c14659b4650d664e1ad9dcefdc5d3cc5576bbdf7433992a541fc9a19cadb6c84b5e5566277ba6284f95967
 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-10.0.2-src.tar.gz 5954905 BLAKE2B fa7ca630b287c96538955848ab0ef109beb22a381e884eae96fa5246c134164b543003669c65d716f453ffa7a0e72f119354d1f023b529a948befb11c5e375a1 SHA512 402e942b9a1006535fd0e1416a4606d880ca1af473d7c394d54aa3dff60ecfe80823a0bb14f354049e008fdf29ea67a1490d0828fbc50eaf39ea159ef36cbc53
 DIST apache-tomcat-10.0.4-src.tar.gz 5964416 BLAKE2B 23332b90316cedd1916b59b1b31b1c16e34c193ba61660c7c8e41e3b983a35873660eaf8e3f0777704d5663f0ede2dc39b81997a73ee726ff73d6c6392582163 SHA512 677b978afd51fe1756b486c9d5576b9fa03b5b775c462263237aef6d17f36d7e718cfb5e46a49da942b1bf6681b166a4af781138f55d89a019bf12b48eb22882
+DIST apache-tomcat-10.0.5-src.tar.gz 5976090 BLAKE2B 5441bec39ddaa74a7a4b39e48ecb524f6edb230760272678e6bf8d0a26b4a39e9a6c276b591d5d7962d8cae7d211486d65a334f363931d7cd8750a902c8aaf98 SHA512 177e497b2355b260fc59cfcfb8b1fc2fabf5fe5a0f5705b5feee2c330881545aad359a746074c9fb180acb54035d0c2f25b23daac84202788178a256e48f0c9f
 DIST apache-tomcat-7.0.108-src.tar.gz 5313375 BLAKE2B 200a1ccbc39a572ca7e4f7805bf3d27e0bd645156d8886b0fcbee5e64279a4d2f4e2ad847d67a70e1c65a8d88fa5bd4757a0066ceff367fe92914e22cc809aa5 SHA512 bdd957ca5b3b7dd152efa6406dbb6397ed62661ec44c83b6a8f6e9e3c33362c51ff5e0451a57d6aa3874cd745811f2afe78d08825ddaba8e29cb38ef922c48e2
-DIST apache-tomcat-8.5.63-src.tar.gz 5853051 BLAKE2B d007d9922d54578bdebcbbaec3e7c0ffcafdce913e52fdd93d5c174c9d1304980b5eb7f126e957c5975a59dfb126857dcc87ef3ca5e479e44cd7910b6183e469 SHA512 d78a140117844675239e834a0890641c0ef0d6fc3c89eb4512536fece2c128f088edfdea15f79ba7a31e0478431f155230f8f60a57bfea0aed191298a95310c4
+DIST apache-tomcat-7.0.109-src.tar.gz 5314401 BLAKE2B 56583caea6879bf8ca5cc02a886de3d7af413032f88d367653e709dc1c8f590e78620c788317bbff4b6e65dd3e242cc26863164ac8e7c87334a22636f3ed0703 SHA512 ecf9c0bee0e3e1aa24f299fe633705c5a2f6aa264d9e4968cfc96aa5d0a425c2b0ff07765a8b6c67221766733bdfaed6e6c6377a8d0870d889e7063ce90a46ce
 DIST apache-tomcat-8.5.64-src.tar.gz 5863485 BLAKE2B c297c0803c74a969e96b99c379bcd050d6e08cb1036d69b5c49c64311d6f17695754631738130a76def849da6c2de70a49d4452b24ee34c5720d9474f8d4d41b SHA512 ffcc8e97b56730e7e15daa8c4ce628547afcf0bb008bb8d8142ae684c963ed6a366c1dfdbaaca9080201c3c1bcda60c759b76447dd72493f0ec922a034b75f08
-DIST apache-tomcat-9.0.43-src.tar.gz 6042010 BLAKE2B 78c0e7d711dd826ba93b12db6a96929ddeeb0df189a12e907c51f02baa08d84757915b8744b5ebd027892ff2823b955d7b1c3c749ab54b588686dfd8d3157640 SHA512 8c23f8a371b3ffbc1ab4d5f24be08ecf2c9e6ba466ef36ef97e075bd0f12b1ffc93f63b9ff1def9953b3f791319c7c355a76e7a54061a21d25be37a5dc22da26
+DIST apache-tomcat-8.5.65-src.tar.gz 5874743 BLAKE2B 8a605b0fe5026315aa0a5463d42c01eac164c91737cc81f8df4e174075783a829ddd30a8fc9f5129cf1f83a98d85fa33cb7ec9223f365de0ad91ecffb319d187 SHA512 df6ea4e8e04fe1f787ef105cb3e453516ad25d32ad3d559c86997b44492c9a1e93e8c22c88ba2203dcfefc14404f7d1bb28a9e2e20d44ba85adf8c374a4456fa
 DIST apache-tomcat-9.0.44-src.tar.gz 6047722 BLAKE2B fda3081d66c9018a49e5a07bfb5d54b133fe51dff69b692480065d8d9a4877ce5b5b152e33f6d4cfaf28940ec6b556c9a2455c8fda56ea0552e4d1f83f0f9cbe SHA512 68f6a6edecc0469e21cf062cd4b5aacd2df4903fe98aea052acfc9f725268490d5a6917ac1565f26e15a513afa09814014aed267dc1b5aa92733a51ef52b305f
+DIST apache-tomcat-9.0.45-src.tar.gz 6055044 BLAKE2B 66ca4ee2c0a3bbd1f73d7257c55105e28d1619c8e533f945438cdb283cb8ccdceada163698641b034b5e43b513fcdd16e331c4c11ea300501276a5247f8ef682 SHA512 e3edfd6ab9e3ddf6a15f63a4e11f5237e03d7cacdec11805f4a901bd325c0edeca1ee0b62bee92d53e521af0a9d5a7b10ce12a8262a57fd7faa69d93ca1c066e
 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-10.0.2.ebuild 5902 BLAKE2B 45d8f8191815f6e668bf9c2d927d2490c3ab486455144364e188eb97196990f85b176394a95020dd7eb6dfc4828278ac9f282e9615080dbd49bff946d7c11845 SHA512 a756ac610ca78012ae828b5843b447753196eaba9e8f7a54726e2a78758d16989d6a1c5e84df71d2e35ad9d722b67ebc1da0abf256de31483facb98ed13a8465
-EBUILD tomcat-10.0.4.ebuild 5910 BLAKE2B 87e7a8d438deaaf68bd4d9bca40c5a44759de65f0cde4bd654a5a4b0e38377f488a52f2e49de687b5eecb1bf5a0cca1b95b941acbaeee17e67eb9f8667aadbcf SHA512 e2cccc425569fdc3218b1c96c89dad7f17f8e466482454e5666fef587750d463a972a70e4783edc59dd805f26983f4a8523b1d5fb8cb11cba7c120ca14fe76fb
-EBUILD tomcat-7.0.108.ebuild 4154 BLAKE2B 5505bb322a19193fc8974c76b6a5269200f14b5f09768b7e6d12b0c0457ffd26eaee75760c50c46b6f2c5b274ce173f1cd0d07b5ed3cca33d96b94eda46fb3d5 SHA512 9d523450f693c6293e62f4eacf999b662cd0e88bc1de08efab85ff676ad2aa7ff80fb7633ac48225299f5842683ee44a33ddd3b932f92214c37ffd4035e985fa
-EBUILD tomcat-8.5.63.ebuild 4734 BLAKE2B b790306d322cf975ada21309e946c6b95225e2f20d768f851f3954bee11a71a817b6a54ac43bfd4830fc4d5cdbdef54c07241ed90d52ea54c5b46d0d16d65295 SHA512 1e1fae7207883a473d6f37d0f80ee3bc108a295c95d93d136e3179cedf893c9709c488a43c649fef74c757b1c064589c677c5bbbc56b201c8ca71a12feeb869c
-EBUILD tomcat-8.5.64.ebuild 4735 BLAKE2B 6539f7954d5855fecd19875b513a511379efd91543d067e1b1c1404601fe9be81e72f51655c4cba9312c4a7d9b0d0a367bcf4fcb9fa8784b9cad79183536f458 SHA512 1765a85b925f95a2465e6c680ac1bc6a801cf625be7ca312e01e58fa6172d460050f0829a3732197dd9f54b95aa1bb5f7e8f9ba30427dd5e60f4471f69fb717f
-EBUILD tomcat-9.0.43.ebuild 5622 BLAKE2B fc21ca59e1060940465a287bdad5a503454afa961796234f85c13a9c3eb97ad4c5914c518d74b37711a2830eb9d4e7458fadb4437dc0aa8b43bca513be243ad8 SHA512 247436d948df70533f61ddc2c5a1f2c97eaa729876f5b226437da21e717bcf2ae1e15193df92666c4020740eb92ef299a86debc8709c20e8ac434a6444524207
-EBUILD tomcat-9.0.44.ebuild 5630 BLAKE2B 279087af977cf4bb6bbd80487401004cc396e98c4601ee5981f750a2ca5e54d288dd2f40c56ec54dff71663f4feb9703b9bd9d043f658c16cc39ffe8d92237f7 SHA512 172bbbb739e8f39100eb6518a49ebe16bf2da7b9e79a38435a22a4393b0babc918d955798f86c3cadee2d6ccc9421a50eb1dfb0c6f30151d3d993f5b3f77ba12
+EBUILD tomcat-10.0.4.ebuild 5903 BLAKE2B 853176b18c2703e60030c00349e479e856a8a4cf0d8dc58179f2690e2c4994aa9d629b72db13174483d05777468fa5fe08d1e749b06efc4ce99390935d6d0a0c SHA512 351cb896068e511b50411a8a1e5686bd872f9021a90147d3476275ac9cf66e7b53d55cf593e8a3d042858b127d2631ea09784938b2fc4b1f6aa0caaef0bf06a7
+EBUILD tomcat-10.0.5.ebuild 5920 BLAKE2B e688681999674380319dcb3651162c089aec032501ee1b96d2f12e9c3d7cb5b30a197683323ca18181d68ee7a70cb5ab979669dcb12d55d9dadf75b3eec0d136 SHA512 21dfc89a64db1f34b9e4314ef8b7b1144b205548d81c93b9a89e65703619d8bc54d7359f70c78b6aa39a5f1368b63b49b32a8169259c35926536cb1bedcabc6b
+EBUILD tomcat-7.0.108.ebuild 4147 BLAKE2B 8023fb9265a3e57bbdb506559bfe9a337f566e09b6cccd0e74e84341e54d1434134eb0aecaf72a97113826d8f7359dea1e5672db44e9dfb706b020cf79c51802 SHA512 0730da2fe90a5fa203e03eef5044eb8b90c5b800d064d65467370834b788c3de03ea5c57ccfe20b29deac9c560c68029e94a80be180b240356565121d453a2a4
+EBUILD tomcat-7.0.109.ebuild 4148 BLAKE2B 6ba606c3f0de9c15e19f570ae6940051ff0d28dbcf8242d3181663a708a86f41afb1e35c95a9f9b9213029599aa5b7776b986051e3f049d733e56cefb2990a9d SHA512 ad613250c438267f98e7ea591d270a13babbbd6e1539c48b174d5922abfbfeff79396fa8272b4de0b47cf269658e9f3dfd6ce8157ea22a432b01380186442b5f
+EBUILD tomcat-8.5.64.ebuild 4727 BLAKE2B ae3d64371f0913ea17272fe4fb2d5091645dd3c4d4241b1aaa01c9951ffb73f71fe016e63c899931b9c6b2b54fda252f7b72894082e0ee4acf3da9f557627026 SHA512 857a16a42677b2503ce472feebfb03c870949035cdd7812faefcabcd1f8f9c56a65887f49b1c770317143704be62d92455548f2d167899d3600ae6163bb3df67
+EBUILD tomcat-8.5.65.ebuild 4737 BLAKE2B f397616c8e9f92ab44b73186bdbac134ffa52a8541d944c694d337292a8230de70376d46853e8168f77b864d3c4f7e60f0944d78dce7e6cc3599ad3d2dec2ae7 SHA512 982fe5528b949246e301ee47173c45ec78d60796a5a28cd48f31f98f4095bfe9944ee3ce1731c70f708bee744d62812f63b068f6c9ebbf76f37471cfbe751638
+EBUILD tomcat-9.0.44.ebuild 5623 BLAKE2B 0a118c86179cbea4b89e2d537d2b5c72562affd803e9341855d75a899386f94fb6d6973e0c3cf25b0c1027acb55dbf6b32fc5e1dfb238a4b9e8c09dd7c09219d SHA512 652f7cc0d5ff1fb381a1cd17bf3eb1badda4aeb013e8845c7214c01bd0826690b96ff9592b3b47f4de432bf39d982355a884bacc6cfbbf4b141afe1d8803da05
+EBUILD tomcat-9.0.45.ebuild 5632 BLAKE2B 18bccfcb61851a4e169621e3a921a1346a6f1a50d705beb082850d183bc2fff4c1a4258ef7e25f2f4da89d4bb46b8651159c1cdf30e0a6b4068440bbb9e542c6 SHA512 1cff8ca77273fe3ae406e4f03b7edd977c4bcea42543de3ae5dc6c8b8aeb025f91c53b8901d27a0ccaa078268d65c9aec786d03927d3acf9a7dd2cd2d26eea2c
 MISC metadata.xml 712 BLAKE2B 3e0a9b1bd07334015006678c0e1d933dc3d7b65291425754f7bcaec673f2316ba85b2e7df2c79a90f0d53dfbc443329cbea8ddfde7d4c93a1635b6140a3b18b6 SHA512 bc7c894d5f945a732078cc4d9a7fa9d0374ebb6aec449487f8968b22aed07bc5e20094448fda9be7516206121d0dfec8c6d6e48ee818786999703ea778a82109
diff --git a/www-servers/tomcat/files/tomcat-8.5.65-build.xml.patch b/www-servers/tomcat/files/tomcat-8.5.65-build.xml.patch
new file mode 100644
index 000000000000..66411238a3d8
--- /dev/null
+++ b/www-servers/tomcat/files/tomcat-8.5.65-build.xml.patch
@@ -0,0 +1,266 @@
+diff --git a/build.xml b/build.xml
+index 19be6ed..c1557cd 100644
+--- a/build.xml
++++ b/build.xml
+@@ -772,25 +772,28 @@
+       manifest="${tomcat.manifests}/annotations-api.jar.manifest" />
+ 
+     <!-- Servlet 3.1 Implementation JAR File -->
++<!--
+     <jarIt jarfile="${servlet-api.jar}"
+       filesDir="${tomcat.classes}"
+       filesId="files.servlet-api"
+       manifest="${tomcat.manifests}/servlet-api.jar.manifest"
+       notice="${tomcat.manifests}/servlet-api.jar.notice"
+       license="${tomcat.manifests}/servlet-api.jar.license" />
+-
++-->
+     <!-- EL Implementation JAR File -->
++<!--
+     <jarIt jarfile="${el-api.jar}"
+       filesDir="${tomcat.classes}"
+       filesId="files.el-api"
+       manifest="${tomcat.manifests}/el-api.jar.manifest" />
+-
++-->
+     <!-- JSP Implementation JAR File -->
++<!--
+     <jarIt jarfile="${jsp-api.jar}"
+       filesDir="${tomcat.classes}"
+       filesId="files.jsp-api"
+       manifest="${tomcat.manifests}/jsp-api.jar.manifest" />
+-
++-->
+     <!-- WebSocket API JAR File -->
+     <jarIt jarfile="${websocket-api.jar}"
+       filesDir="${tomcat.classes}"
+@@ -882,9 +885,9 @@
+       meta-inf="${tomcat.manifests}/jasper.jar" />
+ 
+     <!-- Re-packaged Apache Commons DBCP 2-->
+-    <jarIt jarfile="${tomcat-dbcp.jar}"
++<!--    <jarIt jarfile="${tomcat-dbcp.jar}"
+       filesDir="${tomcat.classes}"
+-      filesId="files.tomcat-dbcp" />
++      filesId="files.tomcat-dbcp" /> -->
+ 
+     <!-- i18n JARs -->
+     <jar jarfile="${tomcat.build}/lib/tomcat-i18n-de.jar"
+@@ -1099,9 +1102,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">
+@@ -1161,7 +1164,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" />
+@@ -1204,7 +1207,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}"
+@@ -1220,7 +1223,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}"
+@@ -1323,9 +1326,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
+@@ -1736,7 +1741,7 @@
+ 
+   <target name="extras-webservices-prepare"
+           depends="extras-prepare"
+-          description="Prepare to build web services extras package">
++          description="Prepare to build web services extras package" unless="noget">
+ 
+     <antcall target="downloadfile">
+       <param name="sourcefile" value="${jaxrpc-lib.loc}"/>
+@@ -1921,6 +1926,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"
+@@ -1988,6 +1994,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"
+@@ -2051,13 +2058,17 @@ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform.
+         <path location="${ant.core.lib}"/>
+       </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/7/docs/api/"/>
+       <link href="https://docs.oracle.com/javaee/7/api/"/>
++-->
+       <packageset dir="${tomcat.dist}/src/java/">
+         <include name="org/**"/>
+         <exclude name="org/apache/el/parser/**"/>
+@@ -2828,7 +2839,7 @@ skip.installer property in build.properties" />
+   </target>
+ 
+   <target name="download-compile"
+-          description="Download components necessary to compile" >
++          description="Download components necessary to compile" unless="noget" >
+ 
+     <!-- Download Commons Daemon -->
+     <antcall target="downloadgz-2">
+@@ -2854,7 +2865,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}"/>
+@@ -2932,7 +2943,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}"/>
+@@ -2987,13 +2998,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>
+@@ -3115,7 +3126,7 @@ skip.installer property in build.properties" />
+     </sequential>
+   </macrodef>
+ 
+-  <target name="downloadgz" unless="exist" if="${execute.download}" depends="testexist,setproxy">
++  <target name="downloadgz" unless="noget" if="${execute.download}" depends="testexist,setproxy">
+     <!-- Download and extract the package -->
+     <local name="temp.file"/>
+     <mkdir dir="${base.path}"/>
+@@ -3132,7 +3143,7 @@ skip.installer property in build.properties" />
+     <delete file="${temp.file}.tar.gz"/>
+   </target>
+ 
+-  <target name="downloadgz-2" unless="exist" if="${execute.download}" depends="testexist">
++  <target name="downloadgz-2" unless="noget" if="${execute.download}" depends="testexist">
+     <!-- Download and extract the package from the two alternative locations -->
+     <local name="temp.file"/>
+     <mkdir dir="${base.path}"/>
+@@ -3157,7 +3168,7 @@ skip.installer property in build.properties" />
+     <delete file="${temp.file}.tar.gz"/>
+   </target>
+ 
+-  <target name="downloadzip" unless="exist" if="${execute.download}" depends="testexist,setproxy">
++  <target name="downloadzip" unless="noget" if="${execute.download}" depends="testexist,setproxy">
+     <!-- Download and extract the package -->
+     <local name="temp.file"/>
+     <mkdir dir="${base.path}"/>
+@@ -3173,7 +3184,7 @@ skip.installer property in build.properties" />
+     <delete file="${temp.file}"/>
+   </target>
+ 
+-  <target name="downloadzip-2" unless="exist" if="${execute.download}" depends="testexist">
++  <target name="downloadzip-2" unless="noget" if="${execute.download}" depends="testexist">
+     <!-- Download and extract the package from the two alternative locations -->
+     <local name="temp.file"/>
+     <mkdir dir="${base.path}"/>
+@@ -3197,7 +3208,7 @@ skip.installer property in build.properties" />
+     <delete file="${temp.file}"/>
+   </target>
+ 
+-  <target name="downloadfile" unless="exist" if="${execute.download}" depends="testexist,setproxy">
++  <target name="downloadfile" unless="noget" if="${execute.download}" depends="testexist,setproxy">
+     <!-- Download the file -->
+     <local name="temp.file"/>
+     <mkdir dir="${base.path}"/>
+@@ -3212,7 +3223,7 @@ skip.installer property in build.properties" />
+     <move file="${temp.file}" tofile="${destfile}"/>
+   </target>
+ 
+-  <target name="downloadfile-2" unless="exist" if="${execute.download}" depends="testexist">
++  <target name="downloadfile-2" unless="noget" if="${execute.download}" depends="testexist">
+     <!-- Download the file from the two alternative locations -->
+     <local name="temp.file"/>
+     <mkdir dir="${base.path}"/>
+@@ -3240,7 +3251,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>
+@@ -3251,7 +3262,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>
+@@ -3262,7 +3273,7 @@ skip.installer property in build.properties" />
+ 
+   <target name="ide-eclipse"
+           depends="download-compile, extras-webservices-prepare, 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"/>
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
deleted file mode 100644
index dd002e2ca216..000000000000
--- a/www-servers/tomcat/files/tomcat-9.0.40-insufficient-ecj.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-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/files/tomcat-9.0.45-build.xml.patch b/www-servers/tomcat/files/tomcat-9.0.45-build.xml.patch
new file mode 100644
index 000000000000..ab5e5e098a08
--- /dev/null
+++ b/www-servers/tomcat/files/tomcat-9.0.45-build.xml.patch
@@ -0,0 +1,284 @@
+diff --git a/build.xml b/build.xml
+index 2958ccd..3983182 100644
+--- a/build.xml
++++ b/build.xml
+@@ -1025,6 +1025,7 @@
+       addOSGi="true" />
+ 
+     <!-- Servlet 4.0 Implementation JAR File -->
++<!--
+     <jarIt jarfile="${servlet-api.jar}"
+       filesDir="${tomcat.classes}"
+       filesId="files.servlet-api"
+@@ -1032,21 +1033,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}"
+@@ -1159,10 +1162,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"
+@@ -1399,9 +1402,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">
+@@ -1461,7 +1464,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" />
+@@ -1504,7 +1507,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}"
+@@ -1520,7 +1523,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}"
+@@ -1623,9 +1626,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
+@@ -2208,11 +2213,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.
+@@ -2243,6 +2249,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"
+@@ -2307,6 +2314,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"
+@@ -2369,13 +2377,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/**"/>
+@@ -3148,7 +3160,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">
+@@ -3192,7 +3204,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}"/>
+@@ -3270,7 +3282,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}"/>
+@@ -3325,13 +3337,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>
+@@ -3453,7 +3465,7 @@ skip.installer property in build.properties" />
+     </sequential>
+   </macrodef>
+ 
+-  <target name="downloadgz" unless="exist" if="${execute.download}" depends="testexist,setproxy">
++  <target name="downloadgz" unless="noget" if="${execute.download}" depends="testexist,setproxy">
+     <!-- Download and extract the package -->
+     <local name="temp.file"/>
+     <mkdir dir="${base.path}"/>
+@@ -3470,7 +3482,7 @@ skip.installer property in build.properties" />
+     <delete file="${temp.file}.tar.gz"/>
+   </target>
+ 
+-  <target name="downloadgz-2" unless="exist" if="${execute.download}" depends="testexist">
++  <target name="downloadgz-2" unless="noget" if="${execute.download}" depends="testexist">
+     <!-- Download and extract the package from the two alternative locations -->
+     <local name="temp.file"/>
+     <mkdir dir="${base.path}"/>
+@@ -3495,7 +3507,7 @@ skip.installer property in build.properties" />
+     <delete file="${temp.file}.tar.gz"/>
+   </target>
+ 
+-  <target name="downloadzip" unless="exist" if="${execute.download}" depends="testexist,setproxy">
++  <target name="downloadzip" unless="noget" if="${execute.download}" depends="testexist,setproxy">
+     <!-- Download and extract the package -->
+     <local name="temp.file"/>
+     <mkdir dir="${base.path}"/>
+@@ -3511,7 +3523,7 @@ skip.installer property in build.properties" />
+     <delete file="${temp.file}"/>
+   </target>
+ 
+-  <target name="downloadzip-2" unless="exist" if="${execute.download}" depends="testexist">
++  <target name="downloadzip-2" unless="noget" if="${execute.download}" depends="testexist">
+     <!-- Download and extract the package from the two alternative locations -->
+     <local name="temp.file"/>
+     <mkdir dir="${base.path}"/>
+@@ -3535,7 +3547,7 @@ skip.installer property in build.properties" />
+     <delete file="${temp.file}"/>
+   </target>
+ 
+-  <target name="downloadfile" unless="exist" if="${execute.download}" depends="testexist,setproxy">
++  <target name="downloadfile" unless="noget" if="${execute.download}" depends="testexist,setproxy">
+     <!-- Download the file -->
+     <local name="temp.file"/>
+     <mkdir dir="${base.path}"/>
+@@ -3550,7 +3562,7 @@ skip.installer property in build.properties" />
+     <move file="${temp.file}" tofile="${destfile}"/>
+   </target>
+ 
+-  <target name="downloadfile-2" unless="exist" if="${execute.download}" depends="testexist">
++  <target name="downloadfile-2" unless="noget" if="${execute.download}" depends="testexist">
+     <!-- Download the file from the two alternative locations -->
+     <local name="temp.file"/>
+     <mkdir dir="${base.path}"/>
+@@ -3578,7 +3590,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>
+@@ -3589,7 +3601,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>
+@@ -3600,7 +3612,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"/>
+@@ -3618,7 +3630,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/tomcat-10.0.4.ebuild b/www-servers/tomcat/tomcat-10.0.4.ebuild
index a397d6e6306c..0ddf4fd7a466 100644
--- a/www-servers/tomcat/tomcat-10.0.4.ebuild
+++ b/www-servers/tomcat/tomcat-10.0.4.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 
 JAVA_PKG_IUSE="doc source test"
 
-inherit eutils java-pkg-2 java-ant-2 prefix
+inherit java-pkg-2 java-ant-2 prefix
 
 MY_P="apache-${PN}-${PV}-src"
 
diff --git a/www-servers/tomcat/tomcat-10.0.2.ebuild b/www-servers/tomcat/tomcat-10.0.5.ebuild
index 7e618f92e88f..d66b5ff36790 100644
--- a/www-servers/tomcat/tomcat-10.0.2.ebuild
+++ b/www-servers/tomcat/tomcat-10.0.5.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 
 JAVA_PKG_IUSE="doc source test"
 
-inherit eutils java-pkg-2 java-ant-2 prefix
+inherit java-pkg-2 java-ant-2 prefix
 
 MY_P="apache-${PN}-${PV}-src"
 
@@ -23,7 +23,7 @@ SRC_URI="mirror://apache/${PN}/tomcat-9/v${PV}/src/${MY_P}.tar.gz
 
 LICENSE="Apache-2.0"
 SLOT="10"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="~amd64 ~amd64-linux"
 IUSE="extra-webapps"
 
 RESTRICT="test" # can we run them on a production system?
@@ -33,6 +33,7 @@ SAPI_SLOT="5.0"
 
 COMMON_DEP="dev-java/eclipse-ecj:${ECJ_SLOT}
 	dev-java/glassfish-xmlrpc-api:0
+	dev-java/jakartaee-migration:0
 	~dev-java/tomcat-servlet-api-${PV}:${SAPI_SLOT}
 	dev-java/wsdl4j:0"
 RDEPEND="${COMMON_DEP}
@@ -41,10 +42,10 @@ 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
 	test? (
-		>=dev-java/ant-junit-1.9:0
+		dev-java/ant-junit:0
 		dev-java/easymock:3.2
 	)"
 
@@ -75,7 +76,7 @@ src_prepare() {
 	# Remove bundled servlet-api
 	rm -rv java/jakarta/{el,servlet} || die
 
-	eapply "${FILESDIR}/${P}-build.xml.patch"
+	eapply "${FILESDIR}/${PN}-10.0.4-build.xml.patch"
 
 	# For use of catalina.sh in netbeans
 	sed -i -e "/^# ----- Execute The Requested Command/ a\
@@ -88,7 +89,7 @@ src_prepare() {
 JAVA_ANT_REWRITE_CLASSPATH="true"
 
 EANT_BUILD_TARGET="deploy"
-EANT_GENTOO_CLASSPATH="eclipse-ecj-${ECJ_SLOT},tomcat-servlet-api-${SAPI_SLOT},wsdl4j"
+EANT_GENTOO_CLASSPATH="eclipse-ecj-${ECJ_SLOT},jakartaee-migration,tomcat-servlet-api-${SAPI_SLOT},wsdl4j"
 EANT_TEST_GENTOO_CLASSPATH="easymock-3.2"
 EANT_GENTOO_CLASSPATH_EXTRA="${S}/output/classes"
 EANT_NEEDS_TOOLS="true"
@@ -106,7 +107,7 @@ src_configure() {
 
 src_compile() {
 	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
+	LC_ALL=C java-pkg-2_src_compile
 }
 
 src_test() {
diff --git a/www-servers/tomcat/tomcat-7.0.108.ebuild b/www-servers/tomcat/tomcat-7.0.108.ebuild
index 7778f5918a2c..62b762d4f8e4 100644
--- a/www-servers/tomcat/tomcat-7.0.108.ebuild
+++ b/www-servers/tomcat/tomcat-7.0.108.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 
 JAVA_PKG_IUSE="doc source test"
 
-inherit eutils java-pkg-2 java-ant-2 prefix
+inherit java-pkg-2 java-ant-2 prefix
 
 MY_P="apache-${P}-src"
 
diff --git a/www-servers/tomcat/tomcat-7.0.109.ebuild b/www-servers/tomcat/tomcat-7.0.109.ebuild
new file mode 100644
index 000000000000..ac741e7e7f1c
--- /dev/null
+++ b/www-servers/tomcat/tomcat-7.0.109.ebuild
@@ -0,0 +1,142 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+JAVA_PKG_IUSE="doc source test"
+
+inherit java-pkg-2 java-ant-2 prefix
+
+MY_P="apache-${P}-src"
+
+DESCRIPTION="Tomcat Servlet-3.0/JSP-2.2 Container"
+HOMEPAGE="https://tomcat.apache.org/"
+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"
+IUSE="extra-webapps websockets"
+
+RESTRICT="test" # can we run them on a production system?
+
+ECJ_SLOT="4.5"
+SAPI_SLOT="3.0"
+
+COMMON_DEP="dev-java/eclipse-ecj:${ECJ_SLOT}
+	~dev-java/tomcat-servlet-api-${PV}:${SAPI_SLOT}"
+RDEPEND="${COMMON_DEP}
+	acct-group/tomcat
+	acct-user/tomcat
+	virtual/jre"
+DEPEND="${COMMON_DEP}
+	virtual/jdk:1.8
+	test? ( dev-java/ant-junit:0 )"
+
+S=${WORKDIR}/${MY_P}
+
+src_prepare() {
+	default
+
+	# Remove bundled servlet-api
+	rm -rv java/javax/{el,servlet} || die
+
+	java-pkg_clean
+
+	eapply "${FILESDIR}/${PN}-7.0.99-build.xml.patch"
+
+	# For use of catalina.sh in netbeans
+	sed -i -e "/^# ----- Execute The Requested Command/ a\
+		CLASSPATH=\`java-config --with-dependencies --classpath ${PN}-${SLOT}\`" \
+		bin/catalina.sh || die
+
+	java-pkg-2_src_prepare
+}
+
+JAVA_ANT_REWRITE_CLASSPATH="true"
+
+EANT_BUILD_TARGET="deploy"
+EANT_GENTOO_CLASSPATH="eclipse-ecj-${ECJ_SLOT},tomcat-servlet-api-${SAPI_SLOT}"
+EANT_GENTOO_CLASSPATH_EXTRA="${S}/output/classes"
+EANT_NEEDS_TOOLS="true"
+EANT_EXTRA_ARGS="-Dversion=${PV}-gentoo -Dversion.number=${PV} -Dcompile.debug=false"
+
+# revisions of the scripts
+IM_REV="-r1"
+INIT_REV="-r1"
+
+src_compile() {
+	use websockets && EANT_EXTRA_ARGS+=" -Djava.7.home=${JAVA_HOME}"
+	EANT_GENTOO_CLASSPATH_EXTRA+=":$(java-pkg_getjar --build-only ant-core ant.jar)"
+	java-pkg-2_src_compile
+}
+
+src_test() {
+	java-pkg-2_src_test
+}
+
+src_install() {
+	local dest="/usr/share/${PN}-${SLOT}"
+
+	java-pkg_jarinto "${dest}"/bin
+	java-pkg_dojar output/build/bin/*.jar
+	exeinto "${dest}"/bin
+	doexe output/build/bin/*.sh
+
+	java-pkg_jarinto "${dest}"/lib
+	java-pkg_dojar output/build/lib/*.jar
+
+	dodoc RELEASE-NOTES RUNNING.txt
+	use doc && java-pkg_dojavadoc output/dist/webapps/docs/api
+	use source && java-pkg_dosrc java/*
+
+	### Webapps ###
+
+	insinto "${dest}"/webapps
+	doins -r output/build/webapps/{host-manager,manager,ROOT}
+	use extra-webapps && doins -r output/build/webapps/{docs,examples}
+
+	### Config ###
+
+	# create "logs" directory in $CATALINA_BASE
+	# and set correct perms, see #458890
+	dodir "${dest}"/logs
+	fperms 0750 "${dest}"/logs
+
+	# replace the default pw with a random one, see #92281
+	local randpw=$(echo ${RANDOM}|md5sum|cut -c 1-15)
+	sed -i -e "s|SHUTDOWN|${randpw}|" output/build/conf/server.xml || die
+
+	# prepend gentoo.classpath to common.loader, see #453212
+	sed -i -e 's/^common\.loader=/\0${gentoo.classpath},/' output/build/conf/catalina.properties || die
+
+	insinto "${dest}"
+	doins -r output/build/conf
+
+	### rc ###
+
+	cp "${FILESDIR}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash} "${T}" || die
+	eprefixify "${T}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash}
+	sed -i -e "s|@SLOT@|${SLOT}|g" "${T}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash} || die
+
+	insinto "${dest}"/gentoo
+	doins "${T}"/tomcat.conf
+	exeinto "${dest}"/gentoo
+	newexe "${T}"/tomcat${INIT_REV}.init tomcat.init
+	newexe "${T}"/tomcat-instance-manager${IM_REV}.bash tomcat-instance-manager.bash
+}
+
+pkg_postinst() {
+	elog "New ebuilds of Tomcat support running multiple instances. If you used prior version"
+	elog "of Tomcat (<7.0.32), you have to migrate your existing instance to work with new Tomcat."
+	elog "You can find more information at https://wiki.gentoo.org/wiki/Apache_Tomcat"
+
+	elog "To manage Tomcat instances, run:"
+	elog "  ${EPREFIX}/usr/share/${PN}-${SLOT}/gentoo/tomcat-instance-manager.bash --help"
+
+	ewarn "tomcat-dbcp.jar is not built at this time. Please fetch jar"
+	ewarn "from upstream binary if you need it. Gentoo Bug # 144276"
+
+	einfo "Please read https://wiki.gentoo.org/wiki/Apache_Tomcat and"
+	einfo "https://wiki.gentoo.org/wiki/Project:Java/Tomcat_6_Guide for more information."
+}
diff --git a/www-servers/tomcat/tomcat-8.5.64.ebuild b/www-servers/tomcat/tomcat-8.5.64.ebuild
index 9a48d1d98961..55da8b242ee0 100644
--- a/www-servers/tomcat/tomcat-8.5.64.ebuild
+++ b/www-servers/tomcat/tomcat-8.5.64.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 
 JAVA_PKG_IUSE="doc source test"
 
-inherit eutils java-pkg-2 java-ant-2 prefix
+inherit java-pkg-2 java-ant-2 prefix
 
 MY_P="apache-${P}-src"
 
@@ -15,7 +15,7 @@ SRC_URI="mirror://apache/${PN}/tomcat-8/v${PV}/src/${MY_P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="8.5"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="amd64 ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
 IUSE="extra-webapps"
 
 RESTRICT="test" # can we run them on a production system?
diff --git a/www-servers/tomcat/tomcat-8.5.63.ebuild b/www-servers/tomcat/tomcat-8.5.65.ebuild
index 361cd1d9a905..5d75d292205f 100644
--- a/www-servers/tomcat/tomcat-8.5.63.ebuild
+++ b/www-servers/tomcat/tomcat-8.5.65.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 
 JAVA_PKG_IUSE="doc source test"
 
-inherit eutils java-pkg-2 java-ant-2 prefix
+inherit java-pkg-2 java-ant-2 prefix
 
 MY_P="apache-${P}-src"
 
@@ -15,7 +15,7 @@ SRC_URI="mirror://apache/${PN}/tomcat-8/v${PV}/src/${MY_P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="8.5"
-KEYWORDS="amd64 ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
 IUSE="extra-webapps"
 
 RESTRICT="test" # can we run them on a production system?
@@ -52,7 +52,7 @@ src_prepare() {
 	# Remove bundled servlet-api
 	rm -rv java/javax/{el,servlet} || die
 
-	eapply "${FILESDIR}/${PN}-8.5.57-build.xml.patch"
+	eapply "${FILESDIR}/${PN}-8.5.65-build.xml.patch"
 
 	# For use of catalina.sh in netbeans
 	sed -i -e "/^# ----- Execute The Requested Command/ a\
@@ -78,7 +78,7 @@ INIT_REV="-r1"
 src_compile() {
 	EANT_GENTOO_CLASSPATH_EXTRA+=":$(java-pkg_getjar --build-only ant-core ant.jar)"
 	use doc && EANT_GENTOO_CLASSPATH_EXTRA+=":$(java-pkg_getjar --build-only glassfish-xmlrpc-api glassfish-xmlrpc-api.jar):$(java-pkg_getjar --build-only wsdl4j wsdl4j.jar)"
-	java-pkg-2_src_compile
+	LC_ALL=C java-pkg-2_src_compile
 }
 
 src_test() {
diff --git a/www-servers/tomcat/tomcat-9.0.44.ebuild b/www-servers/tomcat/tomcat-9.0.44.ebuild
index f12d2f96fa30..00fbff882efc 100644
--- a/www-servers/tomcat/tomcat-9.0.44.ebuild
+++ b/www-servers/tomcat/tomcat-9.0.44.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 
 JAVA_PKG_IUSE="doc source test"
 
-inherit eutils java-pkg-2 java-ant-2 prefix
+inherit java-pkg-2 java-ant-2 prefix
 
 MY_P="apache-${PN}-${PV}-src"
 
diff --git a/www-servers/tomcat/tomcat-9.0.43.ebuild b/www-servers/tomcat/tomcat-9.0.45.ebuild
index e116176e1ca4..cda55f1d652e 100644
--- a/www-servers/tomcat/tomcat-9.0.43.ebuild
+++ b/www-servers/tomcat/tomcat-9.0.45.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 
 JAVA_PKG_IUSE="doc source test"
 
-inherit eutils java-pkg-2 java-ant-2 prefix
+inherit java-pkg-2 java-ant-2 prefix
 
 MY_P="apache-${PN}-${PV}-src"
 
@@ -51,7 +51,7 @@ DEPEND="${COMMON_DEP}
 S=${WORKDIR}/${MY_P}
 
 PATCHES=(
-	"${FILESDIR}/${P}-insufficient-ecj.patch"
+	"${FILESDIR}/${PN}-9.0.43-insufficient-ecj.patch"
 )
 
 BND_HOME="${S}/tomcat-build-libs/bnd"
@@ -75,7 +75,7 @@ src_prepare() {
 	# Remove bundled servlet-api
 	rm -rv java/javax/{el,servlet} || die
 
-	eapply "${FILESDIR}/${PN}-9.0.40-build.xml.patch"
+	eapply "${FILESDIR}/${PN}-9.0.45-build.xml.patch"
 
 	# For use of catalina.sh in netbeans
 	sed -i -e "/^# ----- Execute The Requested Command/ a\
@@ -106,7 +106,7 @@ src_configure() {
 
 src_compile() {
 	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
+	LC_ALL=C java-pkg-2_src_compile
 }
 
 src_test() {
diff --git a/www-servers/tornado/Manifest b/www-servers/tornado/Manifest
index 4e4a4b34663e..d54f3d4f0f18 100644
--- a/www-servers/tornado/Manifest
+++ b/www-servers/tornado/Manifest
@@ -1,5 +1,5 @@
 DIST tornado-6.0.4.tar.gz 496204 BLAKE2B 6c092214d03baf5cf7615b780043e2fa40a4ed623b7ca59a2528cc3625ba904b21ef93c528278adedaf83e3b6e5a6311d867833dfe9826637e97918dee6fa334 SHA512 d29d69cf40f8b34fb2c55d81b6ecd9bc7c6fdf644eb4ff35452829510c0d5ec185da0a6067fec3e8afb2bedf9f5f08b06adb0ad53dcab04cb791a75abc304d6e
 DIST tornado-6.1.tar.gz 497359 BLAKE2B ed5981dec5cca962f907f97b7f906c1eef40d2b2b6d6cc16a21bd0a0a91ee58a60bea84b7ceeeff30b3462d707c56a5062c71d4ac8f25ca6a306ded6c6f072c5 SHA512 0ec1db1fad911182bda547c177a18b107b906cf66576443069e2b986cf041b3d4ebe08e5a168aa5cd3b56547f32f8b384bacaf74db89f582951d7b610b7494e8
-EBUILD tornado-6.0.4.ebuild 1377 BLAKE2B d69b4f684fbe2f49281072ff7db58a1f523e6344a835e8ca26d71399d305b254ec1af461535a86162d368220de5846fed4727bb1f8346679ee94df5eb315a7f7 SHA512 9b9e90002dc7890ed003b0008a8ec8954818c564fb10dd45cc837201554149a64c55377613e2c23b1ba1f8e66166e30687714df116841496cfd8025e1ed439ea
+EBUILD tornado-6.0.4.ebuild 1378 BLAKE2B c6f2df1b4d99b49aee5ff67fbe2e231d20ff77162fbb7e1561ec8364eb4e8311cec852b1ed419f3b16057b0df0008ba6f096a94c7b1a6072652f70aef9e2d379 SHA512 4d9aa908a512a4f59e09008d301fcd6b4efaa5c3498d190c7e55e694f9740d2ebb1d3056ee73c7f973f4f1c35ad30e63eeea5d7a78d5126a0e4025e486472e4f
 EBUILD tornado-6.1.ebuild 1134 BLAKE2B bdb5c2de03d140a2c9fe6af7e332db1448e0bb4274d8017cb1fb5988c24e60817a4a5864ac9746d4c1f418b7ad91a1c85bd815c3425f2911c66c3df10e2e87bc SHA512 4de392e95ff1649bfbba70bee4b87f84ef521a15cd0614718cdc301ac4c134d81db4590a4d85cdd6af3a70bb57de2e826c9cba4b25d95b294d38ad9f8cef5128
 MISC metadata.xml 380 BLAKE2B 16a28ca707ba911df09dfad39b269bd888734c1f5e54fdc57d84f62b541e284f248137a01c13055f5e9fa1e1da0a2c9e1382006119cc11ec19302516262b7dc1 SHA512 e790429d61042b60a9011710e96df0044c64cc5ac941ab6268386138d3a66e46d40ed1098ec8bc164d9f4341040946ec7231e8f28dda11790ecc482b06978771
diff --git a/www-servers/tornado/tornado-6.0.4.ebuild b/www-servers/tornado/tornado-6.0.4.ebuild
index a84f9c45e3cd..4e12f2e4081b 100644
--- a/www-servers/tornado/tornado-6.0.4.ebuild
+++ b/www-servers/tornado/tornado-6.0.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
 IUSE="examples test"
 RESTRICT="!test? ( test )"
 
diff --git a/www-servers/xsp/Manifest b/www-servers/xsp/Manifest
index 8866dd95ea5b..bc8668a5bdcf 100644
--- a/www-servers/xsp/Manifest
+++ b/www-servers/xsp/Manifest
@@ -3,9 +3,11 @@ AUX 2.2/mod-mono-server.confd 1214 BLAKE2B 874bb6e6fae3430d7a5cc9f6f0c19f6ddba1e
 AUX 2.2/mod-mono-server.initd 1906 BLAKE2B 2e21f2c41786ffaaff8903fd0b971b59c2d58014cbeee5dc6eaaf9fb789ee14c98226af73fe24677622cd55bfcc6782fbf961eb073cf49e4f4d0372c32b8572d SHA512 15922bb445f97f084295185a1211692197dda58e8d794fb6c20e44801db4a802547253814d70608a10540bb340e7ac71294c8be58689f7700b9c9faa424b0eb5
 AUX 2.2/xsp.confd 306 BLAKE2B 185ed6b9c9d5404d83b0c6c9973e28f8c0ab5804533c6c587ff602811f4f6c77a6a647062aed380b0dc047fb7bb4bbac0b95ce6398e70f15b94aefbe84772a8c SHA512 4c82a22b3da305e7b73dde941e30058e7a717c032980ebfd4a99c5be3fd84aec77fd3d6f3787d165503790e07bfde4193c72ed4d2bfb3c08033b964ac933ec9a
 AUX 2.2/xsp.initd 796 BLAKE2B f87d56d984486b2d33d145a5d164061d074136adaf5f2687d976fa21361d0cf86365bbfae597fe51467e004f24cd4a41a19481a387d4afe4dc4170e37965f555 SHA512 d28fbce8838c6796362ec7bedcedfedee5e60524758b16ff6a24952ff20acfea658b824f070ffc59b9df381895a0e0346177a7aa1129de59f67543102c581f44
-AUX aclocal-fix.patch 299 BLAKE2B eb9e5ecf89d31bdb0e64675e49c75218234ace565bc1de4e1369ff00c524902d776e8d5dc16b88d4acc3bd7532f576e9643af7359ea6c6f3728d4a3eab162947 SHA512 a315a5e9f59c4d4fd665e7e55977667fc8baf8f232961b939910af5df9e3e869bc50c98ecdc96302155c7b89f94fd3f9b7750ecac1fc430f7b12fe761c7b965b
+AUX aclocal-fix.patch 227 BLAKE2B 1fc1f76db1df3c09edaa7ffe6f8f9a0355d34797c82118be6af472cf87acaa8a242e9143655c152135f48735addd4d2fbc73f155feda512610af4d9445400f73 SHA512 2ec9bba4bebd4d0b9ee86127972018d26f133e922af0c8f77f32cceaa6a057fa806f9e845b2984bdf02ebf11ea0cd737c9d31c972de032e376adbb49a5a70020
 AUX systemd/mono-xsp4.service 340 BLAKE2B 96674d1c6cdfffcfa0a2530ea58c99b4cea8e7c4d3cc1ee8a9b694919b045cb5ead55a715fdfc125fe8c8cd2e4277bf8620e3a4e06471697ba7799acdc7abcac SHA512 d4df0cad0ca0c72cf282ecf377409d255375402910a7f762f9d395a407e63eb3c314932cfee69ec733cb9f1cb7cf88af7125fc2723335efc049cc6ebce2756b4
 AUX systemd/mono.webapp 315 BLAKE2B 159a9c27bba5956dad1b7a2ec1587bd35782d1cb236b9c957c1906b52faeceb4d333e91872b9505e73153a4d16bc1ed6aa76b3b296c1641cb0dc04fc4f56744f SHA512 e7b33fa0f36b27854c8a215cacab25760b5ff91f12415dbd9406e1f92cb0faf035bcfb14b8e0b37c22ff73f0a9c31a1cf9ac213c9167e5f8618a943440e0384d
-DIST xsp-2014.12.zip 632555 BLAKE2B e9c63a1e7ae26b45a6d4bec7aca48fc5f9712ffeb17087f6685009abb3feed4395015e8506b3c1333b59658f0334cadb66d181b35e4508bc807bb9680e360196 SHA512 a9d298079cfae4bacac1575f04e58c3106f532c1f283cc243a8a6560561c0a6b535320d1d3e925c7383bd1f7510f31f115d8e85506e31623c175d7f3f606ab91
-EBUILD xsp-2014.12-r2014120900.ebuild 2449 BLAKE2B 168f0a4d62fc657cbff4cc017291228739b11481130694b4e44d27aead31d1aa17e4cd0350ca5a1d74aaa88eac718f7eff5e9dd93aa7ad3b3f2f6daeb660639e SHA512 89708c86346edfd313343b6b2ee307d8c255e953e749956eab10ae0f1b301235281c1533c46b56ceff9c7726326cd3605c2a4c28ec969da867a1d64b51269d96
+DIST xsp-3.8_p2014120900.tar.gz 307722 BLAKE2B a6c7723e41490022ea969961f93fa3cb5b5eb583edd6ad1ef40dc38adc29cc9c0de16b7da5e98074b0848cdb7cce1e4c5e0298dc6f7f71d6a5c5e542a662005e SHA512 bf7a8cbeda330be98eb6fb1942ca9d6d8107ceabfb47db36d4b9b1f9d99afb329bad7737a4c9bfbf3ac205e9499dd58b2aa1cf7dfd83e41ee50b3820b05d4596
+DIST xsp-4.7.1.tar.gz 307143 BLAKE2B f8a3a09d644d567728e6462df553ff52fdbd17e974dc25aeebd011e7b6c22ef76be69cc49acfd1cdd9edbd30728ce6b7ef5f33ecda50653db219863b17442b36 SHA512 f106b073bc17ae8fafcffdf2f0db7284f36b62b648fd79321a0de7f5ed15085a9116deccf464e72b3e6f5daf8d65d0a6a3d55c1b275546a4762fa3236bd58e2b
+EBUILD xsp-3.8_p2014120900.ebuild 2374 BLAKE2B ce4456beb45e060bd2a63bf09e76f0cc5590a8c833fb39e45dc96e0ad8ac75cdd2ff16152f6a5875689b67c78855cf70eed7af4a297b0bf9a92915845522f5c3 SHA512 d6b446f48ce3c324091fcd2a70be54eff6c7653ea110826082da0a3d5850aea86ac8405577f2b0e05885478f701fbd338075bfbb43f1a6feb507d6a997d9c844
+EBUILD xsp-4.7.1.ebuild 2187 BLAKE2B c981767421b5c1969b2c34586760d0a2611eafcf5e0ec85e8ee5654e12d1b47b757ee4c5b09b9c8bace21053d0d9b78652434486a42ecee8ab675a3689fd814e SHA512 6cdf7f14015e9b30035114e67e606d908e10c81a1c5befe00feb21e16f1960a9f7c81de4ca7efe0be52d419397ae13306c389197de77280ad17d86d9fcf19c37
 MISC metadata.xml 576 BLAKE2B d9d4f67729727cfbb29f63bcf35d9c08db1ff97ba736a1df4c3693372cef37a6b26d43d3622703511eb78b85ab9c855a2891835cffa88bc240c38c03396915ee SHA512 5ffda9960f5c537ee5876466dae1df0dea1a120da789c10364a7328314b2dd44168d48d0fbce24ffb6778d93ef26c5284011abc874e194ccaecd56b43578732c
diff --git a/www-servers/xsp/files/aclocal-fix.patch b/www-servers/xsp/files/aclocal-fix.patch
index 49a00050fe8d..3e96f8f42a4c 100644
--- a/www-servers/xsp/files/aclocal-fix.patch
+++ b/www-servers/xsp/files/aclocal-fix.patch
@@ -1,5 +1,5 @@
---- Makefile_old.am	2013-07-30 09:11:50.033962122 +0400
-+++ Makefile.am	2013-07-30 09:12:20.843574793 +0400
+--- a/Makefile.am
++++ b/Makefile.am
 @@ -1,10 +1,2 @@
  SUBDIRS=build man src test tools scripts packaging lib
  ACLOCAL_AMFLAGS += -I build/m4
diff --git a/www-servers/xsp/xsp-2014.12-r2014120900.ebuild b/www-servers/xsp/xsp-3.8_p2014120900.ebuild
index 682da894b805..e2d9fda01c70 100644
--- a/www-servers/xsp/xsp-2014.12-r2014120900.ebuild
+++ b/www-servers/xsp/xsp-3.8_p2014120900.ebuild
@@ -1,65 +1,67 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="5"
+EAPI=7
 
+# TODO: We can probably yank the USE_DOTNET/dotnet.eclass stuff
+# but let's be conservative for now
 USE_DOTNET="net35 net40 net45"
-PATCHDIR="${FILESDIR}/2.2/"
-
-inherit base eutils systemd dotnet user autotools autotools-utils
+inherit autotools dotnet systemd user
 
+EGIT_COMMIT="e272a2c006211b6b03be2ef5bbb9e3f8fefd0768"
 DESCRIPTION="XSP is a small web server that can host ASP.NET pages"
 HOMEPAGE="http://www.mono-project.com/ASP.NET"
-
-EGIT_COMMIT="e272a2c006211b6b03be2ef5bbb9e3f8fefd0768"
-SRC_URI="https://github.com/mono/xsp/archive/${EGIT_COMMIT}.zip -> ${P}.zip"
+SRC_URI="https://github.com/mono/xsp/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
 S="${WORKDIR}/xsp-${EGIT_COMMIT}"
 
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="doc test developer"
+IUSE="developer doc test"
 RESTRICT="!test? ( test )"
 
 RDEPEND="dev-db/sqlite:3"
 DEPEND="${RDEPEND}"
 
+PATCHES=(
+	"${FILESDIR}/aclocal-fix.patch"
+)
+
+METAFILETOBUILD=xsp.sln
+
 src_prepare() {
-	epatch "${FILESDIR}/aclocal-fix.patch"
+	default
 
-	if [ -z "$LIBTOOL" ]; then
-		LIBTOOL=`which glibtool 2>/dev/null`
-		if [ ! -x "$LIBTOOL" ]; then
-			LIBTOOL=`which libtool`
-		fi
-	fi
-	eaclocal -I build/m4/shamrock -I build/m4/shave $ACLOCAL_FLAGS
-	if test -z "$NO_LIBTOOLIZE"; then
-		${LIBTOOL}ize --force --copy
+	eaclocal -I build/m4/shamrock -I build/m4/shave ${ACLOCAL_FLAGS}
+	if test -z "${NO_LIBTOOLIZE}" ; then
+		_elibtoolize --force --copy
 	fi
+
 	eautoconf
+	eautomake --gnu --add-missing --force --copy
 }
 
 src_configure() {
-	myeconfargs=("--enable-maintainer-mode")
-	use test && myeconfargs+=("--with_unit_tests")
-	use doc || myeconfargs+=("--disable-docs")
-	eautomake --gnu --add-missing --force --copy #nowarn
-	autotools-utils_src_configure
-	./configure || die
-}
+	local myeconfargs=(
+		"--enable-maintainer-mode"
+	)
 
-METAFILETOBUILD=xsp.sln
+	use test && myeconfargs+=( "--with_unit_tests" )
+	use doc || myeconfargs+=( "--disable-docs" )
 
-src_compile() {
-	exbuild xsp.sln
-	if use developer; then
-		exbuild /p:DebugSymbols=True ${METAFILETOBUILD}
-	else
-		exbuild /p:DebugSymbols=False ${METAFILETOBUILD}
-	fi
+	econf "${myeconfargs[@]}"
 }
 
+#src_compile() {
+#	exbuild xsp.sln
+
+#	if use developer ; then
+#		exbuild /p:DebugSymbols=True ${METAFILETOBUILD}
+#	else
+#		exbuild /p:DebugSymbols=False ${METAFILETOBUILD}
+#	fi
+#}
+
 pkg_preinst() {
 	enewgroup aspnet
 	enewuser aspnet -1 -1 /tmp aspnet
@@ -69,7 +71,10 @@ pkg_preinst() {
 }
 
 src_install() {
-	mv_command="cp -ar" autotools-utils_src_install
+	default
+
+	local PATCHDIR="${FILESDIR}/2.2/"
+
 	newinitd "${PATCHDIR}"/xsp.initd xsp
 	newinitd "${PATCHDIR}"/mod-mono-server-r1.initd mod-mono-server
 	newconfd "${PATCHDIR}"/xsp.confd xsp
@@ -78,6 +83,7 @@ src_install() {
 	insinto /etc/xsp4
 	doins "${FILESDIR}"/systemd/mono.webapp
 	insinto /etc/xsp4/conf.d
+
 	# mono-xsp4.service was original name from
 	# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=770458;filename=mono-xsp4.service;att=1;msg=5
 	# I think that using the same commands as in debian
diff --git a/www-servers/xsp/xsp-4.7.1.ebuild b/www-servers/xsp/xsp-4.7.1.ebuild
new file mode 100644
index 000000000000..e5cd0168007c
--- /dev/null
+++ b/www-servers/xsp/xsp-4.7.1.ebuild
@@ -0,0 +1,95 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+USE_DOTNET="net35 net40 net45"
+inherit autotools dotnet systemd user
+
+DESCRIPTION="XSP is a small web server that can host ASP.NET pages"
+HOMEPAGE="http://www.mono-project.com/ASP.NET"
+SRC_URI="https://github.com/mono/xsp/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="developer doc test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="dev-db/sqlite:3"
+DEPEND="${RDEPEND}"
+
+PATCHES=(
+	"${FILESDIR}/aclocal-fix.patch"
+)
+
+METAFILETOBUILD=xsp.sln
+
+src_prepare() {
+	default
+
+	eaclocal -I build/m4/shamrock -I build/m4/shave ${ACLOCAL_FLAGS}
+	if test -z "${NO_LIBTOOLIZE}" ; then
+		_elibtoolize --force --copy
+	fi
+
+	eautoconf
+	eautomake --gnu --add-missing --force --copy
+}
+
+src_configure() {
+	local myeconfargs=(
+		"--enable-maintainer-mode"
+	)
+
+	use test && myeconfargs+=( "--with_unit_tests" )
+	use doc || myeconfargs+=( "--disable-docs" )
+
+	econf "${myeconfargs[@]}"
+}
+
+#src_compile() {
+#	exbuild xsp.sln
+#
+#	if use developer ; then
+#		exbuild /p:DebugSymbols=True ${METAFILETOBUILD}
+#	else
+#		exbuild /p:DebugSymbols=False ${METAFILETOBUILD}
+#	fi
+#}
+
+pkg_preinst() {
+	enewgroup aspnet
+	enewuser aspnet -1 -1 /tmp aspnet
+
+	# enewuser www-data
+	# www-data - is from debian, i think it's the same as aspnet here
+}
+
+src_install() {
+	default
+
+	local PATCHDIR="${FILESDIR}/2.2/"
+
+	newinitd "${PATCHDIR}"/xsp.initd xsp
+	newinitd "${PATCHDIR}"/mod-mono-server-r1.initd mod-mono-server
+	newconfd "${PATCHDIR}"/xsp.confd xsp
+	newconfd "${PATCHDIR}"/mod-mono-server.confd mod-mono-server
+
+	insinto /etc/xsp4
+	doins "${FILESDIR}"/systemd/mono.webapp
+	insinto /etc/xsp4/conf.d
+
+	# mono-xsp4.service was original name from
+	# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=770458;filename=mono-xsp4.service;att=1;msg=5
+	# I think that using the same commands as in debian
+	#     systemctl start mono-xsp4.service
+	#     systemctl start mono-xsp4
+	# is better than to have shorter command
+	#     systemctl start xsp
+	#
+	# insinto /usr/lib/systemd/system
+	systemd_dounit "${FILESDIR}"/systemd/mono-xsp4.service
+
+	keepdir /var/run/aspnet
+}