Merge updates from master

2026-07-15 18:13:10 -04:00 · 2021-09-10 11:41:26 +00:00
parent 1b9775e1a2 ba9fd218cf
commit 38bbff632e
46 changed files with 512 additions and 1424 deletions
--- a/app-misc/navi/Manifest
+++ b/app-misc/navi/Manifest
@@ -2,6 +2,8 @@ DIST aho-corasick-0.7.15.crate 113071 BLAKE2B a22743be74f873b9545648db6a994250e3
 DIST aho-corasick-0.7.18.crate 112923 BLAKE2B 4f6947d1aacf89ccfab0592cdc55fa61ef09cea38231d3f758765dbce328a810c0b588be4ba96e81d64955379ee005722d22a7aec39caea6e72342245d7ca34f SHA512 7a23b16231a90d23ee60ad4c81bc225410599a4560d33d3a203138fc540c39cf1000100fed3aed40dcc371c3635656a3792545dca5dd1aefbde00d8774eebd00
 DIST anyhow-1.0.40.crate 34534 BLAKE2B 79a3731153f8e3ace906b9a360521147fd055f7401a99ea2373501ade7e49ecdb280dd59b6a3b9b2f88e90857302e71f772c767e62cb702e32c8343fd4b0f741 SHA512 5efc7347a7fa72abce9a8b3b76649abb00d73c16c5125aa4b6faaa7040eb5138d7d9470b66c186825c9651272f5c359578503d0866ce7242ea7ca9dc05087165
 DIST anyhow-1.0.42.crate 34827 BLAKE2B adf276a869889819c78dc10cf9ceb310d57fc64dd00b603a16e7b6f111d446ca8ed43439c3f18f590c28c1e59a67cbe39fafb00c510d03b65eb8ba15a18d2b0d SHA512 7bbafa2fc5d78a6d8e68b44b104fd8d6a7882fc127b39e04c5a76240ee24ccf311004b754d93836d6daf1918be9c33fdb68a6baf55eab8f1e921b7aec3a35455
+DIST anyhow-1.0.43.crate 34968 BLAKE2B a846dbc5275906e9f8ec4d5019a0fbff56e16eb970f8f528f2a7e5e2078e39a235d879870ffb92d6af45dc01b730825beb0a346fd6a2de1ddbf076366cd8eada SHA512 d35eb86b3c1676a88fcd9fa8a956f0fb3d3a657caa777e27eb8d5f6a86fec352273c463782dd803a87514c72fe679855d7a379c63bb385df593a5e14c069b7a3
+DIST arrayvec-0.5.2.crate 27838 BLAKE2B 51e2eacae0ef148f3f52d21ae00794e540e7ce4c013fb496dd1347ad91ffbbca199381fffbb064225f829216f6c5e915edfa64833f91fabdd13c3f011d86491f SHA512 1896b5f64b4dbdcff8ad234bda4ea8129bcacf87839347304717e94ee9f369cf5f4371755e453ff7d72817edb8f7fdbc726d77cc4f28ed05148dc89c7714b004
 DIST atty-0.2.14.crate 5470 BLAKE2B 2db856a9e898a430258f059aeaf7c844a153293e8856d90ac81f7d91a888c89198768ad5cb09303c23241fe85c560a55148fa56a303651a82b0edb895616bfab SHA512 d7b6c4b9a0f898d91ddbc41a5ee45bbf45d1d269508c8cc87ee3e3990500e41e0ec387afb1f3bc7db55bedac396dd86c6509f4bf9e5148d809c3802edcc5e1d9
 DIST autocfg-1.0.1.crate 12908 BLAKE2B 40c53cab298e4f26634c3acff3ece6a3371188d91dbf377ed664eabedcde20536edaa93daf406618f37edde019f049a6e7b9a47f627344587dbd126bee2b5e3a SHA512 630b348acb98b012e97804e6325d03c89abc22f2157762c59144c04e6c733daf550bdc7f0fe0b9f3b50e15dae8c1c3c4bdfce3d805b02f0fc987311f5332419b
 DIST bitflags-1.2.1.crate 16745 BLAKE2B 0fa6d3ce44aad7616d5cd02aad8c1d0b0fed4022650eb43067c4a72e6fc88da05442674fa51826e4858a47c9de233e1ba2229820af094197cd11bb416ceffb2b SHA512 ad89b3798845e23737a620bba581c2ff1ff3e15bac12555c765e201d2c0b90ecea0cdbc5b5b1a3fa9858c385e8e041f8226f5acfae5bbbe9925643fff2bf3f0b
@@ -17,6 +19,7 @@ DIST crossbeam-utils-0.8.3.crate 37268 BLAKE2B e9a77f143afab79fc1984902ea756a15e
 DIST crossbeam-utils-0.8.5.crate 38414 BLAKE2B 8a10162cbc54f77737602b6f8574b65a02765577f0e2f59d71e1d87662180fe24a781df542f3e765c4d64b7a0666575157e000766dac138bd4fc0356944092ad SHA512 fd4d2ae10340bb96c22b31190b300aab54e96b8089fd62489e102c76a944e6a16c582a90bc40f5e188f13f841293a4b9becf30830c2ece04f3ce78c29066532f
 DIST crossterm-0.19.0.crate 104572 BLAKE2B 13b341870516c5ce4f3ac1d4f40567a2a465d65f9dbe9f627821bd6dde994fa5f8d9802a1b42f19ff91d5511ef7d03a0b62361fe8addbb18e74c624dbe66c9e9 SHA512 c46c095d73be48a3c1875806547ba708a40abfc8e5cd89514162e0d1636675c4f4e2857ac3b4b32239d14f7ab57a61018b6a919160b2136ae761dbbde726b932
 DIST crossterm-0.20.0.crate 103025 BLAKE2B 8aed50d2df3e3705134f1d20bdd37a8a0b9c16afdff0701073723b038f916f6104d48d646fd3aed8fc93baf4e749f7447149a099829b137055deb9aec00eaa0d SHA512 998d5377b5e204375ba6016da678d3d3a4feb5174092b9e2dd8c8d26d8a5c7f321d60d829262f4b3a962566204fc6e804e3637494be97760e6ef66f888a6ab38
+DIST crossterm-0.21.0.crate 105045 BLAKE2B f79ca91006ed619a3e7a0fa1d5bc9acb2ca76809a83c17dfa351cf6a21ae53b29abf91c6788fc9c22f0a643835fd65fa26cd36a5b58fecce75691e18f88af209 SHA512 b45ffa4b303b1e8733e5ada4866c60184bd2095d6383cde42f5cb0508c5f2d639060d946f9da77d95de5cee4ebb588b877ff0ff4a2fcd41f40928c3fd1f8fde4
 DIST crossterm_winapi-0.7.0.crate 15187 BLAKE2B 5407aca29ccb36473b34527d977fd3fe9d190d2dd940da7077535351458fc0a06af114c145a0f3e741402f2df98a98605a8fb02e2e07c5bb107679a24260fc96 SHA512 5efbe7992b4a19725b5992e0b29a77673e8ecc03d28da35580a5cddaeb32b7e30c7bdb53a2392ebb5b1218617045c306d78451f109d5b836f0e00dcab59e0dfd
 DIST crossterm_winapi-0.8.0.crate 15531 BLAKE2B 663d08cffbf1996d585922ce09d486afa288b998b6509958ee0c89f8ca4ae316c8d404b326961a464435d22bfcb91e9c3fd26a48e90b8b267c40a7ab6f596c17 SHA512 e246db39c7adae89ee1699b6a0ca2f5aec2dd053db0698ee25c320eb315c59be51d6db2193493ebecadeebee5a4b6f3c52c2e9ede8088da7f9d102ff7ac1e936
 DIST directories-next-2.0.0.crate 15153 BLAKE2B 8bbd996cfa72d75fe7177a9d8be7fb6b96ff3fc456b7e06db61cc463a83290765d68f09da3bf8b9e958553b1940ef35f3a4a45d179918ead92f604dd05512470 SHA512 5a0c094dd2e858c59c93655d5abce1282866ced1e7657397c62f959078adc544bb895dbcd2ed578ad7dd0122d8025deb0bbdad955ab2aaf43d9a0dc7d37162d8
@@ -81,9 +84,12 @@ DIST same-file-1.0.6.crate 10183 BLAKE2B a320c8343e0b38078ba81c4f0159d886bf47764
 DIST scopeguard-1.1.0.crate 11470 BLAKE2B f774eb90b7d3ffb2efba47518e9d1dead4017ab4b38a4bd74914daa84a5af4bf9eb63da0496e3924499d79cd0439c37447aeda4a21226f95645bddcd6becfabe SHA512 368fa5726df8f42b599993681579a9ffd0196480ee3cd0f9f671e8493f3bedd1e1779bdf2beb329e77e0005fa09b816e3385f309490c0f2781568db275d4d17d
 DIST serde-1.0.125.crate 75144 BLAKE2B 0823f4cec3704ce5232c266fcb69323dbcd93d2d15712abcc8cc61a2d123d662ae8153a32b3723324ea55a40f2b9101ed654cced45c500fcf399b9d7ccc113b8 SHA512 ed2819d678e7405e2d8a0cc1b43540abf2ad8871eeda4985af5e37016a42b938d7429c4e865cec2ae5364cc7fbe1052a5a46ea51b42c3ed5b9c7c1acb596ac3b
 DIST serde-1.0.127.crate 75162 BLAKE2B 7472c9328b4398bb25bd71febe9483e6255b309d98d2655babe5d16933c5b92a71cb75df8aec3abaff84082bffdc44a549673d30a3cb68888d17157e58b32be0 SHA512 dc2b9c0a71028853bc05b4bdb3db1e9e753dfc588ebcff5dccc42d05252fe250b797e10b4d574f161fe11747c9740e93a47a2eba2b4ffd6ecf1992dfadbdd2ef
+DIST serde-1.0.130.crate 75305 BLAKE2B 3973b70d8e06ab7c2f35e19f23739e8e4dd75dcdcddd818771be5daca8c61f6e2a7a830b4ccb8b3e3898769d7afdeb39ff217bcbf40bbd00867c13bc4668f905 SHA512 e6d6444abadcdac95ff15cdab53736adc9ddd1b6441d67158b6b41e68bee4b7763f9c2d80a857f879f40620429e8f04a90b01380c8c88da45a273c3ad13cfff3
 DIST serde_derive-1.0.125.crate 54155 BLAKE2B c99e9e806831dccb3ccca20675e11f603a7348c433a641a46cf9a448a7a8b7ee242d0d6110780089b08e88b8f33aef5b75e8b1d25e2e6d242a44e9093b2badfa SHA512 dd4e247c9581b437157f37e355bc3335a3927417920acce72e73d6fe05a80e19fb3160c72abede7842e7d54749c33a94335fe9f3468c2f561267b863df368a6f
 DIST serde_derive-1.0.127.crate 54201 BLAKE2B 207c20d2e276a173a1ae0326be307f3d77937442838a7890db923fea434d6e134a9591a07139f8eabb9981aee74dd092d6e2c0a98f17aa67f069faa3dccec6c8 SHA512 2c346d45bb96867ea5b4a0ca24aa9b0584d83f26578f5a1ec8a51c514d0158d98c7b76408a0ea64e5718567afb6a0cfc5922d3c5588a89b7e19035b13b1a0416
+DIST serde_derive-1.0.130.crate 54703 BLAKE2B 35db74464913a93da88b80cf29e4983bcc4377e397618064b1cb397ecbc9e6620c863e4d365153d03ab77ec6dbe9b1d03f8f86aba1adb76fc6d697f39ea7316f SHA512 d3ca974bf8856ed8a73af4eaff69941b35eef187d7e348d6d2ef9ee79eccad893e66270c7d814ac3871e09e21e603d34d7d1f24b182d9b39e9219acd42a7baa8
 DIST serde_yaml-0.8.17.crate 40805 BLAKE2B 8f70ed3efa5afa1f8f45b2c107463799269d745705ac2b90e8ce69c090f4f52721d49723dc48967bdbab30efe853c661631063fe16bc3ceaed4d0158f90ffbcb SHA512 3e7a4baa156ca1d9655a76fbaccd2d87b6929165972f6390316c9d4d55fc9815827e3c4bbb8a1c594f048dcc9c3fd6f4c55370df27f6257dbc28e2066274a7c1
+DIST serde_yaml-0.8.20.crate 42755 BLAKE2B 11cdafde6974107c66d7e1de25c0719d5765ede6800662bb1c82ea80b6c703b6a4c6d427be9e515f11c37acead645fb837d4a7ac6d8176af781c502c5c507c05 SHA512 063fff5b104d8d093a5a1bc1c614f89a1bf6ba817e3e0fcec73849d15f86e91e67f30c7e7e4b3c35405d23d100c007961a1eddaf5c5e5d83075d0d44f8927d77
 DIST shellwords-1.1.0.crate 3965 BLAKE2B ed45861b5b0760e078fad4eb19d0f0891bdcc559ac56187c512313c94c938e36cdfcf9c9d856ee0234413d775e735796a979aa7f312d2ccfd08862a6e6474d02 SHA512 1af48cfd1c09fa21aa436acfadf664a82b0fbccfae0c0ff8f01602ab912e0a4a0adf8677159af8ade9bc99a1df28774fda76ade243d8ac70afe0da8fe3c4098c
 DIST signal-hook-0.1.17.crate 27085 BLAKE2B 0e58cb64b07cb8c76a043f603edbf27bcc92040a1aadb2d0c96993b1ea1a55ef63a222ec51e1396d95bb4907016e1dbf20ba3f0c1915303828f187af44ba2df4 SHA512 253d1478d7a6491a0b423637a706c941cc2a9707d32d29126f48af808daf8acd88e59013936f8e164df687c04e3a8f5c201b5eeb1952e3269b1419efdb4df94f
 DIST signal-hook-0.3.9.crate 48416 BLAKE2B 1075d4b767f3d3c2e556ad1ca2511eee4eea8674989ee76cf4234ebac78f1351291f3dfff72605ec9fe92e978fc9ba25298182564e5a17676fb14441de6bb6e4 SHA512 bcb6cfd4d062ed4a2a83a7fbb35ec90f7dfa5e875807fe6b7c65d0393447b56fee613eac2b3dd08dae0cf2e3cdee920f2c3b3d27ccd1f6f8dbec849c3e6e4261
@@ -92,6 +98,7 @@ DIST signal-hook-registry-1.3.0.crate 17786 BLAKE2B fbd4284bc1020145b92557a99628
 DIST signal-hook-registry-1.4.0.crate 17912 BLAKE2B c50ade90e580e5f009832d812299b33529e53f68e6f1b7f5f9b5ac9ee0de502825c7bbd66199a65d4494152809eaf3dcfb676152c5b4f66c7a38b33551fcdd30 SHA512 b564379e5df1061739734179a69897badf9e2e6b469e091954428b05c3c7143885396df4bd008d77e08dae53729d2267d50fc8563121b086e25d8a5adabf6d6d
 DIST smallvec-1.6.1.crate 26444 BLAKE2B ca6c50a63acdd93a2131654d99e50545a6e2d08eb3e2bd57d4a8ee073d90c08195ee442745a8d62a68179ce7bb8e229b7ff8c6fcf46372a9844bc9280b7c85cb SHA512 9e6061c8211a4485ab54eb541adf40748e1fc3fdfab0849e38e5fd34fc6cc69ae78bd065b788692385a6b8157b031c2fe373900e13d3e56e94fc08d574edaaad
 DIST strip-ansi-escapes-0.1.0.crate 7972 BLAKE2B 39f227ba45b044bced56e944fc0ef147be93338bbfd76be5feb90e73e1faa0e0b337b6ebc6d57fe14dce11ad13e48f6db87d24c28f06b09978520c71b0e3f047 SHA512 6a8da540a7f3f820d64202024e449da7b0dc45832c4c3637cf4c8d6136098579463a1b7108c03923d2582479193e52dbf23039c4b4d0f875384066a611514a45
+DIST strip-ansi-escapes-0.1.1.crate 8668 BLAKE2B e140f9cf55224953f0fc64480cb62a8191ac7fead81cfb891009ffb379085d121c577d6b40b726c52e9eebcedaff617554b0e0b56975048a99dde33b85de367f SHA512 ebcddc0af68f7263726d8f9dc3825819ea75389bc6f97f97f0238b17a06e0596f1562ddcf065178940e4f1963bf7a2b99eb02ec124f9f633b2fab1b443bb5717
 DIST strsim-0.10.0.crate 11355 BLAKE2B bcb25ad0a7284e24e4f17ebe0ccb621bdc4118e499b50b094d98aa7e8fcc0b96716c9953c3516ce7ea78309d41d424892ded595259696a5bbffdcb07802b5c2f SHA512 78b318532addfcf5c1ccc1e14539e258aab9d3cd893cc45d82342549bde838c177d90f13c560671f8f32929af47d0b467db35e6876bd7697d8b3f9e055aeeac1
 DIST syn-1.0.68.crate 231887 BLAKE2B 2e2547391fcd7a9854cfb888448eb89cdfd19ac20e9d909782ff11eb5bbd0b00717b3892199c2c88d005b8fda358ed10828a3f5a123a8d6416910d3b78971d5b SHA512 3023baeacb0164db641e809ac46fa48bdb8ff725e6c767764fa23552d53605dcad3d629f9c7a976a01ad7dd423595575d41c338223df5f7b72c417a97793414e
 DIST syn-1.0.73.crate 232706 BLAKE2B c580f9ab914c54e731c8503c9b9d577d05032edb6bd12d7a183a3c0e3532fcf24196479a9ee40d09cb7e09ba6d94add36e338331affc2625058ce54419621ee4 SHA512 b37beb1b6d483cfdbc44d806af9955cdf52c4b0d5f918782019b089d06e107c7e23ced343a3bece20235a24752783795ebba8e603b61a6302e82ee7027843d8b
@@ -100,16 +107,21 @@ DIST termcolor-1.1.2.crate 17287 BLAKE2B 5ff748064c9fb6663befce2fd299edf6a6deb06
 DIST textwrap-0.12.1.crate 23964 BLAKE2B 4024e84d2e72c7116aa3fc10c64be75da4bd082c8d769f4c0d75db60c988b8f3aba4f9f0ac5010a7fc7747e6ec21acfb280886fb14fc6f57a2a0e880257708c1 SHA512 6076afc86110e978d55cdfde41e05eb847c50da21237d88eec73873547d601ec6cedcc23dad738ccee9ec96e0488dc26ba4d0bf039110698a875541d79db25c2
 DIST thiserror-1.0.24.crate 16580 BLAKE2B 5cda4153e32ea4cf2f4f45fb60f18230dca61bc8d9b76aa598f7336babba8d6615d929ae325c84976ac60f4e8afa803f96d1b2afb6369445934e1e657bd9c846 SHA512 38ff620f1d33041600faaf3162ca0c1cfbe191100b6442513e4076a35296e97e28dedfda25dd0d7613f6a81b6b72816c11ac37424d94baa295142b1002d0e962
 DIST thiserror-1.0.26.crate 16711 BLAKE2B 4524c3ef351eaa1266cbbbafec6082695d5c1485cec7bcfdffd64719fd57efb4e40f119435eae5c6f574a80f59a68bd8c868e2493ddf36f4882e7de65fd4bf93 SHA512 bfe93a14006a3d9e0e996b310718223f8442802a384a1b999c15dd1a25f642c5cb2db7a50a69cbb097ec50ee3b0129b509f19225ca714a5c459d4dfc8255d84b
+DIST thiserror-1.0.29.crate 17455 BLAKE2B 7dda520f7227d638f223f039afdc1e8e0ed0000b8657bdfc0bda2694d26a01051d1c9464502721ffecdb4d3a661497757615880222b68928bb44ab5f1c74d909 SHA512 231ebaa6cb2250fcfa608500076a4d930f625acfafd824abc5e654e0b3faace884d83666633bf2bff61ebb9cc60b61faa234ab2719417bb32af4bf62b1241686
 DIST thiserror-impl-1.0.24.crate 13361 BLAKE2B 4ae667e69d3dbe755cfb07083649c6d41bd5bddcfbe1d8954980e93390fb8eb51ffce6fb2d24c51fb676b6e75051ac66cff8c0cb3ad6683275581749f7c9f9f5 SHA512 4309506b8cf939e6a400542dce772b951d40faff3b2fb765ef87299547615fe18dfb877844b5ce892c594623a2de941a32629e53e2d59b03f611cfefeb169db5
 DIST thiserror-impl-1.0.26.crate 13431 BLAKE2B dc753a4cc1e7b8b3eb44bd9462b6b19ee983fefbfe1f60a974195a536fdbc68395942a229a1d2ec7a8594669a439a6efd3cd22573a647a7fb7a371e793fba645 SHA512 43eea818b72469bc4d5c28e449c2e284c1e11b2674b9e67b1788af7ab66bd64afabfd8f5861938a7f9547a9c13387e0ce400419c6283bbe1e899d18d998cd921
+DIST thiserror-impl-1.0.29.crate 15201 BLAKE2B f346e746fdb2ce83f2c8e7b58772b54721191470e0b5d771fbdff19f598fb8a1bd94038ab603370e037b751e028c79d85b56dae25a302c91dbcc643ca1d26cae SHA512 edcc1d7cdb7035f9a3667b8f9509e00f70dfd515ba8594cbb0562b8732380a0c1b405a47e7ec4d5fdc5bbe870be69332205f0dd15ff39396cbeacb798483f553
 DIST unicode-segmentation-1.7.1.crate 93066 BLAKE2B 80058a79c64972dfff897b08a24e9f18ae0fa312a50f86fc321961eeab83c5546bdbc30534315870d891e648bde1d7d77f459ec9744455bdebb94bf6e326f2ef SHA512 183ca68d456a8d53e6f255129e8fd07b87d8da23b8f18187231d6fa70dac80e4069eb6c501d45155d9f0050b6bd713964e55f0e4b25a40546c4d245a17fc8dc6
 DIST unicode-width-0.1.8.crate 16732 BLAKE2B 5aa7b87eef1322e4151a3fcf981ade311b8fa030527d7561815950e58d3f15156163dfe34da6a708c37dccc3f7652bf7fc2cd899fe8bb0118b67c4113ff3a2d2 SHA512 0abba6da6981a2451e01d93bbd47652c46eb6fb07cc0214f33259fb29945bfd5ee2b302e883ddca8f68e921635f222701b7310e7da2a5e225f854980d1e474b0
 DIST unicode-xid-0.2.1.crate 14392 BLAKE2B 7f8f91b9c4df55f2137b754208d4f2997a290acfc9393ee2dcda8195eda25cb342e56ad123f56bb298d93db5248a749c18a982423c9a0e85ce93f7a1eb55d289 SHA512 91e862137e837baea82829431cfed36634fdb05339f00c756eb5a4b429ef0bb871f5133d11adf9a023fa22168c8a0cf194ff3669779f04f219d48fc4fac339d2
 DIST unicode-xid-0.2.2.crate 14955 BLAKE2B 6c6da49ac08dbd8b3248272224d6bff96b9cd1f36029b1937a58a0b929c3a48326053305ed49e73edd70f572f5abbc4817cedc899c69e3457805ad056669f6af SHA512 92ffd0dd34e3ca235ecf110b38c447d3ec1faa23d76c112457f28d432f92fa6b5f428bc5e1bfd278f361f55426dd96e19ecb0d3eff6cf250892f069c52bd89a8
 DIST utf8parse-0.1.1.crate 13995 BLAKE2B 6b1de4afdb2837a76637de72f6e6a81e73aa683d8da04ebc94cf7ee3c542845d2244e721840511ee2725320f2f882722e2bea67914435131d7af1ab29291d1eb SHA512 543d4daddce8248b181deb1c3952ca15303d78616480b23af163ca6253a059b5ce9494652839a051c48a47816c3dd719465bbe5bb7930db676a16bcdac47c517
+DIST utf8parse-0.2.0.crate 13392 BLAKE2B 05296f48fe429a871f42e729e3540ec3a974a69892c6bc9da95e23c0aee2163c9b115a9614eb1943363076793e17ac4c89e28066a9816cab30c451524a5832c0 SHA512 1f6a2eca32e42c8e4b53d28c4fea54c426ed66fc01447b3cf8fc0fd75694453eadbe3ba000ac8ee0347d16dbfec47681254117949109081798eab5370886827c
 DIST vec_map-0.8.2.crate 14466 BLAKE2B 8f109fbff19604b82ea2aa61c952e2ce9b5597ccc8e1ef4e847648e2de08dece8c4debe92889edeccb8d393645fd0b62436b49d236ded7ad181c4a51239a9539 SHA512 4f1ef59bc2c437e79f1f84fe021bce5aa8ccd581f500f3d5776913d5f17d45b03ccee64f5bd03d47656318cfc9344a1f4311079d471fa409a8e4e94c143973f9
 DIST version_check-0.9.3.crate 12547 BLAKE2B 85761c300a8d755e0b376191ef0604728ae641261fdb10682a3134a828eadc4a33216426d286bcdbd8d0c5fcfe6ca8ba20ed078c4f53066b959739a0e73daec0 SHA512 4b3b428214a0322af536a18e6f050438398766af6589389f20a804121a6721962ba411e2dcfded60aaa74313128fb0e831bea31378e2695c29b29bdc24d7cbfd
+DIST vte-0.10.1.crate 24947 BLAKE2B c7e94b7bba2423d14e5aa85f94dba856a6c984261551f204f029c55ef923c0012b259e5b229974b54b4eb5da1e85bae3c8cdb680372b5f9dc6caf51d1075b0ba SHA512 0c8fed2cfca5ad07d2a146e1e26979d390347a409cdc2b960246fc2fadd85019b9febf2dfd618f7a144493084b55f285c58ef5204e613bd9013af26faa9f2033
 DIST vte-0.3.3.crate 2397439 BLAKE2B 213fccf5b1f09b2d23bca57be2abec0a3580ab01864c51dd364676f5c66decc5184ef15f0e484f9a94e892f118863655f4b2ed2a340a47276b3fe7b4db901dec SHA512 5e00e8409ef21edb5aa6fbe482785fd5969dd17a6695f82328c4ae12ea8622712dc3473f33832fdfe0cc2395411431fd47842e86e35022149d5e958c4e5f8fe9
+DIST vte_generate_state_changes-0.1.1.crate 2422 BLAKE2B 6e8fb4ce0ca0fd6b9a4dcccdfb02445babbc13d47de5fae9bbb81e8c67ada8a40e8dc5e57c120c36876293b111ccc71e1069ea3fdabade6f9ba5ea2d44ff4632 SHA512 ba09352e037cbd279cbf5641c9783a24f76e54f1f09e13f0ab1ca99c9646c1e3c958e8e302d7cc88431073bad2e2d5619410f2f93f96f1db25f0f0ded0236f7e
 DIST walkdir-2.3.2.crate 23516 BLAKE2B 473f2b51aafd6ac17e5c3da8d545d179b31486b3a65ab39fbd8bd7fbb2ebcc24bebf01781200a26a68f0b1cb464f5763a919aead3b03eba5a7e1be6efec5500b SHA512 6c44071354faf37720ec4117ded34c8d530489542ee107ac26a7a56ef4a882b9003e22e84f1d61f6078643521343e35aa1f7b57c838779e78e5937a667bf82da
 DIST wasi-0.10.2+wasi-snapshot-preview1.crate 27505 BLAKE2B 4eb8644b945633d6e856ad80dd74990be19eb6af99823b147163384f61d471e2d9ec054d78a7064072344be53783e57073e8fffc6d5555c149b4834a9bf31dba SHA512 06977a294d76369a3867c45abdd8a87ea5c84e5a3681075ba0d14af1aee3114ff24495c7e7f7fe1e6e42230e65fba0e062898e69bc89e0209af62c2d14094ec7
 DIST which-4.1.0.crate 7684 BLAKE2B 4d8eb0a263c14b506f446fa808d9326c6e4e781cc2d79a1f6efcf7b9bb9a294d3266a2f3de4526ac0ec08ca65a18622ac064e9ae1e86dd1b325b122f684371f8 SHA512 4fffd3dd4ac73f5c232ee8a53bbc948a7295a2a51ec3f792d5d0aa84ceb6c2322fc11b35d29f5d3181c763b34c434c5ea2807ae6cc3393cd30d68b0fd44c7a22
--- a/app-misc/navi/navi-9999.ebuild
+++ b/app-misc/navi/navi-9999.ebuild
@@ -1,13 +1,14 @@
-# Copyright 2017-2021 Gentoo Authors
+# Copyright 2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2

-# Auto-Generated by cargo-ebuild 0.3.2
+# Auto-Generated by cargo-ebuild 0.4.0

-EAPI=7
+EAPI=8

 CRATES="
 	aho-corasick-0.7.18
-	anyhow-1.0.42
+	anyhow-1.0.43
+	arrayvec-0.5.2
 	atty-0.2.14
 	autocfg-1.0.1
 	bitflags-1.2.1
@@ -18,7 +19,7 @@ CRATES="
 	crossbeam-deque-0.8.0
 	crossbeam-epoch-0.9.5
 	crossbeam-utils-0.8.5
-	crossterm-0.20.0
+	crossterm-0.21.0
 	crossterm_winapi-0.8.0
 	directories-next-2.0.0
 	dirs-sys-next-0.1.2
@@ -64,29 +65,30 @@ CRATES="
 	remove_dir_all-0.7.0
 	same-file-1.0.6
 	scopeguard-1.1.0
-	serde-1.0.127
-	serde_derive-1.0.127
-	serde_yaml-0.8.17
+	serde-1.0.130
+	serde_derive-1.0.130
+	serde_yaml-0.8.20
 	shellwords-1.1.0
 	signal-hook-0.3.9
 	signal-hook-mio-0.2.1
 	signal-hook-registry-1.4.0
 	smallvec-1.6.1
-	strip-ansi-escapes-0.1.0
+	strip-ansi-escapes-0.1.1
 	strsim-0.10.0
 	syn-1.0.73
 	tempfile-3.2.0
 	termcolor-1.1.2
 	textwrap-0.12.1
-	thiserror-1.0.26
-	thiserror-impl-1.0.26
+	thiserror-1.0.29
+	thiserror-impl-1.0.29
 	unicode-segmentation-1.7.1
 	unicode-width-0.1.8
 	unicode-xid-0.2.2
-	utf8parse-0.1.1
+	utf8parse-0.2.0
 	vec_map-0.8.2
 	version_check-0.9.3
-	vte-0.3.3
+	vte-0.10.1
+	vte_generate_state_changes-0.1.1
 	walkdir-2.3.2
 	wasi-0.10.2+wasi-snapshot-preview1
 	which-4.1.0
@@ -101,7 +103,7 @@ inherit cargo

 DESCRIPTION="An interactive cheatsheet tool for the command-line"
 HOMEPAGE="https://github.com/denisidoro/navi"
-SRC_URI="$(cargo_crate_uris ${CRATES})"
+SRC_URI="$(cargo_crate_uris)"

 if [[ ${PV} == 9999 ]]; then
 	inherit git-r3
--- a/dev-R/BH/BH-1.75.0.0.ebuild
+++ b/dev-R/BH/BH-1.75.0.0.ebuild
@@ -13,9 +13,10 @@ HOMEPAGE="
 	https://cran.r-project.org/package=BH
 "
 SRC_URI="mirror://cran/src/contrib/${MY_P}.tar.gz"
+
 LICENSE='Boost-1.0'
 KEYWORDS="~amd64"
-DEPEND="~dev-libs/boost-1.75.0"
+DEPEND=">=dev-libs/boost-${PV}"
 RDEPEND="${DEPEND}"

 src_prepare() {
--- a/dev-cpp/vexcl/vexcl-1.4.2-r1.ebuild
+++ b/dev-cpp/vexcl/vexcl-1.4.2-r1.ebuild
@@ -26,7 +26,6 @@ IUSE_BACKEND="
 	+backend-opencl
 "
 #	backend-cuda
-IUSE_EXPAND="BACKEND"
 IUSE="${IUSE_BACKEND} amdsi clhpp examples test" #clogs

 RDEPEND="
--- a/dev-libs/StringiFor/Manifest
+++ b/dev-libs/StringiFor/Manifest
@@ -1,4 +1,8 @@
 DIST BeFoR64-1.1.4.tar.gz 32928 BLAKE2B ef5ca349508525c48843c613ef945f33e165069d2ade3f98acf25810daa22617d8c5fe45c4127d3eef36a5358cc1052237e6d94fce0ab4ae289a28a0d9c99b48 SHA512 26b0fa2cb754fa0f3809f5de29136073fdd399d0b192a5d97b67759a1a9f68fd59894f5fa9a805c7626732b63f18990922d88b110bd6d4ccdd5218fd330a4c81
+DIST BeFoR64-1.1.4_p20201012.tar.gz 37269 BLAKE2B 6930f3d9ce2c0f3f93d7c9a9e0662c65de3f3cef9b701b864033c98499b5d1d2fdee97da9efadcce7c3d1e4aec49b5223dd24e86c2cfd317620407f8d07b6e3e SHA512 6e4c49a7f4eb32cf1ecc0db335e315bdf82f0f46cf1075811394646264da023a30afbccd00c73619b6c93cf5d6daefc4a36e5f1fe44060f0f8131418a7e71f70
 DIST FACE-1.1.2.tar.gz 159747 BLAKE2B 007c6bfc4148649a28f322f451f665750dc7cca515fae3c3d9b96694ea20ed0586471b9def43c92039bdf9450a1ebf9a927e5d50e8df4ea829284f41c331464e SHA512 e9eb336923780bf1a1b37a5f897a72181599bf843e91f118d4d418aebf26489bdeaedbd9025b8abda446b7bdb5e97746346e68ff6357d159a675d0aca3a3ee4c
+DIST FACE-1.1.2_p20201005.tar.gz 157807 BLAKE2B f263abdb64b1153eb4eedf9e65a28614ff20bacf59f635d6ddfaa4e30cc47521fde8ae885e961b52fa8b86c7133fea4e67f7dde8676b25a0df8f1e28008a84f7 SHA512 9fb594211d583ef7176787f02268afa95700bf8a1905d26c51c5e40982fffb42b1b08e83f524d81d420981d607245c36e2a4a69464f8b1c5ae7c75c03643950d
 DIST PENF-1.2.2.tar.gz 143245 BLAKE2B d59353195c7502514091ad0a4dae42d9c3d5e8b383160f46e512ce42ed242539347683c5d79ae6a2093feee428af6137f6ecf8673c54ac15dc13a7029984dcf2 SHA512 12086abad9bdf552a9f41f862819a9fe6d91b18827515473f3ec36722fcd593cdb5d01a6769567dbc91238233d706ae4f2520e7767556e17b0dcb42e10999571
+DIST PENF-1.2.2_p20201012.tar.gz 142299 BLAKE2B 253697c67c62ffc4f7b32375a1451913b178dbf3d79f0c7eab76a14c9f6969df65ce8b9422c0851a819065a979d0935724bc3121a48fb40a1c963880c375670d SHA512 14b6246c0e6c8f4a4602bac22c1d8f6fd89ca174c7a6539d5da97c0bbe4049891117b0a469e72472ca5dbac44b613b806ed050a41a357b96cf939a525e3cb307
 DIST StringiFor-1.1.1.tar.gz 80098 BLAKE2B d42774323703550355b90ce706e62356a30cb4a27a37622841c28bbff9f9504ce7da8997222f6a0bb1e5ec56894ffdd679dc1a5b2a8f8bb353580491554fbce7 SHA512 14639dbb62e2b1ccb9cdb3c8100da7da8ff7d2a06d304bce2a9e8574e52adbd2f589f0017498ce7489f4977acdc99cfc889a5a752bc8efd58da41cea104c0712
+DIST StringiFor-1.1.3.tar.gz 83606 BLAKE2B 5cd00941d2ac8c7fbe501e7fed0747f8c4ae5f61edf336a86ea89f9fd500ee016e97664ca0bbcdbcfd4c007c203fdc4fbbdbef617c0d0d115b5a96dd89b98fbf SHA512 d1a1a7848cec657544ec4fab5517cb19fbf2b8655500c86d2b4dd0fc6bdb143c4929770b0e61c7e2d9c7b5660ca8e7e6cf283bb4744d17ca252cc8e71a08c163
--- a/dev-libs/StringiFor/StringiFor-1.1.3.ebuild
+++ b/dev-libs/StringiFor/StringiFor-1.1.3.ebuild
@@ -0,0 +1,100 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+FORTRAN_STANDARD=2003
+
+inherit  fortran-2 toolchain-funcs
+
+# Unfortunately the releases don't have appropriate release-tags
+# so there commits sha-1 checksum are used
+StringiFor_sha="bad95cb8c1ae0f17dd3e15acd6bc2a8cde4bb606"	# StringiFor-1.1.3 (18 jun 2021)
+BeFoR64_sha="e222ede7f1207f74acafd30c6c6e1d3585b5bb74"		# BeFoR-1.1.4_p20201012 (12 oct 2020)
+FACE_sha="748688899f73bcb0d2723f5c00e3d0fe13648167"		# FACE-1.1.2_p20201005 (5 oct 2020)
+PENF_sha="b146a7d6444e0cd8a42a20452a7c4a4f4f16c667"		# PENF-1.2.2_20201012 (12 oct 2020)
+
+DESCRIPTION="StringiFor, Strings Fortran Manipulator, yet another strings Fortran module"
+HOMEPAGE="https://github.com/szaghi/StringiFor"
+SRC_URI="
+	https://github.com/szaghi/${PN}/archive/"${StringiFor_sha}".tar.gz -> ${P}.tar.gz
+	https://github.com/szaghi/BeFoR64/archive/"${BeFoR64_sha}".tar.gz -> BeFoR64-1.1.4_p20201012.tar.gz
+	https://github.com/szaghi/FACE/archive/"${FACE_sha}".tar.gz -> FACE-1.1.2_p20201005.tar.gz
+	https://github.com/szaghi/PENF/archive/"${PENF_sha}".tar.gz -> PENF-1.2.2_p20201012.tar.gz
+"
+
+S="${WORKDIR}/${PN}-${StringiFor_sha}"
+
+# For FOSS projects: GPL-3
+# For closed source/commercial projects: BSD 2-Clause, BSD 3-Clause, MIT
+LICENSE="GPL-3 BSD-2 BSD MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+IUSE="static-libs test"
+RESTRICT="!test? ( test )"
+
+BDEPEND="dev-util/FoBiS"
+
+PATCHES=(
+	"${FILESDIR}/stringifor-1.1.1_fobos_soname.patch"
+	"${FILESDIR}/stringifor-1.1.3_fix_tests.patch"
+)
+
+set_build_mode() {
+	case $(tc-getFC) in
+		*gfortran* )
+			BUILD_MODE_SHARED="-mode stringifor-shared-gnu"
+			BUILD_MODE_STATIC="-mode stringifor-static-gnu"
+			BUILD_MODE_TESTS="-mode tests-gnu" ;;
+		*ifort* )
+			BUILD_MODE_SHARED="-mode stringifor-shared-intel"
+			BUILD_MODE_STATIC="-mode stringifor-static-intel"
+			BUILD_MODE_TESTS="-mode tests-intel" ;;
+		* )
+			die "Sorry, GNU gfortran or Intel ifort are currently supported in the ebuild" ;;
+	esac
+}
+
+pkg_setup() {
+	fortran-2_pkg_setup
+	set_build_mode
+}
+
+src_prepare() {
+	mv -T "${WORKDIR}"/BeFoR64-"${BeFoR64_sha}" "${S}"/src/third_party/BeFoR64
+	mv -T "${WORKDIR}"/FACE-"${FACE_sha}" "${S}"/src/third_party/FACE
+	mv -T "${WORKDIR}"/PENF-"${PENF_sha}" "${S}"/src/third_party/PENF
+	default
+
+	sed -i -e 's:\$OPTIMIZE    = -O2:\$OPTIMIZE    = '"${FFLAGS}"':' \
+		-e '/^\$LSHARED/s:$: '"${LDFLAGS}"':' fobos || die
+}
+
+src_compile() {
+	FoBiS.py build -verbose -compiler custom -fc $(tc-getFC) ${BUILD_MODE_SHARED}
+	use static-libs && FoBiS.py build -verbose -compiler custom -fc $(tc-getFC) ${BUILD_MODE_STATIC}
+}
+
+src_test() {
+	FoBiS.py build -compiler custom -fc $(tc-getFC) ${BUILD_MODE_TESTS}
+	for e in $( find ./exe/ -type f -executable -print ); do
+		if [ "$e" != "./exe/stringifor_test_parse_large_csv" ] ; then
+			echo "  run test $e :" && $e
+		else
+			# The output of this test is too huge so it's cutted here
+			echo "  run test $e :" && $e | tail -n 10
+		fi
+	done
+}
+
+src_install() {
+	mv lib/mod lib/stringifor
+	doheader -r lib/stringifor/
+
+	mv lib/libstringifor.so{,.1}
+	dosym libstringifor.so.1 /usr/$(get_libdir)/libstringifor.so
+	dolib.so lib/libstringifor.so.1
+
+	use static-libs && dolib.a lib/libstringifor.a
+}
--- a/dev-libs/StringiFor/files/stringifor-1.1.3_fix_tests.patch
+++ b/dev-libs/StringiFor/files/stringifor-1.1.3_fix_tests.patch
@@ -0,0 +1,22 @@
+diff -Naur a/src/third_party/FACE/src/tests/face_test_ucs4.F90 b/src/third_party/FACE/src/tests/face_test_ucs4.F90
+--- a/src/third_party/FACE/src/tests/face_test_ucs4.F90
+++ b/src/third_party/FACE/src/tests/face_test_ucs4.F90
+@@ -2,9 +2,10 @@
+ program face_test_ucs4
+ !< FACE test.
+ use face
+use iso_fortran_env
+ 
+ implicit none
+-#ifdef UCS4_SUPPORTED
+
+ character(kind=UCS4, len=:), allocatable :: string_1 !< A string.
+ character(kind=UCS4, len=:), allocatable :: string_2 !< A string.
+ character(kind=UCS4, len=:), allocatable :: string_3 !< A string.
+@@ -13,5 +14,5 @@
+ string_2 = colorize(UCS4_' ÜÇŞ4', color_fg='red')
+ string_3 = colorize(' World', color_fg='blue')
+ print '(A)', string_1//string_2//string_3
+-#endif
+
+ endprogram face_test_ucs4
--- a/dev-python/pytest-marks/Manifest
+++ b/dev-python/pytest-marks/Manifest
@@ -1 +0,0 @@
-DIST pytest-marks-0.4.tar.gz 1978 BLAKE2B 1f9898d860734e940b77f926bc7513e9c1d26d4dc45b9f876378974db393b41f8e9c24073306c6d299d3a70d60d40ecea35efdf4e50aa861678837cf4626c46f SHA512 4c1b6bb88c022661705e31cdf0b2d25c4e6fe09a4f8632662410d0c7ab3e436c6091ee88620b7c6660c4194f7afaedeb11ae4eac6476e447b6653c6ac7668d7b
--- a/dev-python/pytest-marks/metadata.xml
+++ b/dev-python/pytest-marks/metadata.xml
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-
-<pkgmetadata>
-	<!-- maintainer-needed -->
-</pkgmetadata>
--- a/dev-python/pytest-marks/pytest-marks-0.4.ebuild
+++ b/dev-python/pytest-marks/pytest-marks-0.4.ebuild
@@ -1,20 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8} )
-
-DISTUTILS_USE_SETUPTOOLS=rdepend
-
-inherit distutils-r1
-
-DESCRIPTION="Allow to set 'marks' on pytest methods"
-HOMEPAGE="https://github.com/adamgoucher/pytest-marks"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-3"
-KEYWORDS="~amd64 ~x86"
-SLOT="0"
-
-RDEPEND="dev-python/pytest[${PYTHON_USEDEP}]"
--- a/games-util/legendary/Manifest
+++ b/games-util/legendary/Manifest
@@ -1,2 +1,2 @@
-DIST legendary-0.20.6.tar.gz 81331 BLAKE2B eda64a90c3882ed45e36efbb15170777d20902938c3c7dc0688f2ad3808ed3fdc583a809021a6bc4ac39f67fd00da7160377f418cf071974106a5faedfc352d9 SHA512 4caf5fe52d087559ef529040ee60034a03b53e0427dcb054cc840713737a6d0f235c779d5019aab9467264b9507042a24f57e1a90231d71c0037064714a745ce
+DIST legendary-0.20.10.tar.gz 88114 BLAKE2B a6ad8ba010b413d3b6155d5748f42656ae1077e8c01e132e03f0ff0b154895d039206e989f8d411d874801f3d378206462f4762c910456063befc97583483646 SHA512 e0366031ea501a77a2128bb30701b02df6a9160440508839874d8a448213eba95e156f6aa2dd988911c5f315ca44756c131b40363c7ccf9abcb44331fc3dba4b
 DIST legendary-0.20.9.tar.gz 86250 BLAKE2B 56b0c59b87a4bae59a9e6c2bdd104867778f94dbc7abe6108fdd29175a15a5ee4b27def9f9187c12bf5db366c86702fca214659e8bd53036d161a777e78979c9 SHA512 ed634f12039c554496af863ba5f908b5ed13f17a2a1fd1b63d2a7ddc209f1f48ee6f6f3e5f07e8b8da3289cb0baeb60d182cc5e239166dbbfb372e620106b72f
--- a/games-util/legendary/legendary-0.20.10.ebuild
+++ b/games-util/legendary/legendary-0.20.10.ebuild
@@ -1,10 +1,11 @@
-# Copyright 2020 Gentoo Authors
+# Copyright 2020-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2

-EAPI=7
+EAPI=8

-PYTHON_COMPAT=( python3_{8,9} )
+PYTHON_COMPAT=( python3_{8,9,10} )
 DISTUTILS_SINGLE_IMPL=1
+DISTUTILS_USE_SETUPTOOLS="bdepend"

 inherit distutils-r1

--- a/net-libs/usockets/Manifest
+++ b/net-libs/usockets/Manifest
@@ -1 +1 @@
-DIST usockets-0.7.1_p20210214.tar.gz 62372 BLAKE2B 2853792af6f86954d7920cd33936ddd586cdeb9149dbffd0687b3bbc0965526d28c363864398d17182df9e038c35dc384271f01e72f7a60189319b9e820de3cb SHA512 d4827982a288c81edfcb167cfa6ee8fe11bbae90d25ed9086c006cf6098dfad8b6b910f8fb93ecc67fbea76452627dd4666c7ae3d74fb20112f8e22f7091ec11
+DIST usockets-0.7.1_p20210909.tar.gz 65495 BLAKE2B 23aeb6ec3c330926aa375f0dedf4eb0e63f89fd833145cc3af47936de8ffa2139273710eee7019c2f5c12d7715746a38a6b64a3e48a349a2893599116ca623d8 SHA512 29bac37a75172cdb2881b27d142972a235470e8e0ec85e98c1bfd5f587ab1f777001e69a57bfc46b87a74bf73f4a166300e42e9f0ed908810bcf5c46290abdce
--- a/net-libs/usockets/files/usockets-0.7.1_p20210909-Makefile.patch
+++ b/net-libs/usockets/files/usockets-0.7.1_p20210909-Makefile.patch
@@ -1,8 +1,8 @@
 diff --git a/Makefile b/Makefile
-index 9b54cac..a610bcc 100644
+index b809ac0..857a1f7 100644
 --- a/Makefile
 +++ b/Makefile
-@@ -1,60 +1,59 @@
+@@ -1,72 +1,69 @@
 +DESTDIR ?=
 +
 +prefix ?=	/usr
@@ -17,7 +17,7 @@ index 9b54cac..a610bcc 100644
 +LIBTARGET =	libusockets.so.$(VERSION)
 +
 +REQUIRES =
-+COMMON_FLAGS =	-Isrc
+COMMON_FLAGS =	-fPIC -Isrc
 +
 # WITH_OPENSSL=1 enables OpenSSL 1.1+ support or BoringSSL
 # For now we need to link with C++ for OpenSSL support, but should be removed with time
@@ -47,14 +47,21 @@ index 9b54cac..a610bcc 100644
 +REQUIRES +=	libuv
 endif
 
+-# WITH_ASIO builds with boot asio event-loop
+# WITH_ASIO builds with boost asio event-loop
+ ifeq ($(WITH_ASIO),1)
+-	override CFLAGS += -DLIBUS_USE_ASIO
+-	override LDFLAGS += -lstdc++ -lpthread
+-	override CXXFLAGS += -pthread -DLIBUS_USE_ASIO
+COMMON_FLAGS +=	-pthread -DLIBUS_USE_ASIO
+ endif
+ 
 -# WITH_GCD=1 builds with libdispatch as event-loop
 -ifeq ($(WITH_GCD),1)
 -	override CFLAGS += -DLIBUS_USE_GCD
 -	override LDFLAGS += -framework CoreFoundation
 -endif
-+CFLAGS +=	-std=c11 $(COMMON_FLAGS)
-+CXXFLAGS +=	-std=c++17 $(COMMON_FLAGS)
- 
+-
 -# WITH_ASAN builds with sanitizers
 -ifeq ($(WITH_ASAN),1)
 -	override CFLAGS += -fsanitize=address -g
@@ -63,16 +70,24 @@ index 9b54cac..a610bcc 100644
 -
 -override CFLAGS += -std=c11 -Isrc
 -override LDFLAGS += uSockets.a
-
-# By default we build the uSockets.a static library
+CFLAGS +=	-std=c11 $(COMMON_FLAGS)
+CXXFLAGS +=	-std=c++17 $(COMMON_FLAGS)
+ 
+ # By default we build the uSockets.a static library
 default:
 -	rm -f *.o
 -	$(CC) $(CFLAGS) -flto -O3 -c src/*.c src/eventing/*.c src/crypto/*.c
+	$(CC) $(CFLAGS) -c src/*.c src/eventing/*.c src/crypto/*.c
+ # Also link in Boost Asio support
+ ifeq ($(WITH_ASIO),1)
+-	$(CXX) $(CXXFLAGS) -Isrc -std=c++14 -flto -O3 -c src/eventing/asio.cpp
+	$(CXX) $(CXXFLAGS) -c src/eventing/asio.cpp
+ endif
+-
 -# For now we do rely on C++17 for OpenSSL support but we will be porting this work to C11
-+	$(CC) $(CFLAGS) -fPIC -c src/*.c src/eventing/*.c src/crypto/*.c
 ifeq ($(WITH_OPENSSL),1)
 -	$(CXX) $(CXXFLAGS) -std=c++17 -flto -O3 -c src/crypto/*.cpp
-+	$(CXX) $(CXXFLAGS) -fPIC -c src/crypto/*.cpp
+	$(CXX) $(CXXFLAGS) -c src/crypto/*.cpp
 endif
 -	$(AR) rvs uSockets.a *.o
 -
@@ -80,14 +95,13 @@ index 9b54cac..a610bcc 100644
 -.PHONY: examples
 -examples: default
 -	for f in examples/*.c; do $(CC) -flto -O3 $(CFLAGS) -o $$(basename "$$f" ".c") "$$f" $(LDFLAGS); done
-
-swift_examples:
-	swiftc -O -I . examples/swift_http_server/main.swift uSockets.a -o swift_http_server
 +	$(AR) rvs libusockets.a *.o
-+	$(CC) -shared -o $(LIBTARGET) *.o -Wl,-soname,$(LIBTARGET) `$(PKG_CONFIG) --libs $(REQUIRES)` $(LDFLAGS)
+	$(CXX) $(CXXFLAGS) -shared -o $(LIBTARGET) *.o -Wl,-soname,$(LIBTARGET) `$(PKG_CONFIG) --libs $(REQUIRES)` $(LDFLAGS)
 +	sed -e "s:@PREFIX@:$(prefix):" -e "s:@REQUIRES@:$(REQUIRES):" \
 +	-e "s:@LIB@:$(LIB):" -e "s:@VERSION@:$(VERSION):" libusockets.pc.in > libusockets.pc
-+
+ 
+-swift_examples:
+-	swiftc -O -I . examples/swift_http_server/main.swift uSockets.a -o swift_http_server
 +install:
 +	install -d "$(DESTDIR)$(libdir)/pkgconfig" "$(DESTDIR)$(includedir)"
 +	install -m 644 src/libusockets.h "$(DESTDIR)$(includedir)/"
--- a/net-libs/usockets/metadata.xml
+++ b/net-libs/usockets/metadata.xml
@@ -6,6 +6,7 @@
 		<name>Aisha Tammy</name>
 	</maintainer>
 	<use>
+		<flag name="asio">Enable bindings to use the boost asio dispatcher</flag>
 		<flag name="libuv">Enable bindings to use the libuv dispatcher</flag>
 	</use>
 </pkgmetadata>
--- a/net-libs/usockets/usockets-0.7.1_p20210214-r2.ebuild
+++ b/net-libs/usockets/usockets-0.7.1_p20210214-r2.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} == 9999 ]]; then
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/uNetworking/uSockets.git"
 else
-	COMMIT=5440dbac79bd76444175b76ee95dfcade12a6aac
+	COMMIT="c06112c89b4c1cf5a09b5f8daa2def756b925889"
 	SRC_URI="https://github.com/uNetworking/uSockets/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
 	KEYWORDS="~amd64 ~arm64 ~x86"
 	S="${WORKDIR}/uSockets-${COMMIT}"
@@ -20,24 +20,27 @@ fi

 LICENSE="Apache-2.0"
 SLOT="0"
-IUSE="libuv +ssl"
+IUSE="asio libuv +ssl"
+REQUIRED_USE="?? ( asio libuv )"

 DEPEND="
+	asio? ( dev-cpp/asio[ssl?] )
 	libuv? ( dev-libs/libuv )
 	ssl? ( >=dev-libs/openssl-1.1.0 )
 "
 RDEPEND="${DEPEND}"

 PATCHES=(
-	"${FILESDIR}/${PN}-0.7.1-Makefile.patch"
+	"${FILESDIR}/${PN}-0.7.1_p20210909-Makefile.patch"
 )

 src_configure() {
 	tc-export CC CXX AR
 	export VERSION="${PV%_*}" \
 	       LIB="$(get_libdir)" \
-	       WITH_OPENSSL="$(usex ssl 1 0)"
-	       WITH_LIBUV="$(usex libuv 1 0)"
+	       WITH_OPENSSL="$(usex ssl 1 0)" \
+	       WITH_LIBUV="$(usex libuv 1 0)" \
+	       WITH_ASIO="$(usex asio 1 0)"
 	default
 }

--- a/net-libs/usockets/usockets-9999.ebuild
+++ b/net-libs/usockets/usockets-9999.ebuild
@@ -12,31 +12,35 @@ if [[ ${PV} == 9999 ]]; then
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/uNetworking/uSockets.git"
 else
-	SRC_URI="https://github.com/uNetworking/uSockets/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	COMMIT="c06112c89b4c1cf5a09b5f8daa2def756b925889"
+	SRC_URI="https://github.com/uNetworking/uSockets/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
 	KEYWORDS="~amd64 ~arm64 ~x86"
-	S="${WORKDIR}/uSockets-${PV}"
+	S="${WORKDIR}/uSockets-${COMMIT}"
 fi

 LICENSE="Apache-2.0"
 SLOT="0"
-IUSE="libuv +ssl"
+IUSE="asio libuv +ssl"
+REQUIRED_USE="?? ( asio libuv )"

 DEPEND="
+	asio? ( dev-cpp/asio[ssl?] )
 	libuv? ( dev-libs/libuv )
 	ssl? ( >=dev-libs/openssl-1.1.0 )
 "
 RDEPEND="${DEPEND}"

 PATCHES=(
-	"${FILESDIR}/${PN}-0.7.1-Makefile.patch"
+	"${FILESDIR}/${PN}-0.7.1_p20210909-Makefile.patch"
 )

 src_configure() {
 	tc-export CC CXX AR
 	export VERSION="${PV%_*}" \
 	       LIB="$(get_libdir)" \
-	       WITH_OPENSSL="$(usex ssl 1 0)"
-	       WITH_LIBUV="$(usex libuv 1 0)"
+	       WITH_OPENSSL="$(usex ssl 1 0)" \
+	       WITH_LIBUV="$(usex libuv 1 0)" \
+	       WITH_ASIO="$(usex asio 1 0)"
 	default
 }

--- a/net-misc/castor/Manifest
+++ b/net-misc/castor/Manifest
@@ -1,39 +1,57 @@
 DIST aho-corasick-0.7.13.crate 111381 BLAKE2B 08efdd762a12cbafabfb6c1c6f8b87465b337ea006d48e612c5275f796e4d62aa0a595bcda783f7a58b1e2655b9b35333033806215518f097b6671888d152e0f SHA512 9bd3c12559d6bdb1ce798a62c59a202771b48125afb6e1b5be76cad13d750d9bedd7acd77d69557e34a698b17ed7da6832a7813d48ee2627f4a2abd5e04263e6
+DIST aho-corasick-0.7.18.crate 112923 BLAKE2B 4f6947d1aacf89ccfab0592cdc55fa61ef09cea38231d3f758765dbce328a810c0b588be4ba96e81d64955379ee005722d22a7aec39caea6e72342245d7ca34f SHA512 7a23b16231a90d23ee60ad4c81bc225410599a4560d33d3a203138fc540c39cf1000100fed3aed40dcc371c3635656a3792545dca5dd1aefbde00d8774eebd00
 DIST ansi-parser-0.6.5.crate 11128 BLAKE2B e5ecdfc41c0e14766318d969afef00b5cb5064ae73ffa64f964637a899fa2683917c342b33e65a22d8daaf5dfdcd4518648e446de5ce8d7f6e7ee8e717f44d63 SHA512 3112370d7787057b97281a00b2b6b3b5cacf93b2a369a899098ecac54813c76d046c42a6d087c83202cef218efd0da111357644dbfffe943d052da1b9352cc80
 DIST arrayref-0.3.6.crate 10035 BLAKE2B 88292fa4b3ad4fccd03772c2f0eca04cc13373fe094358bac57d7523c256d89f3087603e5bcb2a0b15d8b2ecd48e904a822b2cb800276a9c47ad6c6b660d9d34 SHA512 368341d00706c1250ff081b0d99c36c9af694a62ff4f4d8c837234340295771ca49c5439b24b6e1a4f2c3c5821764e98881dcb22d793f83de632fd5cb457671f
 DIST arrayvec-0.5.1.crate 26816 BLAKE2B 172dab8f0129134dfc89c6032c5fc15e2f86a5cd1e5be18b87fe2108d18a1bdb0f597a6ed4cd214dc663fbfb27b05c66846fba4543b5e068b5c75d075bdc5bff SHA512 53db2fafea1f60ac1af9ecc0bc9b69010e9f8573048481d55969ecdc9f3d19832fe05824acf10a0186b0464f0fbfe898d73500fba39ed63650c64dac2c2e8043
 DIST atk-0.8.0.crate 44468 BLAKE2B 44d39ba3d3267b0884536e92d6b0a7daf150547e5a5fa4e46bcefc929f1dce1696ed299b990e4bdc2cdb84490e5b16921100513b7ca11ebd593bed74183f468a SHA512 5d6923bbffaa043353a14dbd380bdd1e74767c8e517df0ebdb9bcc2979aa7ff25212368844f9676ee54361733967b0a61440430593b6769b3850849111cb1904
 DIST atk-sys-0.9.1.crate 21064 BLAKE2B 752cd426951051af696413725189286f465433388dfa84efc2ef6963af6b387b56cee830fd595c39049f9721f4c9b3c51828c3d17c7362b85a6cf648e17e5dbb SHA512 a2eb083abfd585bb7bea6415c1b0a6981c1e071b11dbbd41442d5ab438219d13ab28bf957640616644fb11760d2371c929f379ab414b8b00b297f3af25680a92
 DIST autocfg-1.0.0.crate 12870 BLAKE2B 79e495d53298574afd3b292da7c9c363dcb3ea434fd44258efaf3628e95ebfc731f03083f8a1060272a2a3478a6452cdc41539e2dac08465cc6e6283844bf260 SHA512 451fc63148792ba1952b884170e3481359b01bacca5ec0456f43ca58f8e092b8f81c9764f8b00d4104059ff608089be5858220ee868127c064cc890c767ec3a3
+DIST autocfg-1.0.1.crate 12908 BLAKE2B 40c53cab298e4f26634c3acff3ece6a3371188d91dbf377ed664eabedcde20536edaa93daf406618f37edde019f049a6e7b9a47f627344587dbd126bee2b5e3a SHA512 630b348acb98b012e97804e6325d03c89abc22f2157762c59144c04e6c733daf550bdc7f0fe0b9f3b50e15dae8c1c3c4bdfce3d805b02f0fc987311f5332419b
 DIST base64-0.11.0.crate 48362 BLAKE2B 90d2a64496e20c4bcca6f21c2546474ec88283679ccae95303ea7521133414eba021810e64e5916e3980b6878f90281f09295ebadcc12324fc9a9060ac41a707 SHA512 31b5f56d4907a5e4ae40e92ef1629a446126525186f5236afc2475829bf2e5e067554db200a18f7b3ab741d0cc9c01e20612e77cc0cbc1bc2a4a8d11c0fdbf33
 DIST bitflags-1.2.1.crate 16745 BLAKE2B 0fa6d3ce44aad7616d5cd02aad8c1d0b0fed4022650eb43067c4a72e6fc88da05442674fa51826e4858a47c9de233e1ba2229820af094197cd11bb416ceffb2b SHA512 ad89b3798845e23737a620bba581c2ff1ff3e15bac12555c765e201d2c0b90ecea0cdbc5b5b1a3fa9858c385e8e041f8226f5acfae5bbbe9925643fff2bf3f0b
+DIST bitflags-1.3.2.crate 23021 BLAKE2B eb990bb27b2bdeb66fd7212ce582cb36e1c616debbac85df642d0c82b25439e6bf9b1e811fac76b59e58ea3c1bbea6170d03a61e8f9a395e4334a0e2e2987eda SHA512 3c698f757b5cc62f815f9a1cce365c3d2dd88e4db71f331dff8bba86c2865f755b81cb4c9bfc59bd86b7643b0943f9e09a7c4f8ad75eb2ab0e714803d0129f62
 DIST blake2b_simd-0.5.10.crate 34093 BLAKE2B 6e725c9399714d1e199277e3f9882d636c1737af5b0b290f853573575005d053d2ab3a34843461747914a0c25d370f0d5a5cbb46765fe99308c1fd7666d471c7 SHA512 7471e0347267a4b88e9eea932b3001c420da0a472b2ea0f20dff974789955d6d95e19d51e3a8a312516c7fc4c83b6af17cc59ea2b8fcd4ef879ebac22534307a
 DIST cairo-rs-0.8.1.crate 46018 BLAKE2B f3879b08d404495a401df205a4e51c67caa36722e0661b6eb3bc6c1dc830d52b01149d4cb27ad2c40b4870771f9f5f356ed1cd02c879dcce3bba5e18fd81b7a8 SHA512 33ec3b7b1069934aae88b76c11a6be76974fdc6d2eedee3e6d20328a4a2df7d248960a3fa4de7deb696f6c0dd332f77f9d8004cdf0bc36be1187cbb5ccf9b682
 DIST cairo-sys-rs-0.9.2.crate 11650 BLAKE2B ac664b7976de57907ae543c1afc2fd8fe166b2a147e1be31d6f60aec0b08949bb53b9f59c16e02f33a299a225f8e8202c5d7ad744c6aa8c5f03ec421a773ff33 SHA512 cab877b76951212710c7e668093fda218ac9c7e1e26fcffc448d759a3f968a7faeeea347025189a1aee7579b15916c141d0d727f986bb7061183a695b52bf39b
-DIST castor-0.8.15.tar.gz 92121 BLAKE2B c83ad5f923c3cac5264f044cbffa59eeb8b08c6e09c3a6393a564f31c8edddbd1e944ef8e5dee8be11dc248fd707081f9e2c1560f7650e301bedb993391e2c22 SHA512 0fe588fda71d8c642b11fe44f2763bbc0574aa5f54bf0f83770c690ea17f66d65f3086bc4bce27bdf073974f6639371231b45ea96fd0f5cea28c552a843c1714
 DIST castor-0.8.16.tar.gz 92279 BLAKE2B 5b244850a5d350df083b9a3ee028fabe576a037b6c3de8f76f90aecaf9d12e0610f05bb9e65c73967c09240d56f6457f6d0168245de33ac2181ade35e9c4723c SHA512 e2a5911003499e0ee9ac2b8687a9bf8a8a46f8f841bbe67d1ad487022f7b0ab5f08c11454053c9ebd0ba4eb0ba253c46f4a312782cc97a2dd8ca941e6ea23f02
+DIST castor-0.8.18.tar.gz 92859 BLAKE2B 95ee37c48c87a89b2d9e8bbc448b3fa896d44e7bb25b62c3cf471035975e02f02f1714601cc7e892c3be42784f59f7851e58269790cc4bdd7bd7a915a1d7a6e3 SHA512 f9a67b0beb37033fb7eabf6142a738c85fb873e1e8857da6e34b19d2722e2a36eb1449e647d8dec1bc9d90213162bacbae19a7626ae6b9053d85294fce8be2fe
 DIST cc-1.0.55.crate 52090 BLAKE2B 1ace1ad556b030d3d81dd9af06767acf6e31d00f3eabf5d72a41a537e4e984defdac4ab0d802cbf83dee3f726a9aefd9c87ed702fec08a0cc9ed1e1410544b40 SHA512 a20aa18cfba9ee0d9fa0bbf3117be6d37c4420ef45e1b01f5505b138ffb2b2052c9464f964c5c2881f93fd4c903cb3b78b4c15ed14ea27585351313f189d1725
+DIST cc-1.0.70.crate 57200 BLAKE2B 196b0435c8a521a02e9877ed3ff81fbefa88cd56717556776b46366bad1835bff134a1b4fc4e31ee5497600e98d1031119d0973b420cf16aece1ff18fbdcd1bc SHA512 9158eabcb9405fa2ef41fb120821ddaa2e5c7234c02d5cfbb5b59570f7de393d1fa33942ca52f86bf9271765b3df934debdea89e7563cbfe193dc01b2dcd72f9
 DIST cfg-if-0.1.10.crate 7933 BLAKE2B 063a96ed176f34f788666b40adc483d147fc011dee941ab60569ddd0e57502b5dd06ed71090f4e14ce005d06e240500a286f74652615e9d068fba649610d8cf8 SHA512 9d22616bfb4a75770a828a0a3cddac6787297a5fdc53eb17e25811cc94de717f2de8bd66d53c5d65ba1c83d8892aefee5ae758cf56a1ef0a0c3120f70b244339
+DIST cfg-if-1.0.0.crate 7934 BLAKE2B e99a5589c11d79d77a4537b34ce0a45d37b981c123b79b807cea836c89fc3926d693458893baca2882448d3d44e3f64e06141f6d916b748daa10b8cc1ae16d1b SHA512 0fb16a8882fd30e86b62c5143b1cb18ab564e84e75bd1f28fd12f24ffdc4a42e0d2e012a99abb606c12efe3c11061ff5bf8e24ab053e550ae083f7d90f6576ff
 DIST constant_time_eq-0.1.5.crate 4936 BLAKE2B 882dbf33f20954205fcc5b6e39863db8969d184b697fd51ef462f6890c1a754e3fae67bcc7db685d8cc26abe6e3871d3b80aa542489ba9551a0c95a49f7a6dc2 SHA512 a4e0155a7ad72babcfd418d832d362b3fca7333aaaf36c246b00e948983837c3c93378b86e37c5fa7626fe137e3b6d77276ccc61624a7f4ab914605905a88a01
 DIST core-foundation-0.7.0.crate 25384 BLAKE2B fde852b7673cc972da8d2f8663c2c8372fda36fd577d19c9536f9df929f649ccf94150e1e23a57013bee3cd8cbb6fb894c4fb3a5744171bc6be607cb27e2757e SHA512 919041f431e21783193c0661b82cbd15946a56e24e5100a6a9dc02476ddc714595fb0416ae182981ebf6a8b27181e3178135c27388b41ec848423d739a265da6
+DIST core-foundation-0.9.1.crate 25985 BLAKE2B 22e70b7b1cd1f39c4ac287f406dabc549e3ba750ecf17955f129ff83afe67bb4bdee7e7907287eac0c28597df971de27dae77619f44d0368864c08798def1ae2 SHA512 d6dae760082ef9dcfc37d18acfa9a6ad8ee491335d17ee17447c5bccad623564f1e8bdc54460fb260aebe9276ce5ea4d8a389a83b5c7d17193614906c3d2bea9
 DIST core-foundation-sys-0.7.0.crate 17033 BLAKE2B 26d190931c7462ed8c13de82e86d4417e0d130f97295c8435ec666be08c7bdc37894ef25647043970fa40eae1c63503d2ad7660c2ac17ef35d7d35698652e18b SHA512 b77566aed2b572bdbce6f71ca9dcc942ef96b628a7ed9680c4d3e3ada4a9dce90c1b439a8c7c7f22d68e51becf1d22b3262e227cafdf8cfe5f42db0ffb9dadc7
+DIST core-foundation-sys-0.8.2.crate 17461 BLAKE2B bafa6f6af67f55b34c20e50093a5426bed35c159058a97c03d28c99b6f0075305596907291d26b170ee2ce1bf0c74bd51e2c54f11ef021399791129de6cabb57 SHA512 1c66f2012c11185603a0e4c09311d32bc4ffe639ef7626e49bb15006306fbed4c963f2c53d3b853a254b29cda73c393e0236436575d217992268463441ac7348
 DIST crossbeam-utils-0.7.2.crate 34338 BLAKE2B 3cb287c7741c4d5b0551331634a75b066f07fb4b55fa2b347370506467a05923254b1c4dca667de59ed91ff91f5496b37f40f13d3e9885a1b4f639f5b6748433 SHA512 e375f24c007bcf660d9e297527ed938f678a55696ca7b555b96fee7e0b94c31db2d3f4355675aa0baeadba68b9755ec92dc3a09a37b5db48e3723b926fd4a8f3
 DIST dirs-2.0.2.crate 11779 BLAKE2B d1a6152d05a98eacff15c6c7f1f550d475b5a1cf62e541a2fa8b9836b9a1ea6b98f9314341dda35929b968fcf8a47dac7679c5c0b0dd97f21564a8d469c2e254 SHA512 34d6e5956c9db1dae965d33f13c64dde59d3e0e18cbdc56c02f7f31cac8e0034a80fbb561e0a73b8dbd145f85b46fc4e8a147b4c946b5816d8dda6caef185396
+DIST dirs-3.0.2.crate 12184 BLAKE2B 414fa4734fd9e108dbc887210e71c8be9834c1764ca35af66781a8108af9fc704f4e7d420ffbb2adeb2a14ca5658e53cb5da4b486e093b3de010c542f7ce7c7a SHA512 97dc343d580ecda68aebe87bcbe8c13a00078943771e3f1dc3101d8d450d2ccdd0d74283870eac1d88255a99e887166d42533ba8e70d15b9cdaddb57e3a27c55
 DIST dirs-sys-0.3.5.crate 10643 BLAKE2B 8df1e6ca2c8e8560913bfb74e7bea1b12e1b13b6d337f3c76f517716622586cae8ff9999044e3265504a44f161526a79baffff2d123d3ea6c5cfebefcf498010 SHA512 ff7eb48943b61773dd2aa8dc10372186d613c225a2b39caf48966a1a5af087dd0177b8db80b1353a504af8aa1c8b4a0a849edf6c7e4389f6b753bfa3b7376833
+DIST dirs-sys-0.3.6.crate 10626 BLAKE2B 6da8e4a1e51a4e06ab742ce5eb75155ff9b7cbe83f06947a0bfcda711ae1e0dbe51f9a1e1733ba771f2daddb2b8b14e343b9615608c1d9a8fb927b033c161b15 SHA512 79b6bfda14aafa3839365496e1b1926f763d3569e4e138a59f4acae15c38ec9a3bdcaa64293b03b536141c897c2bf68a67d7ae5670d86215080aa313e53d39e5
 DIST foreign-types-0.3.2.crate 7504 BLAKE2B 520818b702d990d296ecd31a8646850202509ccfa18edd0e1b260289619a6c351e758f317ec0824bd76eccb209b6f087057c25f1bd01a47897715013dd834867 SHA512 bf27b8243ed482c202d120383374f19ff09422535e24b9c1aebccc66529bf300ca17b8bbc76d67f98ac092e614497afe3add9dc68aa69c93074df05762f91232
 DIST foreign-types-shared-0.1.1.crate 5672 BLAKE2B d2e42e04b6657e7a69fe0bd20c672176629c743e49a55fd007bb30e289710b70045d445ae9cae0eeaa747ee708c90e8abd9b5fc39bad8ec0666befe1b696d4f1 SHA512 bafdb2143e136fb0818e2ffd90b5c862b7181647d6568947d4e4531012bbf7a57b597221ec7056c1b562dfc0c3b5dead26d1a4111ebc15e7863737a873518a4a
+DIST form_urlencoded-1.0.1.crate 8773 BLAKE2B e2d2224dbd85d053343aea29ef1bd540fb8be12fd600289e9c048e3b74bfb009d0770f8296556309ef756086f22feec4713dfed1006e1101075c8897be5471cc SHA512 3ab371c223561a27ffbd35cf648ef4a9145d47bba9d71900a7c54cfc2f089175e9361f6352331a9a7fa018923b15e7a3553c8f9ff9fae80e1626e641a5faff68
+DIST futures-channel-0.3.17.crate 31765 BLAKE2B a1055de0a6b8812546442acd8acf8251168015b5f6be7bb7e223b7c61841a1a15ec1fbca3e4d40e0a552d5c3fc89ed2306a29c9ef33b1665f828ab9c8c0aa142 SHA512 884fed34839c9f73551a90fdbcdc542f88623c0d74d506febd6fb0308429e0d7df879f378b6d0bc818ce8c948da495a9dc210ca55331f4760273d51f627cc416
 DIST futures-channel-0.3.5.crate 29053 BLAKE2B e951124135520dd3306faed9355bebeca1ac2e2448ae1e8664751c026384d830d1aca8332690cc84c81be07c84e97c3321758dfc1f76147bf857d19a3043c225 SHA512 5d192fa5cbe1f175c578ba3f8c0bb0bff4461d2699babbd6a4ba22757abcc52b6edb854643da2521d7acd3f78269f3eec9328c2c19d5c984a8e02f071e249a67
+DIST futures-core-0.3.17.crate 14478 BLAKE2B bad5d1fccef7e823d52eff0db7522545c6dcc6ba94bc0cad33c013b6abe624ebc6c8ddc6a6f5a4ede5982e175eeac48113ef929cc6633a22a18bbbd4cb1cb114 SHA512 6f290620b5051a3f3a317acade5a077f502fa3ab7fdb230b6ecd4d007c63685bf343ddcb8b8d1170b5ebeb94fbf1c495dab36918490b14885361d6e53c45bf22
 DIST futures-core-0.3.5.crate 13541 BLAKE2B 5eaee458fffdc57105e33c17e7d2b8eab82d05195a8333a42266241fbd1f772afcd0bc82adacb1799dd84dd60ee6e37e5130f29f945781d6130e4ded98bf6dd6 SHA512 5af82472f569d1d118f6f8c900dc8d1df58f1bcaee43273f12bc6e0c72a57141c797e5513f9a9d6cf969c7e4472b36bac0ce74435de10a76cc444d896cd779ab
+DIST futures-executor-0.3.17.crate 17102 BLAKE2B 9e9864d7fd3a38a800e3b07c22f834575f92704ea88bf0f295a95d1b52b41ed698d4e7fd89c5dbf503a99676c6ad036d9f96dd3e85bfd49c26d1127d55a6a4df SHA512 e3ac739e58dbda88dd536382c603014c56b7ebbda529c81afd0d91c16770719902fb4883a7a0dd0375e7910fc03605887058ebd30824d01ca20e2daf93f3d94a
 DIST futures-executor-0.3.5.crate 16499 BLAKE2B 6d9f65713db27ed2ef1a64509c1b580eb5bc68fae02514832b69157c5ecf1337ae9e87fae81ce402266bc57351ab192af60359ae8d739d25202a7471570d0e85 SHA512 8877f1f01f0f81558d0d2ffd40a5eaae9df1f7d710ba11bacdd4a2d9e1e90fb1efa7758f8675545e72850e53bc5a1fd226e6614fdf23a84fcfd388c4fd9e789b
+DIST futures-io-0.3.17.crate 9050 BLAKE2B 729fd0c2bbf5a665640fe9e8dbb9d803474cbbf4385188d1cd906f526a2b75cecfe55f75aeb0a491057af319a19fb0117420af75425375af41622c8c68567cc4 SHA512 a2b65e07bfea15b78e988c5a9d330ef51a396cd22475f171b342cc8a6520749335af851ae11d44c91f54ab06f425b0dbfb716a959c625d3c52db5765d0407e0d
 DIST futures-io-0.3.5.crate 8981 BLAKE2B e7d39b914ad50088b14a82d82658adf59af7df2732894bc595aac73173b33c0dd4139612c07c8ffa5edabbde8445d039f36050e34fe470ace5bbb0e299ed9597 SHA512 9573140f9ccee3e58d181d557f09314e13cc16814df06d6d99c2d95733512a2f046cbe3aee5654a9e461e4d76b2ca61f3d1d6b9040a06cbd12efd3754d3b774f
+DIST futures-macro-0.3.17.crate 11830 BLAKE2B bca68c3c1ddca764ff86d36667c3da3805b8aa730b300f97d5e77dfc695d33484b4b8ee7d3b415479852e02a126c14f092ee9724d3d91a8793bc91a165dd5381 SHA512 518969498808bcb63cc797934ed7d699f776588dd7fc9f9c41c63874a05d03781b5c0241ce20cfffc8db569f01fc82da433b7ea7772f24dfc2df5eca35b5146a
 DIST futures-macro-0.3.5.crate 9673 BLAKE2B 5ceee18ca00098ae9b44f909c0f96b1eb08978a3bcaa460c00683ac3c49727c94983faaa4618f747600e52ec4b8f43acb78fd261cad62d79d35b36b9fbfd20f2 SHA512 413acd01d2e8e849c9425646f0c7eca95972139b61d233bc615791ea4cbd0eac908c949e15587de7ac7c260837cc312b8b3d428011df23bd2e7c36875d4ade0d
+DIST futures-task-0.3.17.crate 11712 BLAKE2B ca42fc54c3a3795e59b423fbd1235b10b4ae1903256fa61e80dc9318f35fb59fbc15ca8a3be3fed67e17809ed2d5f594f939d3f51d0d718b0dff5be069200361 SHA512 2f12d8d9d404f147b601ddc6fb9b6869e2e68a4bc55cd3851cb9f7aa8ebe6519c5cd0fa14da92e564d2003ded2ac2202f5e09e1a83e81129d1600d01ecf86844
 DIST futures-task-0.3.5.crate 11030 BLAKE2B 272de7f0a923bab04071b705b3b39683022538a756ccc22a8582f048c83155d6da12ab804e70cd32767c318b94f0f71ea0e7aa6d1f77491aabfc6ebae08f710e SHA512 9affcfe1c64ff66cef77615d39c2e69e40480aa7fb0d1a0b136edeb9533b336e3e1156bc0bb14120a812f0f8d3d3266c556d9f0e4eec147fdcc175b3183dba52
+DIST futures-util-0.3.17.crate 147679 BLAKE2B e29d07117a7285fc52a390821299f55da901573a5d3df6a1845b852488f98b359ef35de0aa3fe05e613dc662247318cf3df5aebcb00149012c6a3ff24c171a57 SHA512 6a87b0510c3f8214ce14b7f333d212558647c523b5eb7da36dfe4f694e0ca4be3cbf97fdd7bfff5e0c7015644742d74d6184221482d644653a106d5564722fba
 DIST futures-util-0.3.5.crate 132197 BLAKE2B 07cf5f757cd9bc663266b18025efe200fc911c6d829bca139db4c5dcddce5f5e5dbe62968c6c7b328a63a5f23d0a232087e162f926716029ff52c24923bb7c53 SHA512 f71bd29e113fc8aa3795904b3130dd6f09076e6a19e52e34702973b6428a1834d300fdd3c48259e7f27fc1252dcefc80a4b104962fe7e6e4e536322d0aa9c5a2
 DIST gdk-0.12.1.crate 77317 BLAKE2B df975a13b4f2652188af67d2c930c9407448e8963fb75b1df8800bbb9b52ee6fd2bb000753932dca86e0749a7156d8b0fba4b32ecab2c008795b8d5c8cd081cf SHA512 fba23a3d482aad7c5124c670daf7cde96ceb71121e34e028eb7dd9f4d8ecbe17bb91b85b29b9c14a10dd44d8a70b3f41baeb273928a6b0461c4f86f8b42ec0f6
 DIST gdk-pixbuf-0.8.0.crate 14926 BLAKE2B 27f47722bbacdeefba9e278044aed64ea9553e5be174287edd428ae43497023a93991da7b206c5989c037c7ea1180abac8674abf1c892af7c32ab7f12419b542 SHA512 dcec0c6a7fe102f60b37c780cab37ef560fce20fd090364d65c4137d96b987182df7fe93178028e0aa6ea2d25acfda62fe58c979515e0218cc14ab51aad55277
 DIST gdk-pixbuf-sys-0.9.1.crate 8641 BLAKE2B 8cbeffd4acbdd38ba43b5b39a84e0d20d9ea0230115f09f8b0c0e95b405027fee1a65e452e2abd2485097036c9f5dca8e01069f51a5651199db9be50aef6087a SHA512 22ca779b0065289da0bbc024bbc23cabc5e2fc81f8ea781107a83e41504edcf42d3dcde7079b091f1070596566df1f2180d226dcab21d8c388d7505d0fb171a7
 DIST gdk-sys-0.9.1.crate 59958 BLAKE2B 9e0c30d138b908ff56dfe9db5b0ed75a1ed14c9f3158df3b595346888cc40c08d8df8d204ab59fff8391a87396cf6c29a9881c8dfb5fdeb3e8d82bff76869961 SHA512 9064f3a0f9e1512ca1eeb5a0ca27234d908948f53b0c4d7d38aeb184ca83846812187fa485a35bb311f778e4d14e25ac0353cd3c4b8d5002fd03e9bce2f82dcd
 DIST getrandom-0.1.14.crate 24698 BLAKE2B 8139227951eb65cc2bb7bba29291c0e8ff0b8d9a8e2d7eabb01682d1683c989c44b6195952ec7d087c338538c1d6858c45514822625266e0996829e8c50f3d17 SHA512 b5cb78ae81f31fffd7d720f9ea2b5917b4eac103711faf656a3a3fdd24ae5a2e671016d39309cdd11f902de919187311401dd8fe9e6ed68c29b83987de77c957
+DIST getrandom-0.2.3.crate 26261 BLAKE2B 3e52a87b9355f850e07e5080c20e1ab3acfa927bae28c63bb8bfd6a773ad77be96d3ba770c344631cc0f2d9a95aac920790173168b102e25f50480ee96663569 SHA512 e6da64ed529cb0fc000b613f75187ed6b20f716e721d8a02ac2ae39c507fb9f6189ebb66b522d28584eff1e7e9efc274cad6bfe43f464f58053701e1d51c603d
 DIST gio-0.8.1.crate 131581 BLAKE2B 9fe9261b671a636902a0f594ec3237ca16189da9315738f9a119f839d6c17126e3a6a42a7747d98e141958ec13c166cb01c9b3f134f403237db9df25703f09cd SHA512 a1610960c7fd477f0c2b78817d44a2e44a340f87abd31275c7386d6d47218a72f265e4ab749f02ac26826e3bdd973a19291b0268365bdb95ccb6a3a2a787b994
 DIST gio-sys-0.9.1.crate 70278 BLAKE2B 58e92398a7df7faf06c5f6ab0bdd1d5fa5e31dca2c578b3b0156dd710a9ad1e65a896441ac68e81aae245bcc98e6d8c964ad5cfd83efeea17594e8aca3e18124 SHA512 d254e9fc43d7e173491e8f39afb6314f9dc357576f1d278669dac9d95c487d4cc91a31a248ae11ca1800c397dc528f55844ef909d8da474c09ae69c291b75a02
 DIST glib-0.9.3.crate 134012 BLAKE2B fa5851dc03d21d2b3ffc2f80511ca0ab909f16bd572af8c74492c0f3810fad577f52d8521b42bf80f38dc0cb95c31d91a9e8a6abee2be3e2f0ed814f20702408 SHA512 8275f88b79ddf2bd1ca99cb5b8279226bf2b639cefa73d47028a704a1f42813269839437081a91f7ee4bdccbe3244eb5b67f821598b1277407d2a3e9a2ac6c88
@@ -42,60 +60,108 @@ DIST gobject-sys-0.9.1.crate 17741 BLAKE2B 1fcfd31fd63f03a80ed4656b8eab30deecb46
 DIST gtk-0.8.1.crate 499322 BLAKE2B 66de618b12bc9f627519969b7334c7a0680a24ca044e094aa9feb7f3ab99f2e2a3e3d238ac9a426371ce7d77a8b1d337239db8379cf5031cb3093c1c73e1131a SHA512 10a5fae553fbc7d0d25d7849de094494bc54fbc5e4b4369a634cc8dec8366f14e9885c4b3e37ed4255192a60c71684d4310b17b8e9d18c613306bafb08768ee9
 DIST gtk-sys-0.9.2.crate 125577 BLAKE2B fb1ac82f8e6f49cdee5e49666b85d5b3ed578a526d2e74f0c0913d57b7fac113fb9f35a5ff840ca6a29c0b0d4549e5ce0dd84d54b9adb8ecaeea73ed3ff07738 SHA512 4e3c61289dfed69743332f7b7986a8a1a63ba0b62bfc6e673a8ca44c9b25db485aeb5a28bd69cb3f6984dae1f2de06035f3441b2d212296b13df742f13bae1c1
 DIST idna-0.2.0.crate 257203 BLAKE2B d26117124891f90b5e36af291c9038e2f4d46402c41380a6a89758459fd73839137e6faa401502be12dd81292cd9e12ec82fc611c0ff7a150510d19010767558 SHA512 375d6d73537a5c9cebfc850a2b561d57e748d80059ca27fe5e35c058cc12a5938cfbb39a76cfe57fbe589f7e36f89ccd91ccdb8899458c322e277c299293bc7d
+DIST idna-0.2.3.crate 271023 BLAKE2B 157ece18825fd3f8055581ccbd14191a6923da4c806ce51b3d6376682878db000a1b873f744c8e9e1966e4c1f8393643bcb603deae299ed0bd87847b0bd2c591 SHA512 1278bd561ce329e1dc7a6f24a10f83d9a068af5d15a088414f3921c6728b0d54f4d60d6f4d0d5a786596ad226263e1e50c3842f192d5758aa4665ba4ed5c269f
 DIST lazy_static-1.4.0.crate 10443 BLAKE2B 25b2e61bbac48f0dcbc79c81d7bf01f2403d8269ecb6be3ea6147bd00f7a588df15a91f44dfc18ada19b21faa71de4637c7d493a8628cbecd0e547d74e616a23 SHA512 e124c0521ec7c950f3c4a066821918da7a9c6e711115d98009ae7c351928fdddead852e7596fea5937a9c30e4e4ce8eee7099b20248b5d6e3b2494b6a6d88cb8
+DIST libc-0.2.101.crate 530003 BLAKE2B 55be777a0ab91df07e06f8c5045fa49dcb356eddcda2feb3a16949afbfb395abb3a50a97fdc6b6f1b8974c07af13c9b286f8222fe8557b668247065515063d8a SHA512 876a5739c1ba29d4a4d5c9407b013afabebc6f5644dc57864104e99f0303e7e7ef1d5ee81a665f1029433b9251917b1e1571624a123dfc15586d6bc49ecfb3e2
 DIST libc-0.2.71.crate 474209 BLAKE2B e380a6936248992b1b1f63ef0cc3d3de410d414bb19350a2327da3947ae0e8e700e82f0f4a802cc485e37571b3a6a68bd773f964496f572a721294623d135c1c SHA512 b6f6eebc42817107aa2f94d426154c2449a2558646414464a31ee9d9dcf714e641fe6613b95ecf9e751d77102c0cedb74b35ca1f76c6df2231a5bad168de5e16
 DIST linkify-0.4.0.crate 14795 BLAKE2B 48d696e7eae052311d608b3ca01f99485e5e4fe22d795000bec8b76205a27db09ee20d5c00c8ef8090e7a821d25d605cd05fbb30284b3a39bbae0749b5ea6dba SHA512 104c73001f57bc7862519a920cb62bb37b77ee700a12cee0a571f3e18d9e60467d444e1f07546c54dc12c7276219904a77ccb0cd6d04c86c3828f0b3e234e519
+DIST linkify-0.7.0.crate 15498 BLAKE2B 71b3a9935f3921fa49eac2cc89c1a8de3ab9edfaa42b5da4a31cabd16439772d5ebea2b12e6fded6f865fa1efe633a929739bd899958611438a8ba003026e007 SHA512 4b0af8a29d130745d1a1b5bcc79f8f6f18dbbce636de518ba88d31b1978a30dc0fabc0a5ccb705fd9e3d3b2441898e82dfd2ddc9f014a3dbf1fac88da89e4cee
+DIST log-0.4.14.crate 34582 BLAKE2B ddfba35947ae1f5905cd9ecb9eb862a78af6f00ee8b8fe6258b369b140928fe677a02b1b3ca5bdec36ff2b16abd85a9f49688fd5f3d1ba2b2905e7f96b8a84c1 SHA512 796100167663d85a7bc4244cd305e9b3f0a1b1520764b63464698eb136318d0928c40c16f5d19d9f602a5bf769851275bbd48d66b088b0c37be7a6fb62def7cc
 DIST log-0.4.8.crate 31297 BLAKE2B 31037fdc2fc94f4ab8a6e89a251b0bc29975027dc7efb7cc86a8e848dfc8e2ae50acdb177b7ba9f7c1f20ec01e50798f89abb772d67a33f1b060ac617cf9a8ab SHA512 0b71f97d5964134b5eea1332347e177806b2f171d0be5c410c0ff1539470b242ba9f0933fafd853e4171a43b5e373a150af18918924be431c7216022553a8a3b
 DIST matches-0.1.8.crate 2216 BLAKE2B f18176110921b1cf6e58d52d12f1d1a3455ce2dc04421fbf1b392f66cdd81a88e924571fa27e307a06301d83b04f3b8a0ca3ae40d2da6f2decb8aac4e2801fbb SHA512 98b58f6a2694b03a7dd1be69ebf7e3ad14483fc8e4cb6e6c26a4937e4e660e843efb4dd04a7312dd9659ca02acd3775678f73b8faac44a76ffafaf873c22f590
+DIST matches-0.1.9.crate 2246 BLAKE2B de155202636c6a03ed68cdb21e8ef96e19b45be040a82943d2d7e5192c0ab5c253ab6d65f0b30b2689e21da79cba684af5be6e63c48266681aceba356f6eea41 SHA512 6a2809687d30ff04ea97bf9d1610d746e097699a4c3625ffd1b7b1e4a9673ece9d559058c9f760b99d6ab509024f7b338e7cfa6fe767499c983efa98bfb98305
 DIST memchr-2.3.3.crate 22566 BLAKE2B f952070b98ef30f0d2780a6efbeb36d295710734f678517d913a8002cafebbd3cfc38975fc4546d306efc11bc815764d14320af3b7a2360bd46fc2ab3db9efa5 SHA512 922e05da920d0d94226857788878ee5e31518cd80d95ae57e1d7ecd233942c37d01565525db2f1dfdfd5b3b1f81b2c73eee058cbfd745cb4e1519518318df248
+DIST memchr-2.4.1.crate 64977 BLAKE2B 31479718c118093b684bed946eae0706d77d9d275bd49f5aeff4de490f479abd60c7dc462150eafffc6d6fc1da0853123b78be038826b775d2a41a4c39d93ab5 SHA512 d8912e3902a2126f86159bdc998532a2890b882cbb7d59b5a470fffcad4c32281e045f2fff48a235aa4189f1928866bf3d33b699d50866ad6b6c272bba7adb11
 DIST native-tls-0.2.4.crate 32170 BLAKE2B ff0e24edcf4b1014e95990dcff7a5f2139bd3623b6b9809cf8fb95fe11720b8fbd0e563bfdfead36935e4d162b7c0829f51934d8ec191ad34bfe1d2ad2ede4a5 SHA512 810cda42159f302d315f05dde222e3ee20cfa30958d48bc547837f7d6df87a1b51d1239de90cc2901f48581be978c11f8e758fd69213a8a8fa85c71266302632
+DIST native-tls-0.2.8.crate 24956 BLAKE2B e5b130b717c04e3d9413d6cf45986b67060f31793e2825585b8e4026e73927340ee9edd5f5f2d6750200bc9eb0a4b8fbabe0a1578d6a8ea17208f2fb28d2a201 SHA512 3648272b1c2f10c3eb9c7121c20a26da149efcf248187522fe07fde9b506a2b687e8bde8e09c0f8f74d19db5b84ea98b19b177c6daf38bf8a0c3ec05907006a7
 DIST nom-4.2.3.crate 115343 BLAKE2B 03c0d1cf97a0d34adab29d6e21add3da7d8eb78ee6b7987ed11b136db7fc6afeca6a8eb91e00aadc1f6047eb7bff55bc288faa8c481e6a4677e0c43512a68f72 SHA512 663567dcc6310ecd6446bab1eb700f4ebe834a3b25bc2a0054edf14bcf205a95128de5f5dfaab04adb95e1a2241d487d59c0e23c957934a0d656e4c51932bd54
 DIST once_cell-1.4.0.crate 24625 BLAKE2B 6cfb6ffa2326fb53c4381d4b6a462928f96ad4133c653335c34265a1475c4f50067fcd2a6d9bb0660aab4406401edf02776ceff8d2b43c9d6b443998d2e3cdb7 SHA512 8debf21169653719820c4892ebceda67fedcc3c86e958aec42ade0d38247e12265a0152846f9284c37faa183e452ddf666b117e7ec5c066893cd33ec407dfaa6
+DIST once_cell-1.8.0.crate 28925 BLAKE2B 7681b1a7497b5711e663773c1a7e076f333c06c10d3f289079a781c36f050c1620cc279742ea8e5b15ec48f3d6038a6079bbda7fee3ae8e1128bd916d53ed43a SHA512 88e55c9433225ce85a08353168c87fca2237615482160a5c28f3ac17f06d48c63e0c21b5f7ef81f82ca133436e371802ea099453844f1c111003bcb6ba89e827
 DIST open-1.4.0.crate 5084 BLAKE2B 79a6eacc1f63525c1aa9c2e47cbaee6e3b82c827613d5a54331fb9ea129bcbde3ea920c5738187b3de75931e7c6ee3e840c881716a7684d2136df0dc03a091ab SHA512 76270c754217471de2973b97e508563e2d3fa7af987ffdf931dafa797631dad1c782f9cd8ec095b62745d5f7dd13ef9e1b51843526ef976c53ddd0c6dd79e5f0
+DIST open-2.0.1.crate 6648 BLAKE2B e39c669e266c3b5b16b05c51cb219a87961d03a970e8b9ca243047a3bbea3eec9de88d9ec74e14c7e87aba5f270c398cfe3d6b2fbe23ccb90a120196c52fab15 SHA512 3d7834046e6ae61f61bc557983a255e7f3f466e27df153c26cc9fa014fc83cef043b2d892b158fc25b188263169437767258c2136679f2dc273fd08ed3dfd2ea
 DIST openssl-0.10.30.crate 191808 BLAKE2B a6c76278f0d5fa3cb27eacab96d6430dcfb04deeb37cb8c6ecdc9b446f1bc8c44a69dcd83f50a8c50c56a49e8950303e807f05e90de3040a616f9c47a2f0caaa SHA512 058e9a483a9d0936e77626698bea5049608a9cc4e59a406b39c0b678f78c9207c5604286473dab334fe1d10d850fabcd786c6b54888a7affadb594f9459f5dc9
+DIST openssl-0.10.36.crate 206367 BLAKE2B d059480338da28c1e6707db85127bdd4721e931f74bf27d2c8f80315c43cf9c37a977740b9d799a03bb59a1fdf26fc1fd9ef11319863b63ac7b6ba3ddc2c1385 SHA512 bf215f7ccfe24b3f490d516541ac746785853dc61ab6cf023e303275578c206fcb14b6e5001f36de2f71b0a8c48ccb26f4f343c5b88ae38ad2cba12ccc941641
 DIST openssl-probe-0.1.2.crate 6427 BLAKE2B 8df00c8ab6af7887a88dd1672bf2c40c6aed5867b0b8d07dacc94b80591814e2fee4ac5dc775ea0e98cc33641b9eeebb6d5979d34717ba400b907358ceb2a469 SHA512 4001eeea5c4f859559475b4b1df8248611bd44273116b31e7ef775e02918cc989825989868f331f0f0e387787680c1e4ba721ac0fd4695f7363005ccc0815d9a
+DIST openssl-probe-0.1.4.crate 7066 BLAKE2B 656434ec1d34466e903e5c69289a277d14623aa7bd8a7c19bea974c7de57fcec9b2b4ed212f37d7f7b90fbf02a486a8ac7f7c318cfb3b3930e54e276103154b9 SHA512 c5d4ffcc6faf009b38dc715ec85fd75b3e3b0c0293041ea26071bb6d19d8d018a43ec166bf79ef1c7a126cf783bd4a7121d5dfcbed36db5ebf0fe4decb198f17
 DIST openssl-sys-0.9.58.crate 47014 BLAKE2B a66f90a5cd9fc82ff22ad7481ca9e4a92c78852d25ee4151c09d5a4d23823942c28bed5d96d5130eeae005573d7120e7e5187a071ae81ff10572cebcc7db8b3f SHA512 098993619ea8effaa03ab61a0eaebc938d23cb8e5284b2dd45499972ae4c79abc36cbeeb51f34861a36816de9d02e2cece673f32fd042880669e99cfff181481
+DIST openssl-sys-0.9.66.crate 54599 BLAKE2B 5c03c5e4a524a518885a68a7d7c9fefc0d6cb97e35368bfa49898cf5a97fdce0ce34047bc7e7ba5aff3430b51b3b546bac1bbdddb743bea1bab877df684fc1e4 SHA512 ab2d39a766df694f3985d67495d4e820bd196987571fbc229c003f441fe61bdc1aab9cd35a83ec3be9518d2b4e463f33f19bb109e9297a2d4114fe2d1d932a59
 DIST pango-0.8.0.crate 42250 BLAKE2B ce32931067c629d866b1caed8aa55390d80abd1f78e82b16ab6e1c37d7cac6fa9641a122ce1f8bb004ac9b36109ec942a9a6cced8fb7cdfc489310a7a1f511f1 SHA512 f69ce74cd2a2d3e00fae330b7a018ca70ff34bac85a031a071ddf498ca3f15d48ce4f1307635f547060e48f75387ef9d0e65d7e1899f4278687faea440f6c0c6
 DIST pango-sys-0.9.1.crate 21273 BLAKE2B 62cc1f12c8a30710d3b56eeef89afc00c1c0153526818d3bc82636f1c3e13dfbd49812e54045b6dbf6f80205c036f58050d1bdc6425e165dfa87987bfccf1575 SHA512 4fd2f3f74497f134946b33a2822b054758c390c345ebd4375540a7adcc000fadf562d8e8ecb4fb05b3e5824982dc4156c450ee61f6b8a1315d5dd488124b10ac
+DIST pathdiff-0.2.0.crate 6189 BLAKE2B b04f2769452686f94651251f017ed03c264b4fbd471a1ea1c529d48d0a2899a491aaa7f757dc6e5338e4536fcb0641bac46a7c6bc99280bdea7f6b91c7231bfb SHA512 9527aa96b6f873014c216c6326e0d235f764951d244f5cf36e2eaa0b8182b25e7766a46967b5b0b936163c6ec4796a15e72540dd3faca8abfdcbeba651c21f71
 DIST percent-encoding-2.1.0.crate 9748 BLAKE2B f3ff35ac683724b15e40c85e0fb8ececb07b61beeea82b7020f02d27df05a8a3535f157b3cd688533e414d6541de7de8640ef4756706d8061af0fec94ba04ab3 SHA512 98af4dfa7c6a3cf0d5aa929c436f9eb1ba1b576a944513f1284e6df2ad06be7cab9eba145d888d50af88f8c970bacc702b323041bec6d4fa1dc34095186c628a
 DIST pin-project-0.4.22.crate 53598 BLAKE2B f755c4f9cc6979585cfa99a9f331e91eb4f7ae062a2d9c9ca78d2deebdd3048ac4f147bbecdf9e7d12ac8e2df58e377e9b014a779bc646db3cd68750acabe64f SHA512 c6c129168b4894b8883e687d882cabe991a8a0ce5df50f207b1346f94aa7d5c295c743ece61e10f0ec356e515b38c3d886cd5a3b845c0a324097403e0e07be52
 DIST pin-project-internal-0.4.22.crate 29649 BLAKE2B 5fe089083d07e39ba72f3aad2ae0118341ff6ee7da12743b0659f9c7ba54d8bdf937eba6e4cedfa4097638740690b10ee6e5a374d3e22a24b4da0f7999a1faa6 SHA512 1da295bd962141b9fead1a0bca528ffbd5e62300bd1a9ba85a96390b8ee0f8d0b2a74adea11e58c0424f41a8936457e1b751769632a640ae4fb6b5f49df9962d
+DIST pin-project-lite-0.2.7.crate 27212 BLAKE2B 71997c66fe24bbded0030acf9d460c8ecdd07f7a047007413ad5daee06ade30ce487e7f921d610f9e0bc7aa036391f6c595493d9b7d95c17e9195f5a2b23441a SHA512 c948201981269f6f54da069470c56c5b9c4c6f52e349dc7970ad828d412facfbb66a09745c0565b4320fbfd1aa7983f3664604f7ade37a30cf25ce253afe8749
 DIST pin-utils-0.1.0.crate 7580 BLAKE2B 457e1287202f16d1873b24bf4f1de1828300128c4ba3131758e64f9784d36d47365f22d85493c3a85d854f0d8dbb4c6cef3a0f5b064014dc03943e58b7ba9178 SHA512 828422b8440cc82ac6b0743e0112fa7540d437aed457564999092b1462cd7672cd6b1f0201b67075431aeedd3d9c5127468a3dd028744109944f7f023c82fd70
 DIST pkg-config-0.3.17.crate 14533 BLAKE2B 729b15209bbbee8a6d3854e30a89b3e6041ca3cf7b1460ff6008e37866e326d9ec8b4ac582c125676e31eefa048b143beda33432b95f00a8f51cc7fa33ee4986 SHA512 42be78556adc07dffa8933ab1436d5d6a776018898377d58dfdc9f961981f9f21397301b41536c55d8a3772bf74a38069899d1a5cddce5c24a032017137044bc
+DIST pkg-config-0.3.19.crate 15451 BLAKE2B dc23b5ef12719b4b3d2fc5c93c087399ba954a5e127be91b26619466d5d7422e71684d02905304dca65273d69b66338d94c0642e3810a14df845ef507ddc0bfb SHA512 42bc13c4e39c8f71690db527d815884acdfd2ccf5fbfea700c6ed60257e852cdcb1c443e7774409e51da53612b0ff0aa165554b99fd0cba973f94a8df52982d9
+DIST ppv-lite86-0.2.10.crate 20915 BLAKE2B 83a075381c24b2b89f5266929f5672ce051c3781c1a199252738dadbf471618c8b87452ce84e1cd87a9eac11b44107002894f544091210cc7e77bf52c045288e SHA512 c9941052e504b9b310024064026e4b1d540dd877705ef450a833d9ff6dee70ba874cdad68c46381a71d5b54482cd80b3dbb8e0c225758fd339069031a55195f1
 DIST ppv-lite86-0.2.8.crate 20848 BLAKE2B ca85104fc1d6b300aab69c7b9367ba04f77ccde38bb7aad80cf1f615490696b27d61dcf242574abebe54b288414fdec2b63c756e47f188386a0f5523482ad9f5 SHA512 224db067f771eb48e4b0ddc2b7a1baf7389a47675ba93da50e3e4d6c88cef09e0f4529f399350b1b3feac7a88469406aa9b967377177a8c89605c49e1179771b
 DIST proc-macro-hack-0.5.16.crate 14227 BLAKE2B c1aa49b3caed8ce1fb09a900b2d4ae60a6bba963945d329b65b048870fce6b4eb1b57ea492257fc95477c828e975b54f37e25e69e4460e578088b25270cc0a58 SHA512 d1de743aa7b29dad970c334bf81e477afd9c63e8f40338a6379d22901128b4b310ae9c09212ae913d6b10b51428a3c29c75337735266878979357023749bcb45
+DIST proc-macro-hack-0.5.19.crate 15556 BLAKE2B 98c22fc3e5f5fa8b6f44d15de42b6ffcc82ba3f98a07ffa48bcbc5d3abcfca6af136c5d0d8c7f1ca34261ed8f8c9c17a394231f97a4c342c81aa7f8b9e74b203 SHA512 9e4cbec41056438287f5b23086264c86e2f0cdc193064006556736377b2954229de13a585149b9995002c9aee3334ee2a80ae4afdcc96cabe7ed2bf718476952
 DIST proc-macro-nested-0.1.6.crate 6498 BLAKE2B 6225a30c1668ac20c3c9ded7633458ab7079bd126aae538762547b112012050e9aae22389e2a18cc14696212a092a9985bc72538d4ca4d37ca0faf34a68c3833 SHA512 ed89e9bfc30e8d7a9be742a02e8f269bcedcf511d9e1487866f198b4410a2802ab576171b844ed15fa2848689247afcd208016555442dc24fef7609400e9c38f
+DIST proc-macro-nested-0.1.7.crate 6495 BLAKE2B c27ad92b57837ab1ce220958846253ed29de12ee1ed849948e5202913371d877bb648e6880ac3e6619b8d48342e1fe105df56a0abda1b13bd62262bea4c85fff SHA512 dc5d898c6d5588d279aa0852193105bbb3824798a05875e2181c66da8c3849fcb32189d9b213cad09054242aa4ae9cb602f9c2d1b5e7302963bac244bbaa27c2
 DIST proc-macro2-1.0.18.crate 36252 BLAKE2B f55674ba8294f48d72a71dbf36a2e464898b96e53ff32d8dfb6f66271a3427e59e5f8e868309aa6c15e3b718983806b35f65599afa119ab76b658af863f90e63 SHA512 3e7cf577bc3548e03a2f1bee620e3ef484dcaa45fbaf7858a8ea04f79d82d636b527584765ef43c92624e1a1afac50e60ad3f9dd8efc34e8e6b84cda20c864ef
+DIST proc-macro2-1.0.29.crate 38772 BLAKE2B 742c2602afc4beddc96b688d105fd93b1dbdb3cfced724aaf542e97120d374d334e90cfbf02ab62741dd052a272dc583b7d2e1992da3d1b8ff260414c65ac89e SHA512 b3b3b7c6988afeb92209c7e0362f45f9c207611a74bb63bc7746b86fb9ab0d74fea9e7a2d9bc8ac943225ea439540726ffc13711dc5bcb056c1821fc99e8dc63
 DIST quote-1.0.7.crate 25170 BLAKE2B 9597c94ac365bb6e9d632738a88ece2da7818cb9f3fa0e755324e693eb513c76347032737025375a486319caad13c22ae13bcb257703eacdf2fdc755cbac0de2 SHA512 b7cb576c07419854f71072a88e4216f50d78196703d3d8a1068dfd0f2ccb1e417c3a865ec3be613b46e74e46654f64378f527800701f74d50352cb766a885953
+DIST quote-1.0.9.crate 25042 BLAKE2B 26ef31e89fd2f0cc21ff65f8072f30c7977ac634d2536cf9845a0894d6659f62a96cd0a6ee48f7706036c2c1b898ef8c9167bd62714ad0c9cba4fb02f30922af SHA512 dd6cdaea183b85400531ef01e56657edbec0d8f7c27898c1e591b72dff755fa5875b33ca320bd65be0e9aecfc6a61ec119a4bd1291e9f2057fca642ab5b198c8
 DIST rand-0.7.3.crate 112246 BLAKE2B ecc7c1bd70ac874c03bd8b7faa3016bb2d5ee5c19603280a12a45a81598f706e445971ee081e6ca410ab6f0f5f7a06d9315848cd556a2d8522a82024f6ff91e4 SHA512 f9b68ef9446f1ca2c8092c50990f15c1b4cb5529eeeac4df8d69755e0b7253c663c587775e7cb0a7298c31edb444975dda34926759306541f6d43d0d3cf57b7e
+DIST rand-0.8.4.crate 87406 BLAKE2B c09358416d2425a8243b623346fe71bf6f03fddab1a23fc752f4303ba7c241b3606629e4edf0ea720785bda0bca534acd675c2de079b78eac3df24a1ad6ba654 SHA512 77ae0e988e31e12f7d3f2c40814f930eecbc94c4aced827c337be78eeeabf39fde2dc5c4fda059afdc01285ff4afe30393c32694377de004feff16207606558e
 DIST rand_chacha-0.2.2.crate 13267 BLAKE2B 7908867ceac98243ade22e1b38f1903fe0249324484d91c948a5058a1e099e5213f325c5ba3400898c8319158ed69f4ed064164f235470856a8191bd990d5a10 SHA512 1e2117442e4ffdd834dcbf0ea1829e73202c0ff9041d5969d81a59330242145f2753f2a56de2fdbff65f26cf0d227c7d08b2094ab2f946b764aef88106a6ac84
+DIST rand_chacha-0.3.1.crate 15251 BLAKE2B 645771b2c3e274f085e0837a20306b1d59f6e9032fba8eb38a6d1b30180d15e2f89ffa2a162bf6358da41e030098242d81e71dab4321980d0a4f6ddfc2974ce3 SHA512 8198c580b1b9b0429758ffa49cd8138fa3ce724f0dcf73c767ea7e55611d6a2e4c7cad9950896510def500ce4062b594386c947ac3d89425b4e5c9b04d0b8075
 DIST rand_core-0.5.1.crate 21116 BLAKE2B e74791f941a79971f2741172d489d546373c9abcb0dfbffcb7b97b858ec800b2e0c97df4ac636f3aa1b8dd6c14685edf317336d577f31b5c6cb7d89a157e547a SHA512 4f7500b35e165e6c817fdd67a50745d5497d24e554bb554705097e37258751e8755c4d6b8a69fcb5e1977708ba78620bc35d640e4e018fcd4e88d9dbdbebdcbf
+DIST rand_core-0.6.3.crate 21938 BLAKE2B 7c73e2da6d423c68dbbca31f6528bdb3f42fa39b30d0951ca7058e05ce16ef09ef5e047697b33ec17720314f934512c0907aeb892df93d63abd8b63eda2b50a7 SHA512 0fc31f96ca8ebba8c179367de01458e909265e1d627ec0c5620be7c8e83d2f9570471d6ec2cb2bc4bc531505b02fc31f1165708cc1357906791c87123b06ee87
 DIST rand_hc-0.2.0.crate 11670 BLAKE2B 55fd048f2524cecd4f0e17927a81111e3070a8cc6a5b0234a46445400ad5527194edf8c91fb5ad6538f4958d53044ab02424f61a38adb2931e2cb7568c458ee8 SHA512 bca185612bed5cee4da76fb68fe854105da276f5bf2da464e596d586b925df798cc692ed881e276ab77c36b4b0551930966c93656be122ad05899d87853533b0
+DIST rand_hc-0.3.1.crate 11891 BLAKE2B b3aa810638390eea4245ebb711de88ccdc2a64350a5c6e14064fea7685d49746b4b77215dbb8374fa7a6cbc2cfd79fb553513d6e551acf64586d8303f7d4f3a0 SHA512 582bb44b81c27e698eb57c6f06444b8a7c9d3f7ee73f4e14be8004c4bfd3bbfd9795c69f7294b5e87107e86b90fa3e91ad080964474af81c92705d356e43fbb5
 DIST redox_syscall-0.1.56.crate 17117 BLAKE2B 57b1b01ef3cbc6f55def6c9a0dcde16bd98e83badcef993e26ae3ce849abcd1b1c10f4da931c605970d77f92471734764a537e7329291a221343fde23f3591eb SHA512 17a3044327aa733c830dd74e210d6bda32622617d1c5af9d70d7647232d8569ad0b04ccb14042cbabb5d97ad98e3f1f5a9968a75387354ffb4d175e9577115a1
+DIST redox_syscall-0.2.10.crate 23582 BLAKE2B 7253dd96415e7b70df488c208d86c250c670b1245ac6573a59085faabbde9e33fabfacd233e7d737e365493db14008c180274b41ea0a4af5f6f98eec666a873f SHA512 ef012eb4bffe32119e50ecdbef4cc31f6e84a344e94f026484fe4e2c904f94053a8b6249fb6bd8ada31b3ecfbf0096085283bb68aeb62b1b01b57f35794aee92
 DIST redox_users-0.3.4.crate 12526 BLAKE2B cae43317cc63f129bec8d4da5959e5b00a17c4ecb35d5a18a410f12b70a9f72c235afcdbf9bf5de71a94cfe02f46d7e2d6988b536d02ff1b333c6025a5ab906d SHA512 7a42f4b6ced1b8ee53f2c35446154fea6646bd1634133738a281788e69121bfcbc02d4aeb88d25729382429945c0e89b6de4b6b63831e645c6197ff4ad022831
+DIST redox_users-0.4.0.crate 13023 BLAKE2B 66d0d1169f98a27a00930c86365f289c38659c0d7b248a6870d1c144dfe63c9752429b2912006527d42aa321f9605892ffa85257eeff1ae148254bf370dafd02 SHA512 4058ffb2fd57631eb6346c8839262653af3f2e670a69bb5739d64adeef7347849b18e191c594303da1f5e29b4a3cb000161fc1b3ea4b7f94585977597a2574b9
 DIST regex-1.3.9.crate 236683 BLAKE2B 29bd39b138a8168015bb7a6b36bb5f7f9918b7c00bca28a720f3dffd5b805d3374a6648a04792585e85922e099faf547e5d02aeb23008b7802424351633ea23a SHA512 425713d3eeb4132d4056e6c1a08bc2fa5032b9971987c531b5707a9b5670ae15f037bd68921f1545580801957d1ea283eff87e533477364c7f76823800202f74
+DIST regex-1.5.4.crate 236581 BLAKE2B 6efaf69d1a99dc3a2e04b2d1a96b036f631e9a0ad0d3aa57263febd47f7ec12765526f06f9c52a5497bf0d9b455f1d1b39e011adc4c28530c44b65c8a453efc0 SHA512 1a9208358c4ab87c19ec91bcf5c1e35dede46f3a0c0097061b7b53fa77a1e5ad38090d243aab274956f09c491e5fbe3b3b35a91db079b82a2dde2fd9fbad4c19
 DIST regex-syntax-0.6.18.crate 294440 BLAKE2B 355d6a2704e1267064719927269facce1f1c8897566d41e54741183969cde5e56c38d0c0b610b99dea3635de20fa00ebfb8748ceea331af6984198d927a93b73 SHA512 9cd999837890a87d0cc6bc351029a422bd52e5c621763e5c11ae9dcf1ba5edebabcd9e6d70db0b1656072a6109d439101412b3aab0d6ad357ae02ee7039a010e
+DIST regex-syntax-0.6.25.crate 293293 BLAKE2B d5ca0dbc26b03c6a1818026f9a69cd226ec934e7c64094d0ebe843052b648617ffae7aa3a074f8da46d03c46996d8b547d8916576342000bd9711089b3e57d73 SHA512 a3d31f82aadc6be1796f76c03152ff24f37fe42d6ce27fb98e2f55ab102f86502bc37ccd563f6e0eba61aab20d002184c618517b678b3b93cb8f0497cc046ca5
 DIST remove_dir_all-0.5.3.crate 9184 BLAKE2B ab7ef94e0230ddc9b363f038254a180881bbc20eb04a254f97e6f71ed491c99ba1c88f5e85632d450243882a4a0df63f3b8b183bc1fbca9caf30ec23d577b1d7 SHA512 50417d6d8a33912193a1ed37eb72b47431b12ae65d2780cdb7080c3d141e63819da13751c3fb737685cea322f70b36d413389c3dc01aa12b4dce615aefed0e2c
 DIST rust-argon2-0.7.0.crate 27757 BLAKE2B ddeea9ffda1216294e0b8a3dced747fffbd8198fb3b5b74a347a8932a242db7c81554c08c3757574cfbcea5b13b253737df098355e65685d8ae7d95f55306290 SHA512 7310b7f993eb190c155b982bcc6e88e887ca4605dcdae521f0d744f48a5646694c4befa5518f9c94d303c8af1d9111e59c1c67512a9dac4e5f30b83cceed8ddc
 DIST schannel-0.1.19.crate 42755 BLAKE2B 11503202bb6c8fdff3cc716558a5c00ca7497f7aaa4890d332084754e0d1e1013719d5bd744d8aa12b8b042401f4828fda8453c104d5feeb9b437d7cc51b5273 SHA512 319d9931cdeaa0f6b50c46e413fed2b6e97b28fe8c4825d4e5ed0fe22083e686e124117bfab7c89bcce815a31a3478f8c230cdedae6a852a31719a0df34645b0
 DIST security-framework-0.4.4.crate 54841 BLAKE2B 75cc13b6053b491564b9e5329cf56c2da8800e61980a7030d51b09cabe2275a33844a4eb8b030dc96292c54211a37c2e638ec7c2dc4b1f650d57b4eb782b7413 SHA512 d17788d1300ce6d6a552f78b278f50056800aeeaadf7039576ce75e975aa371c2c9b86de2aa2c96e8b208d9240d246e0230f8788372f0e0f800d55a7ae8b7955
+DIST security-framework-2.4.2.crate 64857 BLAKE2B 7ad2311ec2ab1ebe8aca0b55a5b6b1dc328ad294818896224e950cbedf39cdda3e130395c5c2dbc64ccd3fa5603d028a2c0890c38c4a18dba4a25bd22cf66380 SHA512 de4480e4bf70148cdcaaf3a9c0e52ab061cea452b3209918fbda693faa7feb8c2df56ac29139bfea74969b8f62ba3ab2b3da38654e35aedf62fdddcec420998b
 DIST security-framework-sys-0.4.3.crate 10508 BLAKE2B fc49b876d89f479c8654059163566d4b7db870dcc21d7e1061ed92fb6e9e1e8751b292b726020f73cd931797436f7fac02ec26ae7306fc826e8c4063cacbc5f8 SHA512 a849f53a0d222299a83b38c55dec7d1282027c7dcd962c8e638afb9aa2f96bc961e93ca2bd34bce424f408d239e09b7baaacde8c2ab53e78860dc31f6bd76746
+DIST security-framework-sys-2.4.2.crate 12821 BLAKE2B b1731747e2525aa3aad02be4da8076f6e25d33faf54b431e84c0bd072ca236c682ed492621a7aef725d0c1bd20a5f35ef01d0d518b06fa7bdfd2417b081f4cf6 SHA512 d2f35545223f1ec671f9265017c393a6219cd1ac551ec7b3bea6f90ac9e79cd9d9f7232fe7fca5f0c093b3f549925571d5a4f0b702f29a1e992e038446f48bd9
 DIST serde-1.0.114.crate 74453 BLAKE2B d5cd4b23a0b6555f8efce963e833b0c293b53cf33a3846ddb189c8d8d8ef5f157c45e33833baa21683a336b60de4785509288c417243b43fc5395e5df6a4e7dc SHA512 9c8db28e52686bc0d428374f13e5a5f4ccb235ef17d8840aa676042321fc89adce4cef4dd00700bd25c2024f79a96d91eca8ec9122e899056116a890cb90300f
+DIST serde-1.0.130.crate 75305 BLAKE2B 3973b70d8e06ab7c2f35e19f23739e8e4dd75dcdcddd818771be5daca8c61f6e2a7a830b4ccb8b3e3898769d7afdeb39ff217bcbf40bbd00867c13bc4668f905 SHA512 e6d6444abadcdac95ff15cdab53736adc9ddd1b6441d67158b6b41e68bee4b7763f9c2d80a857f879f40620429e8f04a90b01380c8c88da45a273c3ad13cfff3
 DIST serde_derive-1.0.114.crate 50733 BLAKE2B f66ccfcbd8ccbdea4e3acc7fcb33fb1da516cf41e75c2993c2de79cd139fdf1b7c0ff6a95790df623eaf8b30fce4dec80f2a9c5332a8047dd0812fa65170737c SHA512 b3bea48a9ddd9c442a4ae6d0b76a116450e648976c02f07c2acf48459b15aef9c69d4843c2f04f387015c7f3ff5c3a1f4e5d1dc1e3a3ec3a114f6a651874aeb2
+DIST serde_derive-1.0.130.crate 54703 BLAKE2B 35db74464913a93da88b80cf29e4983bcc4377e397618064b1cb397ecbc9e6620c863e4d365153d03ab77ec6dbe9b1d03f8f86aba1adb76fc6d697f39ea7316f SHA512 d3ca974bf8856ed8a73af4eaff69941b35eef187d7e348d6d2ef9ee79eccad893e66270c7d814ac3871e09e21e603d34d7d1f24b182d9b39e9219acd42a7baa8
 DIST slab-0.4.2.crate 10136 BLAKE2B e30cad459bbbb69c4b56a573c47f4188714e0da298d87015c35a86c9315dc2d4308f27d7758846069b0cf94c93f10c44b0f8895427cdf1c93ae20adbb21b5977 SHA512 f9fd70d0cc5180393cebbe87fe984de0c103db1c2c2648fb7a0ee22cdabf37a7338fd511538f00e9a5564365cce2879afe19bf77c435870197bd6cafef5d6661
+DIST slab-0.4.4.crate 15725 BLAKE2B 54f3d5e4e76aee03d52f25e2927c03c10d89fb7ff62d83ba6f56003daf8a98e63ec220f564107f3282e96bdf3bd525b68e71511ba367db2550d3aed18b4bc59d SHA512 a8232c85d9693c2a417201768a5b2ecd82e3a721fee39ec80e44c769c66f8cb3ddf00a157f376ebe4c168082550ec48e63af23de2da4f30ed343b4e3bd13c3d1
+DIST smawk-0.3.1.crate 12840 BLAKE2B 937471e3ec3431f174264ce41e7a9c8ac781f5ce3638afe6219173730f5a0d0cec2b482ca72eeee34d5765c75db1707433b2c5b5004cd6d6fa4809f606b26813 SHA512 d6a050e873da5c90de3ff9fd02166de3be4c03931de9cac5307e6c16a71b8db1db6e8309eaa38ad408b20e0cc98eb4133595ad7aea96f62ebdcea579a643b65f
 DIST syn-1.0.33.crate 204845 BLAKE2B acde40a1eb59a78ef17afd46fbc5dd3710db4a1fab1d2ca6159bfb1ab3e3ee4182818284ed6a78f6babb539312dfd46eb43dc62842063db953cedc65cd307ba6 SHA512 82408aea39c376825b977d54ea339661cf54664358637e5caaf8efaa7d08e03385b160b3317060c27662a621ab5752bd761cbc416165d1c2cccf28985d73db51
+DIST syn-1.0.76.crate 233723 BLAKE2B 99b781b6ffa926ca71d0a09ae81dacfc6ee713e15fd057232e527761b73f088c30967eb13d624bdf34a089c5a33fa28ecf6ca069e3dfd7061932643849243967 SHA512 0f32138d219ca74fcff1ee5ee5bb89f965a30b74c10a040bd8361332cb84900322194dd85ad7571c4bce72c1f66368546db5881165939800f2587b15ce07298a
 DIST tempfile-3.1.0.crate 25823 BLAKE2B a34721369923771d5f9a2fc64adaff2bff41da97a0ce79e01aaedb8d6670867220c671c0d23f7a8a9c71b09c0559efe4e7c9bab1f7f9d890866be1de1ce050a9 SHA512 a87ee51c36a81a8a8eb8f091eb57926682f38b707f7f641332d8752170e6c139a656ae49c6861f51e07c2fab5c86cc9b2ac158f5d89c6bff15d18934dd4e7ba5
+DIST tempfile-3.2.0.crate 25892 BLAKE2B ea6870c642c5712c7c96072a5d3dc04d75c19cf1413081e3bf53c1ae6c75e05ab537446071cadb5460b34f7fb7715a03005a1335a64139458db938c3415f7c0d SHA512 56d1c5af7cb6863f9eac990354126979534aae7bf298bc8b1c918c7317ce2ba31f53089aaa1ecf8baa4a39d4111d74f4450be82b509b3c2aa0428880029e663a
 DIST textwrap-0.11.0.crate 17322 BLAKE2B 257428908342774593bbd3528fcdae710712ff54e8a711393a24356d8ba0e16e466a4b20c05f942c48ca76b3b5b5aaa90ec202f782cad892caa8b71ccf124da6 SHA512 f5c0fe4f28ff1a3a0931e8e235b5157a45f67967985bcc752418c5ec3481fca44a8ae4800088889b37e8cd0533f53d3c456d5ffd19b767b3f83a87b49a2e209a
+DIST textwrap-0.14.2.crate 52016 BLAKE2B db80b15ba23db718064ef0214578ea6aa4f0ee3b76723adaca131be26b770324205f2ead13c8f5c1e438ae1b5c9476cf1ede8f4ed82426c9d99d9406f2b83191 SHA512 521ab37e03aae8fcce5b909541399fc90a23020e353f95102c658fa94ffc56b9bdff43f47fb3da6e30f5c9cc9447fab72fe21d7276dfa21fe5a1a5a1c874e371
 DIST thread_local-1.0.1.crate 12609 BLAKE2B 34206b5232262cda9cc0fb970e20f154d43ff1c4477a5ad5ff9200e6d874a6c7b2bcd99a2dae75a984b54574281e049ad35307ace0dd188f44c9a95fa93139cf SHA512 f2bfca4eee32a8fc88a01ff5bf24518c12142228d95916d13aae35ed6addd0b7da2235359f15220049ef197555344ac31a8833775e7a5bd49144db9c54b3165b
 DIST tinyvec-0.3.3.crate 17860 BLAKE2B d3665da9e5e2369bbd68c84827ce13cd1c0afa07b8cf689b04a62e24e5bafe41e8f32b136e048ce85aad324c22ca68fb43995a5445092d1f331379366f71cb03 SHA512 41200e022e66624b45e186a5ef6e7cc05dc3e2fd28d332deb689699b17bb85ecd0d960809e4ea2a08ac1ebeb5f2fcf364f4f9626d297f23169476c8be9dc1557
+DIST tinyvec-1.3.1.crate 42386 BLAKE2B 9fa7dc7c4967bc3ba3f7e5fbef54a7b6fca46f6520aed2482d355b1f6434ac702e073df19034908f214e5c0ffaaa3bdb41c7d394d9f828dbeaa177158ee99ad2 SHA512 ad07998e9bacccf8ce2bcb01fea8008c6514ad73c15c6426453cfdbb432dac7d588d05551b179c83ca062ea02f0853e97e2b9712da0b8dc20ddab4c0efd5afd2
+DIST tinyvec_macros-0.1.0.crate 1817 BLAKE2B a3d1966bf57c11afcd026269135a6189f149f905bb70b47537c0a7bcaef0bfc6c89bdcbdb0f6cb8e5255632855134631c683fc90606a254ec8ba818fd5ef0794 SHA512 d6afc83a3c70cde916a6ff599e2772588e4bbfa7a5b1c7e5c8aa0f4a8a5c9426182497a644e4a88194ece986d38fa64b6c8eda9eb1630441c8e65a8741a45873
 DIST toml-0.5.6.crate 54341 BLAKE2B a367d22daf6169dbdc9cd58c97f824ab76567679e1032af7a0f924ca53720d2f0989c14545d1f5d82e7f46293e3d27849459157d0cd77dc78e9d76dd6d200648 SHA512 718f5d3fde823ae5d7fbea31e3cd0eaa66f6a2bcd854093d0179dfc4328930a984deff466bcabf3c81caa323aa743c609136b8d036b80087b88e888ba7577f54
+DIST toml-0.5.8.crate 54219 BLAKE2B b4f9f563e5ba4574d4f2dcbe244378a2e1e984bd9fbbbfa5a06bdd5f8b8d677394f0db9cb8696f6936c80a52caa86b1b3ebaf3885c53855af23f03d318785f19 SHA512 26b7901ee4b7cbb4cf8ea57d365a99ed05e0a76e73452e47d4bcb3b4eeb7bbd393c13eea9ea33dc13622942efcda39acdba9425b74b40c920c9f19673a1f2082
 DIST unicode-bidi-0.3.4.crate 32228 BLAKE2B 853a85b29d1ac2025b7a28af64ead9387e3b4b1e790ad719d4374e349c1853ddbb5959a2890d9d6c94a5c28e4523fc3324deb6b1ed1aeb5e917f21b0e2516f6c SHA512 170ce083fa82bed13ecc62d85cb882fdd6491ae721e1633d3c1a5d3cee69422153afcf6695765c0e8fc7035440d0370d34afac9e978cb27f7506c07cba300e1e
+DIST unicode-bidi-0.3.6.crate 33737 BLAKE2B 90cb2d05bcafd32a237b747e290f3dba186d069845e50ffdcd7e62a2ddd73f4e8fc27ad972d86453ff375fab50fd5ec47ac323413e351fb7d4b80f1536519d7f SHA512 a1013539b0da1609d9c37cc1d8359efa93bd88b4ae176d25398e6c44d93b615835a54b184641f00313b14cf46542b1e92278b0dc1bd00dfca0566467b21857e7
+DIST unicode-linebreak-0.1.2.crate 69293 BLAKE2B 825dc2a29d86314cff3492cac71add2cd48948284d9e9b684580186f4c021c8ce1e288d21cc47493eb19a158385ec602f0cd5608a7618e38667c1cc7445a302d SHA512 170db67d6d74df913dffc921986b92df8a2ba68776ddb17c8ffca51d0d4bee597a5460591e7ba593c1eaec8b6227956f4e0f9b11d217aed4ee85cf46f1be5277
 DIST unicode-normalization-0.1.13.crate 91691 BLAKE2B fa4ae7ce7f8e5dd43ab8e60dd48938340485de3537ad14c1dc1e7404a89d2b3022c4304cd85a4c649b8a27fa9c79e4a059d3e5d5c2011d920290d8719c74bc77 SHA512 710e002da7f59e933cbd09fee328193a1e19cce7b12426007ea32fc81ef2adefa5c4f2ad360ad684a937ab18d4be404a0a28c3de375628168fabd21ce1a6ba20
+DIST unicode-normalization-0.1.19.crate 107353 BLAKE2B 4c69d50efcae131eb4b91d385a64b49412a11ba913b3c0364cd04ad107d59e31adbda74d34ed13a065d9a7825d79fb740e82a4dc66b7813a9837af4352ac9e16 SHA512 7459e9d2867308cac80a98d8dd0b0cce797e2830ea5ff55b878f7a37a6f5e1f0bc14340e1a29955298d660ba2be57754a1478d74851b1b90576dd5bc4231729f
 DIST unicode-width-0.1.7.crate 16644 BLAKE2B 8cc5ee2dfeeda8ffe3405a0d4f1576d2b3b8ede1a42cbefb0ba3bd0d71b53a92ceade86c4a06e9d5b31382955dc6e1152ae5cd279dc26dbc51f478dad1d0f64d SHA512 39b8a539c9009d0421f54ae68b139f21456c9cb03d743b58535a977f98bc9655cf42eaacfadbcff796c187a6f315ae16259ee22be9c2da5aa042172c6b464d84
+DIST unicode-width-0.1.8.crate 16732 BLAKE2B 5aa7b87eef1322e4151a3fcf981ade311b8fa030527d7561815950e58d3f15156163dfe34da6a708c37dccc3f7652bf7fc2cd899fe8bb0118b67c4113ff3a2d2 SHA512 0abba6da6981a2451e01d93bbd47652c46eb6fb07cc0214f33259fb29945bfd5ee2b302e883ddca8f68e921635f222701b7310e7da2a5e225f854980d1e474b0
 DIST unicode-xid-0.2.1.crate 14392 BLAKE2B 7f8f91b9c4df55f2137b754208d4f2997a290acfc9393ee2dcda8195eda25cb342e56ad123f56bb298d93db5248a749c18a982423c9a0e85ce93f7a1eb55d289 SHA512 91e862137e837baea82829431cfed36634fdb05339f00c756eb5a4b429ef0bb871f5133d11adf9a023fa22168c8a0cf194ff3669779f04f219d48fc4fac339d2
+DIST unicode-xid-0.2.2.crate 14955 BLAKE2B 6c6da49ac08dbd8b3248272224d6bff96b9cd1f36029b1937a58a0b929c3a48326053305ed49e73edd70f572f5abbc4817cedc899c69e3457805ad056669f6af SHA512 92ffd0dd34e3ca235ecf110b38c447d3ec1faa23d76c112457f28d432f92fa6b5f428bc5e1bfd278f361f55426dd96e19ecb0d3eff6cf250892f069c52bd89a8
 DIST url-2.1.1.crate 70383 BLAKE2B c4096cb1bd50e9ca97fcdae0ee8b58957e21507607eafa8d84ff71c3df1ba52c68299609776f7baa45c93b971f8b61162fd8afd4174a5c7b66f36dc673707fa0 SHA512 a16c3a625fa85be9305f8150d5711c3e3aaa1f33753e7ecb8368b176cf3ea96f51fde74598c8ea3a5db2effc338589fd2834b297a1fba4bed967fa39e670fabb
+DIST url-2.2.2.crate 68555 BLAKE2B f8e59f784b6c2e16bacfba36ad68670a6af17c16ea3b0866b5aa98e5bf4686cf1b1aac9b1f0a0ea3b89a01e044a2ca37830416f42d147158ea8e88f23fd28ac2 SHA512 f9b6ad99d69ff303283b3fd9e98945fbd6cb411a3d141badcbb3a0566723a451375e6dd5d5357e3eb7a1b5b1ee5756a2347c43817db2de6fe35b9004b090e077
 DIST vcpkg-0.2.10.crate 11504 BLAKE2B ab7e64091fd2c12292282a0311716468bcf584dd3764cd0c4803d40702104a57ace0a138b06cb1429a166a61e069788b2c45c3286d3f4c5bbf6ac30e816add14 SHA512 4c790344fd3510eaaca5e1539cd676c60124b2ef157e85f89322f294ab6831c2acf6efed1529de4bb23d9abfd0b5f962eaf8d3221c827b0718834d152b28c141
+DIST vcpkg-0.2.15.crate 228735 BLAKE2B 6b6bacd9a7fa38919241f45a97f58cae957e58d3aac99df208a26aa718e4f1644f4ccefa31b09151e5c1952288e0e5837c363918b98c7f55079a948a952c1c50 SHA512 7322a21e8811b2fe4e79e09dc321458068ecdf1953f05d36233f3278ecc0b1dfc64194db7010dd46fcf692285f42475beb090c6c6cac0c8f9fe0eb5c770e3172
 DIST version_check-0.1.5.crate 8173 BLAKE2B c1778a95fbc79e93bc25d6ee85c408cbcc2afc1a2317bd96b6d5e1c99862f26cc031e0a8b14451d7ea5a44d96c9b599c899bcebda36d3974effc51f9c236ca56 SHA512 cd3ca0b36108b0fe8e6a5c26614b4f3e3c36ffd13cd9eeb7693086b4a1f7b67c025613d90e79f4dd1bd3234a3e387b2ee890c6c410fe67d293b9b5503f5e9362
+DIST wasi-0.10.2+wasi-snapshot-preview1.crate 27505 BLAKE2B 4eb8644b945633d6e856ad80dd74990be19eb6af99823b147163384f61d471e2d9ec054d78a7064072344be53783e57073e8fffc6d5555c149b4834a9bf31dba SHA512 06977a294d76369a3867c45abdd8a87ea5c84e5a3681075ba0d14af1aee3114ff24495c7e7f7fe1e6e42230e65fba0e062898e69bc89e0209af62c2d14094ec7
 DIST wasi-0.9.0+wasi-snapshot-preview1.crate 31521 BLAKE2B 716bdd2ec46d0bc9911c5e5e29fc783840559931b2563d8619675fc11da9527ddbe653a0f1ce0b782ee0c5f7a3131aba2b0867d415f003aa9c2389357569e7dc SHA512 dbe641f796ee3a5daafcaafc911ecc6dff170340f477c2df7a61fb4858a85aefc2637c9e61973ecce66a987aa8e08a736273a4aad3ef47eaf61ed4268dbf9c47
 DIST winapi-0.3.9.crate 1200382 BLAKE2B cb5799749ccd935ea2d7068d953cecf19f543d9db7dc16ad4584bb7005373ada34937a3ced7225544d8bc765da599911c7a3190efefb3a25b7c1bb7123b4f673 SHA512 ff8b7b78065f3d8999ec03c725a0460ebc059771bf071c7a3df3f0ecd733edf3b0a2450024d4e24e1aedddaecd9038ce1376c0d8bbf45132068cf45cf4a53a97
 DIST winapi-i686-pc-windows-gnu-0.4.0.crate 2918815 BLAKE2B 4d357e4d30f9552972170d65b9a5358b69c46a3e772fe05efc22f3d4ffc1caeeaad7aacdc7abd503a7ad0545f8bd7d22bf351dcb6df76f812fa4d45c34d65df0 SHA512 a672ccefd0730a8166fef1d4e39f9034d9ae426a3f5e28d1f4169fa5c5790767693f281d890e7804773b34acdb0ae1febac33cde8c50c0044a5a6152c7209ec2
--- a/net-misc/castor/castor-0.8.18.ebuild
+++ b/net-misc/castor/castor-0.8.18.ebuild
@@ -5,40 +5,35 @@ EAPI=7

 # NOTE: Generate new list with `cargo-ebuild ebuild` on every bump.
 CRATES="
-	aho-corasick-0.7.13
+	aho-corasick-0.7.18
 	ansi-parser-0.6.5
-	arrayref-0.3.6
-	arrayvec-0.5.1
 	atk-0.8.0
 	atk-sys-0.9.1
-	autocfg-1.0.0
-	base64-0.11.0
-	bitflags-1.2.1
-	blake2b_simd-0.5.10
+	autocfg-1.0.1
+	bitflags-1.3.2
 	cairo-rs-0.8.1
 	cairo-sys-rs-0.9.2
-	cc-1.0.55
-	cfg-if-0.1.10
-	constant_time_eq-0.1.5
-	core-foundation-0.7.0
-	core-foundation-sys-0.7.0
-	crossbeam-utils-0.7.2
-	dirs-2.0.2
-	dirs-sys-0.3.5
+	cc-1.0.70
+	cfg-if-1.0.0
+	core-foundation-0.9.1
+	core-foundation-sys-0.8.2
+	dirs-3.0.2
+	dirs-sys-0.3.6
 	foreign-types-0.3.2
 	foreign-types-shared-0.1.1
-	futures-channel-0.3.5
-	futures-core-0.3.5
-	futures-executor-0.3.5
-	futures-io-0.3.5
-	futures-macro-0.3.5
-	futures-task-0.3.5
-	futures-util-0.3.5
+	form_urlencoded-1.0.1
+	futures-channel-0.3.17
+	futures-core-0.3.17
+	futures-executor-0.3.17
+	futures-io-0.3.17
+	futures-macro-0.3.17
+	futures-task-0.3.17
+	futures-util-0.3.17
 	gdk-0.12.1
 	gdk-pixbuf-0.8.0
 	gdk-pixbuf-sys-0.9.1
 	gdk-sys-0.9.1
-	getrandom-0.1.14
+	getrandom-0.2.3
 	gio-0.8.1
 	gio-sys-0.9.1
 	glib-0.9.3
@@ -46,62 +41,63 @@ CRATES="
 	gobject-sys-0.9.1
 	gtk-0.8.1
 	gtk-sys-0.9.2
-	idna-0.2.0
+	idna-0.2.3
 	lazy_static-1.4.0
-	libc-0.2.71
-	linkify-0.4.0
-	log-0.4.8
-	matches-0.1.8
-	memchr-2.3.3
-	native-tls-0.2.4
+	libc-0.2.101
+	linkify-0.7.0
+	log-0.4.14
+	matches-0.1.9
+	memchr-2.4.1
+	native-tls-0.2.8
 	nom-4.2.3
-	once_cell-1.4.0
-	open-1.4.0
-	openssl-0.10.30
-	openssl-probe-0.1.2
-	openssl-sys-0.9.58
+	once_cell-1.8.0
+	open-2.0.1
+	openssl-0.10.36
+	openssl-probe-0.1.4
+	openssl-sys-0.9.66
 	pango-0.8.0
 	pango-sys-0.9.1
+	pathdiff-0.2.0
 	percent-encoding-2.1.0
-	pin-project-0.4.22
-	pin-project-internal-0.4.22
+	pin-project-lite-0.2.7
 	pin-utils-0.1.0
-	pkg-config-0.3.17
-	ppv-lite86-0.2.8
-	proc-macro-hack-0.5.16
-	proc-macro-nested-0.1.6
-	proc-macro2-1.0.18
-	quote-1.0.7
-	rand-0.7.3
-	rand_chacha-0.2.2
-	rand_core-0.5.1
-	rand_hc-0.2.0
-	redox_syscall-0.1.56
-	redox_users-0.3.4
-	regex-1.3.9
-	regex-syntax-0.6.18
+	pkg-config-0.3.19
+	ppv-lite86-0.2.10
+	proc-macro-hack-0.5.19
+	proc-macro-nested-0.1.7
+	proc-macro2-1.0.29
+	quote-1.0.9
+	rand-0.8.4
+	rand_chacha-0.3.1
+	rand_core-0.6.3
+	rand_hc-0.3.1
+	redox_syscall-0.2.10
+	redox_users-0.4.0
+	regex-1.5.4
+	regex-syntax-0.6.25
 	remove_dir_all-0.5.3
-	rust-argon2-0.7.0
 	schannel-0.1.19
-	security-framework-0.4.4
-	security-framework-sys-0.4.3
-	serde-1.0.114
-	serde_derive-1.0.114
-	slab-0.4.2
-	syn-1.0.33
-	tempfile-3.1.0
-	textwrap-0.11.0
-	thread_local-1.0.1
-	tinyvec-0.3.3
-	toml-0.5.6
-	unicode-bidi-0.3.4
-	unicode-normalization-0.1.13
-	unicode-width-0.1.7
-	unicode-xid-0.2.1
-	url-2.1.1
-	vcpkg-0.2.10
+	security-framework-2.4.2
+	security-framework-sys-2.4.2
+	serde-1.0.130
+	serde_derive-1.0.130
+	slab-0.4.4
+	smawk-0.3.1
+	syn-1.0.76
+	tempfile-3.2.0
+	textwrap-0.14.2
+	tinyvec-1.3.1
+	tinyvec_macros-0.1.0
+	toml-0.5.8
+	unicode-bidi-0.3.6
+	unicode-linebreak-0.1.2
+	unicode-normalization-0.1.19
+	unicode-width-0.1.8
+	unicode-xid-0.2.2
+	url-2.2.2
+	vcpkg-0.2.15
 	version_check-0.1.5
-	wasi-0.9.0+wasi-snapshot-preview1
+	wasi-0.10.2+wasi-snapshot-preview1
 	winapi-0.3.9
 	winapi-i686-pc-windows-gnu-0.4.0
 	winapi-x86_64-pc-windows-gnu-0.4.0
@@ -117,7 +113,7 @@ SRC_URI="
 "

 # NOTE: Update after every dependency change (cargo-license helps).
-LICENSE="Apache-2.0 BSD-2 CC0-1.0 MIT MPL-2.0 ZLIB"
+LICENSE="Apache-2.0 MIT MPL-2.0"
 SLOT="0"
 KEYWORDS="~amd64"

--- a/net-misc/rtv/Manifest
+++ b/net-misc/rtv/Manifest
@@ -1 +0,0 @@
-DIST rtv-1.27.0.tar.gz 17277593 BLAKE2B 25d504a7715cbab926d5dc612baee223d9fa192828763edffb3a8fa09861b2c6bf6835adda638b1300ecebbc2e1822709971dd9e63ea7e05b6a7eebc0d5dbda7 SHA512 38a136af0b9a4e693e9db119ebdee332a20002622029107c1860dc32f15fe2d4a0b68d1a45e6817e9c00a3aaece3dfcd604f04de71a6dec4bbf1c23df2bf6605
--- a/net-misc/rtv/metadata.xml
+++ b/net-misc/rtv/metadata.xml
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-    <maintainer type="person">
-        <email>svdm-gentoo@protonmail.com</email>
-        <name>Simon van der Maas</name>
-    </maintainer>
-</pkgmetadata>
--- a/net-misc/rtv/rtv-1.27.0.ebuild
+++ b/net-misc/rtv/rtv-1.27.0.ebuild
@@ -1,23 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python{3_7,3_8,3_9} )
-PYTHON_REQ_USE="ncurses"
-inherit distutils-r1
-
-DESCRIPTION="Browse Reddit from your terminal"
-HOMEPAGE="https://github.com/michael-lazar/rtv"
-SRC_URI="https://github.com/michael-lazar/rtv/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-
-DEPEND="dev-python/beautifulsoup[${PYTHON_USEDEP}]
-dev-python/decorator[${PYTHON_USEDEP}]
-dev-python/requests[${PYTHON_USEDEP}]
-dev-python/six[${PYTHON_USEDEP}]
-dev-python/kitchen[${PYTHON_USEDEP}]"
-RDEPEND="${DEPEND}"
--- a/net-p2p/monero/Manifest
+++ b/net-p2p/monero/Manifest
@@ -1 +1,2 @@
 DIST monero-0.17.2.0.tar.gz 10622184 BLAKE2B c439e447f524a08a7ee79420873b7cf393f5cd3269460944aac30a315ac7c273c12fd809d86d41445bfc7e8c2feb0538d4e9fc1dadeb55f7e09f2920778f07a7 SHA512 85b764f1fc25127e7ca4ada67b1d832a9604c4cf65b160d689650e7ca7bbc36b73d8b26c5409fabdaad7369684997447cd812d1c521fad19d24f5b35f4789a1e
+DIST monero-0.17.2.3.tar.gz 10640501 BLAKE2B 15c7b92e7d00788214953c09af96d578e79c65ba9263d2a9ea19cfb9cc65e77d15770b873a10b77aae9e908dce74162d3577ed241600ebd57098b860bfd8f114 SHA512 7f3363c2cb66fa90a47a4cbb03b367182afa63af21d40bf07ea57cd91e4805684ec4795c0390bc966626a3b7b3c0a47167036873f5d1ea4b487a3d02bf01aaa4
--- a/net-p2p/monero/monero-0.17.2.3.ebuild
+++ b/net-p2p/monero/monero-0.17.2.3.ebuild
@@ -0,0 +1,117 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake systemd
+
+DESCRIPTION="The secure, private, untraceable cryptocurrency"
+HOMEPAGE="https://github.com/monero-project/monero"
+
+if [[ ${PV} == 9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/monero-project/monero.git"
+	EGIT_SUBMODULES=()
+else
+	SRC_URI="https://github.com/monero-project/monero/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm64 ~x86"
+fi
+
+LICENSE="BSD MIT"
+SLOT="0"
+IUSE="+daemon readline +tools +wallet-cli +wallet-rpc"
+REQUIRED_USE="|| ( daemon tools wallet-cli wallet-rpc )"
+RESTRICT="test"
+
+DEPEND="
+	acct-group/monero
+	acct-user/monero
+	dev-libs/boost:=[nls,threads(+)]
+	dev-libs/libsodium:=
+	dev-libs/openssl:=
+	dev-libs/randomx
+	dev-libs/rapidjson
+	dev-libs/supercop
+	net-dns/unbound:=[threads]
+	net-libs/czmq:=
+	net-libs/miniupnpc
+	readline? ( sys-libs/readline:0= )
+"
+RDEPEND="${DEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-0.17.1.7-unbundle-dependencies.patch"
+	"${FILESDIR}/${PN}-0.17.2.0-boost-176.patch"
+)
+
+src_configure() {
+	local mycmakeargs=(
+		# TODO: Update CMake to install built libraries (help wanted)
+		-DBUILD_SHARED_LIBS=OFF
+		-DMANUAL_SUBMODULES=ON
+		-DMONERO_PARALLEL_LINK_JOBS=1
+		-DUSE_DEVICE_TREZOR=OFF
+	)
+
+	cmake_src_configure
+}
+
+src_compile() {
+	local targets=()
+	use daemon && targets+=(daemon)
+	use tools && targets+=(blockchain_{ancestry,blackball,db,depth,export,import,prune,prune_known_spent_data,stats,usage})
+	use wallet-cli && targets+=(simplewallet)
+	use wallet-rpc && targets+=(wallet_rpc_server)
+	cmake_build ${targets[@]}
+}
+
+src_install() {
+	einstalldocs
+
+	# Install all binaries.
+	find "${BUILD_DIR}/bin/" -type f -executable -print0 |
+		while IFS= read -r -d '' line; do
+			dobin "$line"
+		done
+
+	if use daemon; then
+		dodoc utils/conf/monerod.conf
+
+		# data-dir
+		keepdir /var/lib/monero
+		fowners monero:monero /var/lib/monero
+		fperms 0755 /var/lib/monero
+
+		# log-file dir
+		keepdir /var/log/monero
+		fowners monero:monero /var/log/monero
+		fperms 0755 /var/log/monero
+
+		# /etc/monero/monerod.conf
+		insinto /etc/monero
+		doins "${FILESDIR}/monerod.conf"
+
+		# OpenRC
+		newconfd "${FILESDIR}/monerod.confd" monerod
+		newinitd "${FILESDIR}/monerod.initd" monerod
+
+		# systemd
+		systemd_dounit "${FILESDIR}/monerod.service"
+	fi
+}
+
+pkg_postinst() {
+	if use daemon; then
+		elog "Start the Monero P2P daemon as a system service with"
+		elog "'rc-service monerod start'. Enable it at startup with"
+		elog "'rc-update add monerod default'."
+		elog
+		elog "Run monerod status as any user to get sync status and other stats."
+		elog
+		elog "The Monero blockchain can take up a lot of space (80 GiB) and is stored"
+		elog "in /var/lib/monero by default. You may want to enable pruning by adding"
+		elog "'prune-blockchain=1' to /etc/monero/monerod.conf to prune the blockchain"
+		elog "or move the data directory to another disk."
+	fi
+}
--- a/profiles/make.defaults
+++ b/profiles/make.defaults
@@ -1 +1 @@
-USE_EXPAND="PARSEC_DEBUG PARSEC_DIST PARSEC_PROF"
+USE_EXPAND="BACKEND COMM_QUEUE GEOIDS_DATASETS GRAVITY_MODELS INSTRUMENT MAGNETIC_MODELS NANOX OFI_MR PARSEC_DEBUG PARSEC_DIST PARSEC_PROF TCL TOTAL_DATA_ORDERING TRANSPORT"
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -9,19 +9,3 @@
 # TODO: Either fix per profile masking in overlays, or move
 # this entry to the relevant package.mask files in ::gentoo
 >=sys-block/systemd-swap-4.4.0
-
-# Alessandro Barbieri <lssndrbarbieri@gmail.com> (2021-06-20)
-# Mask BH until next release
-# Depend on boost version no longer available
-=dev-R/BH-1.75.0.0
-
-# Anna (cybertailor) Vyalkova <cyber+gentoo@sysrq.in> (2021-08-08)
-# No longer maintained (see https://github.com/michael-lazar/rtv/issues/696).
-# Use net-misc/tuir or reddio (https://gitlab.com/aaronNG/reddio) instead.
-# Masked for removal in 30 days.
-net-misc/rtv
-
-# Anna (cybertailor) Vyalkova <cyber+gentoo@sysrq.in> (2021-08-08)
-# Latest release 9 years ago, no reverse dependencies, almost one-liner.
-# Masked for removal in 30 days.
-dev-python/pytest-marks
--- a/sci-geosciences/GeographicLib-data/GeographicLib-data-0-r1.ebuild
+++ b/sci-geosciences/GeographicLib-data/GeographicLib-data-0-r1.ebuild
@@ -8,6 +8,7 @@ MYPN="${PN/-data/}"
 DESCRIPTION="Datasets for GeographicLib"
 HOMEPAGE="https://sourceforge.net/projects/geographiclib"
 S="${WORKDIR}"
+
 SLOT="0"
 KEYWORDS="~amd64"
 LICENSE="public-domain"
@@ -38,7 +39,7 @@ IUSE_MAGNETIC_MODELS="
 	magnetic-models-emm2017
 "
 IUSE="${IUSE_GEOIDS_DATASETS} ${IUSE_GRAVITY_MODELS} ${IUSE_MAGNETIC_MODELS}"
-IUSE_EXPAND="GEOIDS_DATASETS GRAVITY_MODELS MAGNETIC_MODELS"
+
 REQUIRED_USE="
 	|| (
 		${IUSE_GEOIDS_DATASETS/+/}
--- a/sci-libs/meschach/Manifest
+++ b/sci-libs/meschach/Manifest
@@ -1,3 +1 @@
-DIST meschach-1.2b_p20170511.tar.gz 577104 BLAKE2B 83b47828c814d4a7f4957f02448babb0961383f61f329431ef74a8ec2800c196d5cb0e1363a258b06f18adccaf39d859e640f01bf7f98b5b0ac634adc5f58beb SHA512 054c9380ff2df4c8c3bda0eb20df2a9da8fe357fd939116a257bb2831d04893aad29999df0d2bd9434173a1246ec18a73779abdadc477f9c2dd9d027446393d1
-DIST meschach_1.2b-14.debian.tar.xz 40664 BLAKE2B 753cdcdf8ecd63be14a294a6607380462df8a74c1cc84fafcfe4140cb10eaeb590dbe12883e2a973691a920b1e7f4efdf884781b49ea947b1132ff213f4a2652 SHA512 9793127a1785fb757b61132db1c471a2ff7949c383870f10d0b24ea2e1dafcb9d9379b61698179f91fdba4405e18e1692efcc26b759b1a5d9519e8c46206636b
-DIST meschach_1.2b.orig.tar.gz 220166 BLAKE2B fe38d9887977f45cc54857fe9c33f1eb50d1192ce3cae643127962cfce7657d9890964aabd3690751648a3a850fbbb39c6fb2110f8b4fcd789c7b8efefcec2c5 SHA512 0b8748915739b624aa44b0bf6f2c59aaf3d09f69f9455220e4baeb423c094a89cc25c03d6ced0d58bfd7c5d6626f3995fc853119ab0f7d6af151d8479c326068
+DIST meschach-1.2b_p20170511-r1.tar.gz 577104 BLAKE2B 83b47828c814d4a7f4957f02448babb0961383f61f329431ef74a8ec2800c196d5cb0e1363a258b06f18adccaf39d859e640f01bf7f98b5b0ac634adc5f58beb SHA512 054c9380ff2df4c8c3bda0eb20df2a9da8fe357fd939116a257bb2831d04893aad29999df0d2bd9434173a1246ec18a73779abdadc477f9c2dd9d027446393d1
--- a/sci-libs/meschach/files/configure.patch
+++ b/sci-libs/meschach/files/configure.patch
@@ -1,29 +0,0 @@
-Bug: https://bugs.gentoo.org/785196
-
--- a/configure.in
-+++ b/configure.in
-@@ -9,16 +9,6 @@
- [extern int test (int i, double x);],
- AC_DEFINE(HAVE_PROTOTYPES))])dnl
- dnl
-dnl Brook Milligan's compiler check
-dnl Check for the sun ansi c compiler, acc
-define(LOCAL_PROG_ACC,
-[AC_BEFORE([$0], [AC_PROG_CPP])AC_PROVIDE([$0])dnl
-AC_PROGRAM_CHECK(CC, acc, acc, "")])dnl
-dnl David Stewart's modified compiler check
-define(LOCAL_PROG_CC,
-[AC_BEFORE([$0], [AC_PROG_CPP])AC_PROVIDE([$0])dnl
-AC_PROGRAM_CHECK(CC, acc, acc, cc)])dnl
-dnl
- dnl
- dnl
- dnl ----------------------------------------------------------------------
-@@ -29,7 +19,6 @@
- PROGS=""
- AC_SUBST(PROGS)dnl
- LOCAL_PROG_ACC
-AC_PROGRAM_CHECK(CC, cc, cc, gcc)
- dnl AC_PROG_CC
- AC_PROG_CPP
- AC_AIX
--- a/sci-libs/meschach/files/meschach-2-mbdyn.diff
+++ b/sci-libs/meschach/files/meschach-2-mbdyn.diff
@@ -1,906 +0,0 @@
--- a/CHANGELOG
-+++ b/CHANGELOG
-@@ -0,0 +1,10 @@
-+* 2000-04-13 Pierangelo Masarati <masarati@aero.polimi.it>
-+ - fixed HUGE_VAL configure
-+ - prefixed REAL, DOUBLE and FLOAT with MESCHACH_ to avoid conflicts
-+
-+* 2000-??-?? Pierangelo Masarati <masarati@aero.polimi.it>
-+ - changed the struct pair in sparse.h to avoid conflicts with C++ stl
-+ - added some helpers for adding and subtracting coefs from sparse matrices
-+ - WARNING: in C++ the macro `catch' conflicts with the exception handling
-+   keyword; I temporarily fixed the problem by #undef-ining it after including
-+   meschach headers.
--- a/init.c
-+++ b/init.c
-@@ -59,7 +59,7 @@
-    if ( ix == IVNULL )
-      error(E_NULL,"iv_zero");
-    
-   for ( i = 0; i < ix->dim; i++ )
-+   for ( i = ix->dim; i-- > 0; )
-      ix->ive[i] = 0; 
-    
-    return ix;
-@@ -77,7 +77,7 @@
- 		error(E_NULL,"m_zero");
- 
- 	A_m = A->m;	A_n = A->n;	A_me = A->me;
-	for ( i = 0; i < A_m; i++ )
-+	for ( i = A_m; i-- > 0; )
- 		__zero__(A_me[i],A_n);
- 		/* for ( j = 0; j < A_n; j++ )
- 			A_me[i][j] = 0.0; */
-@@ -97,7 +97,7 @@
- 
- 	m_zero(A);
- 	size = min(A->m,A->n);
-	for ( i = 0; i < size; i++ )
-+	for ( i = size; i-- > 0; )
- 		A->me[i][i] = 1.0;
- 
- 	return A;
-@@ -114,7 +114,7 @@
- 		error(E_NULL,"px_ident");
- 
- 	px_size = px->size;	px_pe = px->pe;
-	for ( i = 0; i < px_size; i++ )
-+	for ( i = px_size; i-- > 0; )
- 		px_pe[i] = i;
- 
- 	return px;
-@@ -178,7 +178,7 @@
-     if ( ! started )
- 	smrand(3127);
-     
-    for ( i = 0; i < len; i++ )
-+    for ( i = len; i-- > 0; )
-     {
- 	inext = (inext >= 54) ? 0 : inext+1;
- 	inextp = (inextp >= 54) ? 0 : inextp+1;
-@@ -260,12 +260,28 @@
- 	if ( ! x )
- 		error(E_NULL,"v_ones");
- 
-	for ( i = 0; i < x->dim; i++ )
-+	for ( i = x->dim; i-- > 0; )
- 		x->ve[i] = 1.0;
- 
- 	return x;
- }
- 
-+/* v_init -- fills x with d's */
-+VEC	*v_init(x, d)
-+VEC	*x;
-+Real    d;
-+{
-+	int	i;
-+
-+	if ( ! x )
-+		error(E_NULL,"v_ones");
-+
-+	for ( i = x->dim; i-- > 0; )
-+		x->ve[i] = d;
-+
-+	return x;
-+}
-+
- /* m_ones -- fills matrix with one's */
- MAT	*m_ones(A)
- MAT	*A;
-@@ -275,8 +291,8 @@
- 	if ( ! A )
- 		error(E_NULL,"m_ones");
- 
-	for ( i = 0; i < A->m; i++ )
-		for ( j = 0; j < A->n; j++ )
-+	for ( i = A->m; i-- > 0; )
-+		for ( j = A->n; j-- > 0; )
- 		    A->me[i][j] = 1.0;
- 
- 	return A;
-@@ -291,7 +307,7 @@
- 	if ( ! x )
- 	    error(E_NULL,"v_count");
- 
-	for ( i = 0; i < x->dim; i++ )
-+	for ( i = x->dim; i-- > 0; )
- 	    x->ve[i] = (Real)i;
- 
- 	return x;
--- a/itertort.c
-+++ b/itertort.c
-@@ -41,10 +41,10 @@
-   
-   /* for iterative methods */
-   
-#if REAL == DOUBLE
-+#if MESCHACH_REAL == MESCHACH_DOUBLE
- #define	EPS	1e-7
- #define KK	20
-#elif REAL == FLOAT
-+#elif MESCHACH_REAL == MESCHACH_FLOAT
- #define EPS   1e-5
- #define KK	8
- #endif
--- a/machine.h.in
-+++ b/machine.h.in
-@@ -16,14 +16,15 @@
- #undef MALLOCDECL
- #undef NOT_SEGMENTED
- #undef HAVE_MEMORY_H
-#undef HAVE_COMPLEX_H
-+/* #undef HAVE_COMPLEX_H */
- #undef HAVE_MALLOC_H
-+#undef HAVE_HUGE_VAL_H
- #undef STDC_HEADERS
- #undef HAVE_BCOPY
- #undef HAVE_BZERO
- #undef CHAR0ISDBL0
- #undef WORDS_BIGENDIAN
-#undef U_INT_DEF
-+/* #undef U_INT_DEF */
- #undef VARARGS
- #undef HAVE_PROTOTYPES
- #undef HAVE_PROTOTYPES_IN_STRUCT
-@@ -53,7 +54,7 @@
- #endif /* HAVE_PROTOTYPES_IN_STRUCT */
- 
- /* for basic or larger versions */
-#undef COMPLEX
-+#undef MESCHACH_COMPLEX
- #undef SPARSE
- 
- /* for loop unrolling */
-@@ -131,9 +132,9 @@
- 
- /* you can choose single, double or long double (if available) precision */
- 
-#define FLOAT 		1
-#define DOUBLE 		2
-#define LONG_DOUBLE 	3
-+#define MESCHACH_FLOAT 	1
-+#define MESCHACH_DOUBLE	2
-+#define MESCHACH_LONG_DOUBLE 	3
- 
- #undef REAL_FLT
- #undef REAL_DBL
-@@ -149,27 +150,27 @@
- #ifdef REAL_FLT
- #define  Real float
- #define  LongReal float
-#define REAL FLOAT
-#define LONGREAL FLOAT
-+#define MESCHACH_REAL MESCHACH_FLOAT
-+#define MESCHACH_LONGREAL MESCHACH_FLOAT
- #endif
- 
- /* double precision */
- #ifdef REAL_DBL
- #define Real double
- #define LongReal double
-#define REAL DOUBLE
-#define LONGREAL DOUBLE
-+#define MESCHACH_REAL MESCHACH_DOUBLE
-+#define MESCHACH_LONGREAL MESCHACH_DOUBLE
- #endif
- 
- 
- /* machine epsilon or unit roundoff error */
- /* This is correct on most IEEE Real precision systems */
- #ifdef DBL_EPSILON
-#if REAL == DOUBLE
-+#if MESCHACH_REAL == MESCHACH_DOUBLE
- #define	MACHEPS	DBL_EPSILON
-#elif REAL == FLOAT
-+#elif MESCHACH_REAL == MESCHACH_FLOAT
- #define	MACHEPS	FLT_EPSILON
-#elif REAL == LONGDOUBLE
-+#elif MESCHACH_REAL == MESCHACH_LONGDOUBLE
- #define MACHEPS LDBL_EPSILON
- #endif
- #endif
-@@ -178,11 +179,11 @@
- #undef D_MACHEPS
- 
- #ifndef MACHEPS
-#if REAL == DOUBLE
-+#if MESCHACH_REAL == MESCHACH_DOUBLE
- #define	MACHEPS	D_MACHEPS
-#elif REAL == FLOAT  
-+#elif MESCHACH_REAL == MESCHACH_FLOAT  
- #define MACHEPS F_MACHEPS
-#elif REAL == LONGDOUBLE
-+#elif MESCHACH_REAL == MESCHACH_LONGDOUBLE
- #define MACHEPS D_MACHEPS
- #endif
- #endif
-@@ -208,12 +209,16 @@
- #endif
- 
- /* for non-ANSI systems */
-+#ifndef HAVE_HUGE_VAL_H
- #ifndef HUGE_VAL
- #define HUGE_VAL HUGE
- #else
- #ifndef HUGE
- #define HUGE HUGE_VAL
- #endif
-+#endif
-+#else
-+#define HUGE HUGE_VAL
- #endif
- 
- 
--- a/matlab.h
-+++ b/matlab.h
-@@ -66,9 +66,9 @@
- 
- #define ORDER           ROW_ORDER
- 
-#if REAL == DOUBLE
-+#if MESCHACH_REAL == MESCHACH_DOUBLE
- #define PRECISION       DOUBLE_PREC
-#elif REAL == FLOAT
-+#elif MESCHACH_REAL == MESCHACH_FLOAT
- #define PRECISION  	SINGLE_PREC
- #endif
- 
-@@ -90,7 +90,7 @@
- #endif
- 
- /* complex variant */
-#ifdef COMPLEX
-+#ifdef MESCHACH_COMPLEX
- #include "zmatrix.h"
- 
- #ifdef ANSI_C
--- a/matrix.h
-+++ b/matrix.h
-@@ -384,11 +384,17 @@
- /* Initialisation routines -- to be zero, ones, random or identity */
- #ifndef ANSI_C
- extern	VEC     *v_zero(), *v_rand(), *v_ones();
-+/* ANDO 01-13-99 */
-+extern	VEC     *v_init();
-+/* ODNA 01-13-99 */
- extern	MAT     *m_zero(), *m_ident(), *m_rand(), *m_ones();
- extern	PERM    *px_ident();
- extern  IVEC    *iv_zero();
- #else
- extern	VEC     *v_zero(VEC *), *v_rand(VEC *), *v_ones(VEC *);
-+/* ANDO 01-13-99 */
-+extern	VEC     *v_init(VEC*, Real);
-+/* ODNA 01-13-99 */
- extern	MAT     *m_zero(MAT *), *m_ident(MAT *), *m_rand(MAT *),
- 						*m_ones(MAT *);
- extern	PERM    *px_ident(PERM *);
--- a/matrixio.c
-+++ b/matrixio.c
-@@ -124,9 +124,9 @@
- 		    {   j--;    dynamic = FALSE;        goto redo2;     }
- 		    if ( (*line == 'f' || *line == 'F') && j < n-1 )
- 		    {   j++;    dynamic = FALSE;        goto redo2;     }
-#if REAL == DOUBLE
-+#if MESCHACH_REAL == MESCHACH_DOUBLE
- 	       } while ( *line=='\0' || sscanf(line,"%lf",&mat->me[i][j])<1 );
-#elif REAL == FLOAT
-+#elif MESCHACH_REAL == MESCHACH_FLOAT
- 	       } while ( *line=='\0' || sscanf(line,"%f",&mat->me[i][j])<1 );
- #endif
- 	  fprintf(stderr,"Continue: ");
-@@ -168,9 +168,9 @@
- 	  if ( fscanf(fp," row %u:",&dummy) < 1 )
- 	       error(E_FORMAT,"bm_finput");
- 	  for ( j=0; j<n; j++ )
-#if REAL == DOUBLE
-+#if MESCHACH_REAL == MESCHACH_DOUBLE
- 	       if ((io_code=fscanf(fp,"%lf",&mat->me[i][j])) < 1 )
-#elif REAL == FLOAT
-+#elif MESCHACH_REAL == MESCHACH_FLOAT
- 	       if ((io_code=fscanf(fp,"%f",&mat->me[i][j])) < 1 )
- #endif
- 		    error(io_code==EOF ? 7 : 6,"bm_finput");
-@@ -337,9 +337,9 @@
- 	       {        i--;    dynamic = FALSE;        goto redo;         }
- 	       if ( (*line == 'f' || *line == 'F') && i < dim-1 )
- 	       {        i++;    dynamic = FALSE;        goto redo;         }
-#if REAL == DOUBLE
-+#if MESCHACH_REAL == MESCHACH_DOUBLE
- 	  } while ( *line=='\0' || sscanf(line,"%lf",&vec->ve[i]) < 1 );
-#elif REAL == FLOAT
-+#elif MESCHACH_REAL == MESCHACH_FLOAT
-           } while ( *line=='\0' || sscanf(line,"%f",&vec->ve[i]) < 1 );
- #endif
-      
-@@ -367,9 +367,9 @@
-      /* get entries */
-      skipjunk(fp);
-      for ( i=0; i<dim; i++ )
-#if REAL == DOUBLE
-+#if MESCHACH_REAL == MESCHACH_DOUBLE
- 	  if ((io_code=fscanf(fp,"%lf",&vec->ve[i])) < 1 )
-#elif REAL == FLOAT
-+#elif MESCHACH_REAL == MESCHACH_FLOAT
- 	  if ((io_code=fscanf(fp,"%f",&vec->ve[i])) < 1 )
- #endif
- 	       error(io_code==EOF ? 7 : 6,"bfin_vec");
--- a/meminfo.c
-+++ b/meminfo.c
-@@ -34,7 +34,7 @@
- #include <stdio.h>
- #include  "matrix.h"
- #include  "meminfo.h"
-#ifdef COMPLEX   
-+#ifdef MESCHACH_COMPLEX   
- #include  "zmatrix.h"
- #endif
- #ifdef SPARSE
-@@ -60,7 +60,7 @@
-      "SPROW",
-      "SPMAT"
- #endif
-#ifdef COMPLEX   
-+#ifdef MESCHACH_COMPLEX   
-        ,"ZVEC",
-        "ZMAT"
- #endif
-@@ -86,7 +86,7 @@
-      sprow_free, 
-      sp_free
- #endif
-#ifdef COMPLEX
-+#ifdef MESCHACH_COMPLEX
-        ,zv_free,	
-        zm_free
- #endif
--- a/meminfo.h
-+++ b/meminfo.h
-@@ -58,7 +58,7 @@
- #define TYPE_SPMAT		7
- #endif
- 
-#ifdef COMPLEX
-+#ifdef MESCHACH_COMPLEX
- #ifdef SPARSE
- #define TYPE_ZVEC		8
- #define TYPE_ZMAT		9
--- a/memtort.c
-+++ b/memtort.c
-@@ -318,7 +318,7 @@
- }
- #endif
- 
-#ifdef COMPLEX
-+#ifdef MESCHACH_COMPLEX
- void stat_test4(par)
- int par;
- {
-@@ -355,7 +355,7 @@
-    IVEC *ix = IVNULL, *iy = IVNULL, *iz = IVNULL;
-    int m,n,i,j,deg,k;
-    Real s1,s2;
-#ifdef COMPLEX
-+#ifdef MESCHACH_COMPLEX
-    ZVEC        *zx = ZVNULL, *zy = ZVNULL, *zz = ZVNULL;
-    ZMAT        *zA = ZMNULL, *zB = ZMNULL, *zC = ZMNULL;
-    complex     ONE;
-@@ -580,7 +580,7 @@
- #endif  /* SPARSE */   
- 
- 
-#ifdef COMPLEX
-+#ifdef MESCHACH_COMPLEX
-    /* complex stuff */
-    
-    ONE = zmake(1.0,0.0);
-@@ -629,7 +629,7 @@
-      errmesg("ZMAT resize");
-    
-    zm_free_vars(&zA,&zB,&zC,NULL);
-#endif /* COMPLEX */
-+#endif /* MESCHACH_COMPLEX */
- 
- #endif  /* if defined(ANSI_C) || defined(VARARGS) */
- 
-@@ -647,7 +647,7 @@
-    mem_stat_mark(1);
-    for (i=0; i < 100; i++) {
-      stat_test1(i);
-#ifdef COMPLEX
-+#ifdef MESCHACH_COMPLEX
-      stat_test4(i);
- #endif
-   }
-@@ -671,7 +671,7 @@
- 
-    for (i=0; i < 100; i++) {
-       stat_test1(i);
-#ifdef COMPLEX
-+#ifdef MESCHACH_COMPLEX
-       stat_test4(i);
- #endif
-    } 
-@@ -727,9 +727,9 @@
- 
-    mem_info();
-    
-#if REAL == FLOAT
-+#if MESCHACH_REAL == MESCHACH_FLOAT
-    printf("# SINGLE PRECISION was used\n");
-#elif REAL == DOUBLE
-+#elif MESCHACH_REAL == MESCHACH_DOUBLE
-    printf("# DOUBLE PRECISION was used\n");
- #endif
- 
-@@ -744,9 +744,9 @@
- #ifdef ANSI_OR_VAR
- 
-    printf("# you should get: \n");
-#if (REAL == FLOAT)
-+#if (MESCHACH_REAL == MESCHACH_FLOAT)
-      printf("#   type VEC: 276 bytes allocated, 3 variables allocated\n");
-#elif (REAL == DOUBLE)
-+#elif (MESCHACH_REAL == MESCHACH_DOUBLE)
-      printf("#   type VEC: 516 bytes allocated, 3 variables allocated\n");
- #endif
-    printf("#   and other types are zeros\n");
--- a/otherio.c
-+++ b/otherio.c
-@@ -130,9 +130,9 @@
- 	if ( ! isatty(fileno(fp)) )
- 	{
- 		skipjunk(fp);
-#if REAL == DOUBLE
-+#if MESCHACH_REAL == MESCHACH_DOUBLE
- 		if ( (retcode=fscanf(fp,"%lf",&x)) == EOF )
-#elif REAL == FLOAT
-+#elif MESCHACH_REAL == MESCHACH_FLOAT
- 		if ( (retcode=fscanf(fp,"%f",&x)) == EOF )
- #endif
- 			error(E_INPUT,"fin_double");
-@@ -148,9 +148,9 @@
- 		fprintf(stderr,"%s: ",s);
- 		if ( fgets(scratch,MAXLINE,stdin)==NULL )
- 			error(E_INPUT,"fin_double");
-#if REAL == DOUBLE
-+#if MESCHACH_REAL == MESCHACH_DOUBLE
- 		retcode = sscanf(scratch,"%lf",&x);
-#elif REAL == FLOAT 
-+#elif MESCHACH_REAL == MESCHACH_FLOAT 
- 		retcode = sscanf(scratch,"%f",&x);
- #endif
- 		if ( ( retcode==1 && low > high ) ||
--- a/rk4.dat
-+++ b/rk4.dat
-@@ -1,12 +0,0 @@
-# No. of a problem
-1
-# Initial time
-0
-# Final time
-1
-# Solution is x(t) = (cos(t),-sin(t))
-# x(0) =
-Vector: dim: 2
-1       0
-# Step size
-0.1
--- a/sparse.c
-+++ b/sparse.c
-@@ -61,25 +61,33 @@
-    return r->elt[idx].val;
- }
- 
-+void _set(d, s)  double* d; double s; { *d = s; }
-+void _inc(d, s)  double* d; double s; { *d += s; }
-+void _dec(d, s)  double* d; double s; { *d -= s; }
-+
- /* sp_set_val -- sets the (i,j) entry of the sparse matrix A */
-double	sp_set_val(A,i,j,val)
-+double	sp_set_val_(A,i,j,val,f)
- SPMAT	*A;
- int	i, j;
- double	val;
-+void (*f)(double*, double);
- {
-    SPROW	*r;
-    int	idx, idx2, new_len;
-    
-    if ( A == SMNULL )
-     error(E_NULL,"sp_set_val");
-+     error(E_NULL,"sp_set_val_");
-    if ( i < 0 || i >= A->m || j < 0 || j >= A->n )
-     error(E_SIZES,"sp_set_val");
-+     error(E_SIZES,"sp_set_val_");
-    
-    r = A->row+i;
-    idx = sprow_idx(r,j);
-   /* printf("sp_set_val: idx = %d\n",idx); */
-+   /* printf("sp_set_val_: idx = %d\n",idx); */
-    if ( idx >= 0 )
-   {	r->elt[idx].val = val;	return val;	}
-+   {
-+      (*f)(&(r->elt[idx].val), val);
-+      return r->elt[idx].val;	
-+   }
-    /* else */ if ( idx < -1 )
-    {
-       /* Note: this destroys the column & diag access paths */
-@@ -97,7 +105,7 @@
- 
- 	 r->elt = RENEW(r->elt,new_len,row_elt);
- 	 if ( ! r->elt )	/* can't allocate */
-	   error(E_MEM,"sp_set_val");
-+	   error(E_MEM,"sp_set_val_");
- 	 r->maxlen = 2*r->maxlen+1;
-       }
-       for ( idx2 = r->len-1; idx2 >= idx; idx2-- )
-@@ -110,12 +118,40 @@
- 	************************************************************/
-       r->len++;
-       r->elt[idx].col = j;
-+      
-+      /* sbagliato
-+      (*f)(&(r->elt[idx].val), val);
-+       */
-       return r->elt[idx].val = val;
-    }
-    /* else -- idx == -1, error in index/matrix! */
-    return 0.0;
- }
- 
-+double	sp_set_val(A,i,j,val)
-+SPMAT	*A;
-+int	i, j;
-+double	val;
-+{
-+   return sp_set_val_(A, i, j, val, _set);
-+}
-+
-+double	sp_inc_val(A,i,j,val)
-+SPMAT	*A;
-+int	i, j;
-+double	val;
-+{
-+   return sp_set_val_(A, i, j, val, _inc);
-+}
-+
-+double	sp_dec_val(A,i,j,val)
-+SPMAT	*A;
-+int	i, j;
-+double	val;
-+{
-+   return sp_set_val_(A, i, j, val, _dec);
-+}
-+
- /* sp_mv_mlt -- sparse matrix/dense vector multiply
-    -- result is in out, which is returned unless out==NULL on entry
-    --  if out==NULL on entry then the result vector is created */
-@@ -612,16 +648,17 @@
- {
-    int i;
- 
-   if ( ! A )
-     error(E_NULL,"sp_smlt");
-   if ( ! B )
-     B = sp_get(A->m,A->n,5);
-   else
-     if ( A->m != B->m || A->n != B->n )
-       error(E_SIZES,"sp_smlt");
-+   if (!A) {
-+      error(E_NULL, "sp_smlt");
-+   }
-+   if (!B) {
-+      B = sp_get(A->m, A->n, 5);
-+   } else if (A->m != B->m || A->n != B->n) {
-+      error(E_SIZES, "sp_smlt");
-+   }
- 
-   for (i=0; i < A->m; i++) {
-      sprow_smlt(&(A->row[i]),alpha,0,&(B->row[i]),TYPE_SPMAT);
-+   for (i = A->m; i-- > 0; ) {
-+      sprow_smlt(&(A->row[i]), alpha, 0, &(B->row[i]), TYPE_SPMAT);
-    }
-    return B;
- }
-@@ -635,15 +672,16 @@
-    int	i, idx, len;
-    row_elt	*elt;
-    
-   if ( ! A )
-     error(E_NULL,"sp_zero");
-+   if ( ! A ) {
-+      error(E_NULL,"sp_zero");
-+   }
-    
-   for ( i = 0; i < A->m; i++ )
-   {
-+   for ( i = A->m; i-- > 0; ) {
-       elt = A->row[i].elt;
-       len = A->row[i].len;
-      for ( idx = 0; idx < len; idx++ )
-	(*elt++).val = 0.0;
-+      for ( idx = len; idx-- > 0; ) {
-+	 (*elt++).val = 0.;
-+      }
-    }
-    
-    return A;
--- a/sparse.h
-+++ b/sparse.h
-@@ -63,11 +63,12 @@
- 	This starts the chain down the columns using the nxt_row and nxt_idx
- 	fields of each entry in each row. */
- 
-typedef struct pair { int pos;	Real val; } pair;
-+typedef struct meschach_pair { int pos;	Real val; } meschach_pair;
- 
- typedef struct SPVEC {
- 	int	dim, max_dim;
-	pair	*elt;		/* elt[max_dim] */
-+	struct { int pos; Real val; } *elt;
-+	/* meschach_pair	*elt; */		/* elt[max_dim] */
- 	       } SPVEC;
- 
- #define	SMNULL	((SPMAT*)NULL)
-@@ -98,6 +99,9 @@
- extern	SPMAT	*sp_get(), *sp_copy(), *sp_copy2(),
- 			*sp_zero(), *sp_resize(), *sp_compact();
- extern	double	sp_get_val(), sp_set_val();
-+/* ANDO 01-10-99 */
-+extern	double sp_inc_val(), sp_dec_val();
-+/* ANDO 01-10-99 */
- extern	VEC	*sp_mv_mlt(), *sp_vm_mlt();
- extern	int	sp_free();
- 
-@@ -132,6 +136,9 @@
- 	*sp_zero(SPMAT *), *sp_resize(SPMAT *,int,int),
- 	*sp_compact(SPMAT *,double);
- double	sp_get_val(SPMAT *,int,int), sp_set_val(SPMAT *,int,int,double);
-+/* ANDO 01-10-99 */
-+double  sp_inc_val(SPMAT *,int,int,double), sp_dec_val(SPMAT *,int,int,double);
-+/* ANDO 01-10-99 */
- VEC	*sp_mv_mlt(SPMAT *,VEC *,VEC *), *sp_vm_mlt(SPMAT *,VEC *,VEC *);
- int	sp_free(SPMAT *);
- 
--- a/sparseio.c
-+++ b/sparseio.c
-@@ -222,9 +222,9 @@
- 				error(E_INPUT,"sp_finput");
- 			    if ( *line == 'e' || *line == 'E' )
- 				break;
-#if REAL == DOUBLE
-+#if MESCHACH_REAL == MESCHACH_DOUBLE
- 			} while ( sscanf(line,"%u %lf",&col,&val) != 2 ||
-#elif REAL == FLOAT
-+#elif MESCHACH_REAL == MESCHACH_FLOAT
- 			} while ( sscanf(line,"%u %f",&col,&val) != 2 ||
- #endif
- 				    col >= n || col <= curr_col );
-@@ -282,9 +282,9 @@
- 		    curr_col = -1;
- 		    for ( len = 0; len < MAXSCRATCH; len++ )
- 		    {
-#if REAL == DOUBLE
-+#if MESCHACH_REAL == MESCHACH_DOUBLE
- 			if ( (ret_val=fscanf(fp,"%u : %lf",&col,&val)) != 2 )
-#elif REAL == FLOAT
-+#elif MESCHACH_REAL == MESCHACH_FLOAT
- 			if ( (ret_val=fscanf(fp,"%u : %f",&col,&val)) != 2 )
- #endif
- 			    break;
--- a/splufctr.c
-+++ b/splufctr.c
-@@ -56,21 +56,27 @@
- 	Real	max_val, tmp;
- 	static VEC	*col_vals=VNULL;
- 
-	if ( ! A || ! px )
-+	if ( ! A || ! px ) {
- 		error(E_NULL,"spLUfctr");
-	if ( alpha <= 0.0 || alpha > 1.0 )
-+	}
-+	if ( alpha <= 0.0 || alpha > 1.0 ) {
- 		error(E_RANGE,"alpha in spLUfctr");
-	if ( px->size <= A->m )
-+	}
-+	if ( px->size <= A->m ) {
- 		px = px_resize(px,A->m);
-+	}
- 	px_ident(px);
- 	col_vals = v_resize(col_vals,A->m);
- 	MEM_STAT_REG(col_vals,TYPE_VEC);
- 
-	m = A->m;	n = A->n;
-	if ( ! A->flag_col )
-+	m = A->m;	
-+        n = A->n;
-+	if ( ! A->flag_col ) {
- 		sp_col_access(A);
-	if ( ! A->flag_diag )
-+	}
-+	if ( ! A->flag_diag ) {
- 		sp_diag_access(A);
-+	}
- 	A->flag_col = A->flag_diag = FALSE;
- 	if ( ! merge ) {
- 	   merge = sprow_get(20);
-@@ -87,25 +93,29 @@
- 	    {
- 		r = &(A->row[i]);
- 		idx = sprow_idx(r,k);
-		if ( idx < 0 )
-+		if ( idx < 0 ) {
- 		    tmp = 0.0;
-		else
-+		} else {
- 		    tmp = r->elt[idx].val;
-		if ( fabs(tmp) > max_val )
-+		}
-+		if ( fabs(tmp) > max_val ) {
- 		    max_val = fabs(tmp);
-+		}
- 		col_vals->ve[i] = tmp;
- 	    }
- 
-	    if ( max_val == 0.0 )
-+	    if ( max_val == 0.0 ) {
- 		continue;
-+	    }
- 
- 	    best_len = n+1;	/* only if no possibilities */
- 	    best_i = -1;
- 	    for ( i = k; i < m; i++ )
- 	    {
- 		tmp = fabs(col_vals->ve[i]);
-		if ( tmp == 0.0 )
-+		if ( tmp == 0.0 ) {
- 		    continue;
-+		}
- 		if ( tmp >= alpha*max_val )
- 		{
- 		    r = &(A->row[i]);
-@@ -171,17 +181,21 @@
- 	SPROW	*r;
- 	row_elt	*elt;
- 
-	if ( ! A || ! b )
-+	if ( ! A || ! b ) {
- 	    error(E_NULL,"spLUsolve");
-	if ( (pivot != PNULL && A->m != pivot->size) || A->m != b->dim )
-+	}
-+	if ( (pivot != PNULL && A->m != pivot->size) || A->m != b->dim ) {
- 	    error(E_SIZES,"spLUsolve");
-	if ( ! x || x->dim != A->n )
-+	}
-+	if ( ! x || x->dim != A->n ) {
- 	    x = v_resize(x,A->n);
-+	}
- 
-	if ( pivot != PNULL )
-+	if ( pivot != PNULL ) {
- 	    x = px_vec(pivot,b,x);
-	else
-+	} else {
- 	    x = v_copy(b,x);
-+	}
- 
- 	x_ve = x->ve;
- 	lim = min(A->m,A->n);
-@@ -191,21 +205,24 @@
- 	    r = &(A->row[i]);
- 	    len = r->len;
- 	    elt = r->elt;
-	    for ( idx = 0; idx < len && elt->col < i; idx++, elt++ )
-+	    for ( idx = 0; idx < len && elt->col < i; idx++, elt++ ) {
- 		sum -= elt->val*x_ve[elt->col];
-+	    }
- 	    x_ve[i] = sum;
- 	}
- 
-	for ( i = lim-1; i >= 0; i-- )
-+	for ( i = lim; i-- > 0; )
- 	{
- 	    sum = x_ve[i];
- 	    r = &(A->row[i]);
- 	    len = r->len;
- 	    elt = &(r->elt[len-1]);
-	    for ( idx = len-1; idx >= 0 && elt->col > i; idx--, elt-- )
-+	    for ( idx = len-1; idx >= 0 && elt->col > i; idx--, elt-- ) {
- 		sum -= elt->val*x_ve[elt->col];
-	    if ( idx < 0 || elt->col != i || elt->val == 0.0 )
-+	    }
-+	    if ( idx < 0 || elt->col != i || elt->val == 0.0 ) {
- 		error(E_SING,"spLUsolve");
-+	    }
- 	    x_ve[i] = sum/elt->val;
- 	}
- 
--- a/sptort.c
-+++ b/sptort.c
-@@ -39,9 +39,9 @@
- 
- /* for iterative methods */
- 
-#if REAL == DOUBLE
-+#if MESCHACH_REAL == MESCHACH_DOUBLE
- #define	EPS	1e-7
-#elif REAL == FLOAT
-+#elif MESCHACH_REAL == MESCHACH_FLOAT
- #define EPS   1e-3
- #endif
- 
--- a/zmatio.c
-+++ b/zmatio.c
-@@ -53,18 +53,18 @@
- 	    fprintf(stderr,"real and imag parts: ");
- 	    if ( fgets(line,MAXLINE,fp) == NULL )
- 		error(E_EOF,"z_finput");
-#if REAL == DOUBLE
-+#if MESCHACH_REAL == MESCHACH_DOUBLE
- 	    io_code = sscanf(line,"%lf%lf",&z.re,&z.im);
-#elif REAL == FLOAT
-+#elif MESCHACH_REAL == MESCHACH_FLOAT
- 	    io_code = sscanf(line,"%f%f",&z.re,&z.im);
- #endif
- 
- 	} while ( io_code != 2 );
-     }
-     else
-#if REAL == DOUBLE
-+#if MESCHACH_REAL == MESCHACH_DOUBLE
-       if ( (io_code=fscanf(fp," (%lf,%lf)",&z.re,&z.im)) < 2 )
-#elif REAL == FLOAT
-+#elif MESCHACH_REAL == MESCHACH_FLOAT
-       if ( (io_code=fscanf(fp," (%f,%f)",&z.re,&z.im)) < 2 )
- #endif
- 	    error((io_code == EOF) ? E_EOF : E_FORMAT,"z_finput");
-@@ -129,9 +129,9 @@
- 		    if ( (*line == 'f' || *line == 'F') && j < n-1 )
- 		    {   j++;    dynamic = FALSE;        goto redo2;     }
- 	       } while ( *line=='\0' ||
-#if REAL == DOUBLE
-+#if MESCHACH_REAL == MESCHACH_DOUBLE
- 			 sscanf(line,"%lf%lf",
-#elif REAL == FLOAT
-+#elif MESCHACH_REAL == MESCHACH_FLOAT
- 			sscanf(line,"%f%f",
- #endif	
- 				&mat->me[i][j].re,&mat->me[i][j].im)<1 );
-@@ -176,9 +176,9 @@
- 	  for ( j=0; j<n; j++ )
- 	  {
- 	      /* printf("bzm_finput: j = %d\n", j); */
-#if REAL == DOUBLE
-+#if MESCHACH_REAL == MESCHACH_DOUBLE
- 	      if ((io_code=fscanf(fp," ( %lf , %lf )",
-#elif REAL == FLOAT
-+#elif MESCHACH_REAL == MESCHACH_FLOAT
- 	      if ((io_code=fscanf(fp," ( %f , %f )",
- #endif
- 				  &mat->me[i][j].re,&mat->me[i][j].im)) < 2 )
-@@ -239,9 +239,9 @@
- 	       if ( (*line == 'f' || *line == 'F') && i < dim-1 )
- 	       {        i++;    dynamic = FALSE;        goto redo;         }
- 	  } while ( *line=='\0' ||
-#if REAL == DOUBLE
-+#if MESCHACH_REAL == MESCHACH_DOUBLE
- 		    sscanf(line,"%lf%lf",
-#elif REAL == FLOAT
-+#elif MESCHACH_REAL == MESCHACH_FLOAT
- 		    sscanf(line,"%f%f",
- #endif  
- 			   &vec->ve[i].re,&vec->ve[i].im) < 2 );
-@@ -271,9 +271,9 @@
-      /* get entries */
-      skipjunk(fp);
-      for ( i=0; i<dim; i++ )
-#if REAL == DOUBLE
-+#if MESCHACH_REAL == MESCHACH_DOUBLE
- 	  if ((io_code=fscanf(fp," (%lf,%lf)",
-#elif REAL == FLOAT
-+#elif MESCHACH_REAL == MESCHACH_FLOAT
-           if ((io_code=fscanf(fp," (%f,%f)",
- #endif
- 			      &vec->ve[i].re,&vec->ve[i].im)) < 2 )
--- a/sci-libs/meschach/files/meschach-makefile.patch
+++ b/sci-libs/meschach/files/meschach-makefile.patch
@@ -1,156 +0,0 @@
--- a/configure.in
-+++ b/configure.in
-@@ -44,14 +44,15 @@
- # and has a different meaning for keyword "complex"!  Drew Parsons, 2001.
- ##AC_HEADER_CHECK(complex.h, AC_DEFINE(HAVE_COMPLEX_H),)
- AC_HEADER_CHECK(malloc.h, AC_DEFINE(HAVE_MALLOC_H),)
-+AC_HEADER_CHECK(huge_val.h, AC_DEFINE(HAVE_HUGE_VAL_H),)
- AC_HEADER_CHECK(varargs.h, AC_DEFINE(VARARGS),)
- AC_DEFINE(NOT_SEGMENTED)
- AC_SIZE_T
- AC_CONST
- AC_WORDS_BIGENDIAN
-AC_WITH(complex, AC_DEFINE(COMPLEX))
-+AC_WITH(complex, AC_DEFINE(MESCHACH_COMPLEX))
- AC_WITH(sparse, AC_DEFINE(SPARSE))
-AC_WITH(all, AC_DEFINE(COMPLEX))
-+AC_WITH(all, AC_DEFINE(MESCHACH_COMPLEX))
- AC_WITH(all, AC_DEFINE(SPARSE))
- AC_WITH(unroll, AC_DEFINE(VUNROLL))
- AC_WITH(munroll, AC_DEFINE(MUNROLL))
--- a/makefile.in
-+++ b/makefile.in
-@@ -18,8 +18,7 @@
- LIBS = @LIBS@
- RANLIB = @RANLIB@
- 
-
-CFLAGS = -O3 -fPIC
-+CFLAGS += -fPIC
- 
- 
- .c.o:
-@@ -68,7 +67,7 @@
- 
- # Different configurations
- # the dependencies **between** the parts are for dmake
-all: shared static
-+all: shared
- #all: @PROGS@ part1 part2 part3 zpart1 zpart2 shared
- part2: part1
- part3: part2
-@@ -77,50 +76,10 @@
- zpart2: zpart1
- complex: part1 part2 zpart1 zpart2
- 
-+shared:   libmeschach.so
- 
-$(LIST1): $(HBASE)
-part1: $(LIST1)
-	ar ru libmeschach.a $(LIST1)
-	$(RANLIB) libmeschach.a
-#	$(CC) -shared -o libmeschach.so $(LIST1)
-
-$(LIST2): $(HBASE) matrix2.h
-part2: $(LIST2)
-	ar ru libmeschach.a $(LIST2)
-	$(RANLIB) libmeschach.a
-#	$(CC) -shared -o libmeschach.so $(LIST2)
-
-$(LIST3): $(HBASE) sparse.h sparse2.h
-part3: $(LIST3)
-	ar ru libmeschach.a $(LIST3)
-	$(RANLIB) libmeschach.a
-#	$(CC) -shared -o libmeschach.so $(LIST3)
-
-$(ZLIST1): $(HBASDE) zmatrix.h
-zpart1: $(ZLIST1)
-	ar ru libmeschach.a $(ZLIST1)
-	$(RANLIB) libmeschach.a
-#	$(CC) -shared -o libmeschach.so $(ZLIST1)
-
-$(ZLIST2): $(HBASE) zmatrix.h zmatrix2.h 
-zpart2: $(ZLIST2)
-	ar ru libmeschach.a $(ZLIST2)
-	$(RANLIB) libmeschach.a
-#	$(CC) -shared -o libmeschach.so $(ZLIST2)
-
-$(OLDLIST): $(HBASE) sparse.h sparse2.h 
-oldpart: $(OLDLIST)
-	ar ru libmeschach.a $(OLDLIST)
-	$(RANLIB) libmeschach.a
-#	$(CC) -shared -o libmeschach.so $(OLDLIST)
-
-shared:   $(ALL_LISTS)
-	$(CC) -shared -o libmeschach.so $(ALL_LISTS) -lc -lm -Wl,-soname -Wl,libmeschach.so.$(vers)
-
-static:  $(ALL_LISTS)
-	ar ru libmeschach.a $(ALL_LISTS)
-	$(RANLIB) libmeschach.a
-
-+libmeschach.so:   $(ALL_LISTS)
-+	$(CC) $(LDFLAGS) -shared -o libmeschach.so $(ALL_LISTS) -lc -lm -Wl,-soname -Wl,libmeschach.so.$(vers)
- 
- #######################################
- 
-@@ -199,32 +158,32 @@
-  
- alltorture: torture sptort ztorture memtort itertort mfuntort iotort
- 
-torture:torture.o libmeschach.a
-	$(CC) $(CFLAGS) $(DEFS) -o torture torture.o \
-	libmeschach.a $(LIBS)
-sptort:sptort.o libmeschach.a
-	$(CC) $(CFLAGS) $(DEFS) -o sptort sptort.o \
-	libmeschach.a $(LIBS)
-memtort: memtort.o libmeschach.a
-	$(CC) $(CFLAGS) $(DEFS) -o memtort memtort.o \
-	libmeschach.a $(LIBS)
-ztorture:ztorture.o libmeschach.a
-	$(CC) $(CFLAGS) $(DEFS) -o ztorture ztorture.o \
-	libmeschach.a $(LIBS)
-itertort: itertort.o libmeschach.a
-	$(CC) $(CFLAGS) $(DEFS) -o itertort itertort.o \
-	libmeschach.a $(LIBS)
-
-iotort: iotort.o libmeschach.a
-	$(CC) $(CFLAGS) $(DEFS) -o iotort iotort.o \
-	libmeschach.a $(LIBS)
-mfuntort: mfuntort.o libmeschach.a
-	$(CC) $(CFLAGS) $(DEFS) -o mfuntort mfuntort.o \
-	libmeschach.a $(LIBS)
-tstmove: tstmove.o libmeschach.a
-	$(CC) $(CFLAGS) $(DEFS) -o tstmove tstmove.o \
-	libmeschach.a $(LIBS)
-tstpxvec: tstpxvec.o libmeschach.a
-	$(CC) $(CFLAGS) $(DEFS) -o tstpxvec tstpxvec.o \
-	libmeschach.a $(LIBS)
-+torture:torture.o libmeschach.so
-+	$(CC) $(CFLAGS) $(LDFLAGS) $(DEFS) -fPIE -o torture torture.o \
-+	-lmeschach -L. $(LIBS)
-+sptort:sptort.o libmeschach.so
-+	$(CC) $(CFLAGS) $(LDFLAGS) $(DEFS) -fPIE -o sptort sptort.o \
-+	-lmeschach -L. $(LIBS)
-+memtort: memtort.o libmeschach.so
-+	$(CC) $(CFLAGS) $(LDFLAGS) $(DEFS) -fPIE -o memtort memtort.o \
-+	-lmeschach -L. $(LIBS)
-+ztorture:ztorture.o libmeschach.so
-+	$(CC) $(CFLAGS) $(LDFLAGS) $(DEFS) -fPIE -o ztorture ztorture.o \
-+	-lmeschach -L. $(LIBS)
-+itertort: itertort.o libmeschach.so
-+	$(CC) $(CFLAGS) $(LDFLAGS) $(DEFS) -fPIE -o itertort itertort.o \
-+	-lmeschach -L. $(LIBS)
-+
-+iotort: iotort.o libmeschach.so
-+	$(CC) $(CFLAGS) $(LDFLAGS) $(DEFS) -fPIE -o iotort iotort.o \
-+	-lmeschach -L. $(LIBS)
-+mfuntort: mfuntort.o libmeschach.so
-+	$(CC) $(CFLAGS) $(LDFLAGS) $(DEFS) -fPIE -o mfuntort mfuntort.o \
-+	-lmeschach -L. $(LIBS)
-+tstmove: tstmove.o libmeschach.so
-+	$(CC) $(CFLAGS) $(LDFLAGS) $(DEFS) -fPIE -o tstmove tstmove.o \
-+	-lmeschach -L. $(LIBS)
-+tstpxvec: tstpxvec.o libmeschach.so
-+	$(CC) $(CFLAGS) $(LDFLAGS) $(DEFS) -fPIE -o tstpxvec tstpxvec.o \
-+	-lmeschach -L. $(LIBS)
- 
--- a/sci-libs/meschach/meschach-1.2b.ebuild
+++ b/sci-libs/meschach/meschach-1.2b.ebuild
@@ -1,84 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-inherit autotools eutils toolchain-funcs
-
-MAJOR="$(ver_cut 1)"
-VERSION="$(ver_cut 1-2)"
-
-DESCRIPTION="Meschach is a C-language library of routines for performing matrix computations"
-HOMEPAGE="http://homepage.divms.uiowa.edu/~dstewart/meschach"
-SRC_URI="
-	http://cdn-fastly.deb.debian.org/debian/pool/main/m/meschach/${PN}_${PV}.orig.tar.gz
-	http://cdn-fastly.deb.debian.org/debian/pool/main/m/meschach/${PN}_${PV}-14.debian.tar.xz
-"
-LICENSE="meschach"
-SLOT="0"
-KEYWORDS="~amd64"
-
-IUSE="complex +double float munroll old segmem sparse unroll"
-REQUIRED_USE="
-		^^ ( double float )
-"
-
-PATCHES=(
-	"${WORKDIR}/debian/patches/${PN}_${PV}-13.diff"
-	"${WORKDIR}/debian/patches/${PN}_${PV}-13.configure.diff"
-	"${FILESDIR}/configure.patch"
-	"${FILESDIR}/${PN}-2-mbdyn.diff"
-	"${FILESDIR}/${PN}-makefile.patch"
-)
-
-src_prepare() {
-	default
-	mv configure.in configure.ac || die
-	use old && sed -i -- 's/all: shared static/all: oldpart shared static/g' makefile.ac
-	tc-export AR CC
-	eautoreconf
-}
-
-src_configure() {
-	myconf=(
-		$(use_with complex)
-		$(use_with double)
-		$(use_with float)
-		$(use_with munroll)
-		$(use_with segmem)
-		$(use_with sparse)
-		$(use_with unroll)
-	)
-	econf "${myconf[@]}"
-}
-
-src_compile() {
-	emake vers="${VERSION}" all
-	emake alltorture
-}
-
-src_install() {
-	ln -s "lib${PN}.so" "lib${PN}.so.${MAJOR}" || die
-	ln -s "lib${PN}.so.${MAJOR}" "lib${PN}.so.${VERSION}" || die
-	dolib.so "lib${PN}.so"
-	dolib.so "lib${PN}.so.${MAJOR}"
-	dolib.so "lib${PN}.so.${VERSION}"
-
-	insinto "/usr/include/${PN}"
-	doins *.h
-
-	exeinto "/usr/libexec/${PN}"
-	doexe iotort
-	doexe itertort
-	doexe memtort
-	doexe mfuntort
-	doexe sptort
-	doexe torture
-	doexe ztorture
-
-	insinto "/usr/share/${P}"
-	doins *.dat
-
-	dodoc -r DOC/.
-	einstalldocs
-}
--- a/sci-libs/meschach/meschach-1.2b_p20170511-r1.ebuild
+++ b/sci-libs/meschach/meschach-1.2b_p20170511-r1.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2

-EAPI="7"
+EAPI=8

 inherit cmake

@@ -21,7 +21,8 @@ LICENSE="meschach"
 SLOT="0"
 KEYWORDS="~amd64"

-IUSE="+complex +double munroll old segmem +float +sparse unroll"
+IUSE="+complex +double-precision munroll segmem +single-precision +sparse vunroll"
+#TODO: build old functions, torture

 #PATCHES=(
 #	"${FILESDIR}/.patch"
@@ -31,12 +32,12 @@ src_configure() {
 	mycmakeargs=(
 		-DANDROID_COMPILE=OFF
 		-DCOMPLEX_OPTION=$(usex complex)
-		-DREAL_DBL_OPTION=$(usex double)
-		-DREAL_FLT_OPTION=$(usex float)
+		-DREAL_DBL_OPTION=$(usex double-precision)
 		-DMUNROLL_OPTION=$(usex munroll)
 		-DSEGMENTED_OPTION=$(usex segmem)
+		-DREAL_FLT_OPTION=$(usex single-precision)
 		-DSPARSE_OPTION=$(usex sparse)
-		-DVUNROLL_OPTION=$(usex unroll)
+		-DVUNROLL_OPTION=$(usex vunroll)
 	)
 	cmake_src_configure
 }
--- a/sci-libs/meschach/metadata.xml
+++ b/sci-libs/meschach/metadata.xml
@@ -1,17 +1,18 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
-    <email>lssndrbarbieri@gmail.com</email>
-    <name>Alessandro Barbieri</name>
-  </maintainer>
-  <upstream>
-    <maintainer>
-      <email>dstewart@math.uiowa.edu</email>
-      <name>David Stewart</name>
-    </maintainer>
-  </upstream>
-  <longdescription lang="en">
+	<maintainer type="person">
+		<email>lssndrbarbieri@gmail.com</email>
+		<name>Alessandro Barbieri</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">yageek/Meschach</remote-id>
+		<maintainer>
+			<email>dstewart@math.uiowa.edu</email>
+			<name>David Stewart</name>
+		</maintainer>
+	</upstream>
+	<longdescription lang="en">
 The Meschach Library is a numerical library of C routines for performing
 calculations on matrices and vectors. It is intended for solving systems of
 linear equations (dense and sparse), solve least squares problems,
@@ -26,15 +27,15 @@ comprises a coherent system. The current version is enhanced with many
 features comparing with previous versions. Since the memory requirements
 are nontrivial for large problems we have paid more attention to
 allocation/deallocation of memory.
-  </longdescription>
-  <use>
-    <flag name="complex">incorporate complex functions.</flag>
-    <flag name="double">double precision</flag>
-    <flag name="float">single precision</flag>
-    <flag name="munroll">unroll low level loops on matrices</flag>
-    <flag name="old">build no longer supported functions</flag>
-    <flag name="segmem">should be set if you are working with a machine or compiler that does not allow large arrays to be allocated. See README</flag>
-    <flag name="sparse">incorporate sparse matrix functions</flag>
-    <flag name="unroll">unroll low level loops on vectors</flag>
-  </use>
+	</longdescription>
+	<use>
+		<flag name="complex">incorporate complex functions</flag>
+		<flag name="double-precision">double precision</flag>
+		<flag name="munroll">unroll low level loops on matrices</flag>
+		<!--<flag name="old">build no longer supported functions</flag>-->
+		<flag name="segmem">should be set if you are working with a machine or compiler that does not allow large arrays to be allocated. See README</flag>
+		<flag name="single-precision">single precision</flag>
+		<flag name="sparse">incorporate sparse matrix functions</flag>
+		<flag name="vunroll">unroll low level loops on vectors</flag>
+	</use>
 </pkgmetadata>
--- a/sys-cluster/SOS/SOS-1.5.0.ebuild
+++ b/sys-cluster/SOS/SOS-1.5.0.ebuild
@@ -24,7 +24,6 @@ IUSE_TOTAL_DATA_ORDERING="
 	+total-data-ordering-check
 	total-data-ordering-never
 "
-IUSE_EXPAND="OFI_MR TOTAL_DATA_ORDERING"
 IUSE="${IUSE_OFI_MR} ${IUSE_TOTAL_DATA_ORDERING} av-map bounce-buffers cma completion-polling cxx
 debug error-checking fortran long-fortran-header manual-progress memcpy ofi ofi-fence openmp
 +pmi-mpi pmi-simple portals4 profiling pthread-mutexes remote-virtual-addressing threads
--- a/sys-cluster/TCL/TCL-1.0.ebuild
+++ b/sys-cluster/TCL/TCL-1.0.ebuild
@@ -18,7 +18,6 @@ IUSE_TCL="
 	tcl-instrumentation-debug
 	+tcl-performance
 "
-IUSE_EXPAND="TCL"
 IUSE="${IUSE_TCL} fti scr veloc"

 RDEPEND="
--- a/sys-cluster/extrae/extrae-3.8.3-r10.ebuild
+++ b/sys-cluster/extrae/extrae-3.8.3-r10.ebuild
@@ -20,7 +20,6 @@ IUSE_INSTRUMENT="
 	+instrument-io
 	+instrument-syscall
 "
-IUSE_EXPAND="INSTRUMENT"
 IUSE="${IUSE_INSTRUMENT} clustering dlsym doc dyninst heterogeneous inotify memkind
 merge-in-trace nanos online opencl openmp openshmem +parallel-merge pebs-sampling
 peruse +posix-clock pthread sampling +single-mpi-lib sionlib smpss spectral +xml"
--- a/sys-cluster/nanos6/nanos6-2.6-r4.ebuild
+++ b/sys-cluster/nanos6/nanos6-2.6-r4.ebuild
@@ -63,15 +63,12 @@ src_configure() {
 		$(use_enable debug extra-debug)
 	)

+	# https://github.com/bsc-pm/nanos6/issues/6
+	use ctf2prv && myconf+=( "--with-babeltrace2=${EPREFIX}/usr" )
 	use dlb && myconf+=( "--with-dlb=${EPREFIX}/usr" )
 	use memkind && myconf+=( "--with-memkind=${EPREFIX}/usr" )
 	use pqos && myconf+=( "--with-pqos=${EPREFIX}/usr" )

-	if use ctf2prv; then
-		myconf+=( "--with-babeltrace2=${EPREFIX}/usr" )
-	else
-		myconf+=( "--without-babeltrace2" )
-	fi
 	if use extrae; then
 		myconf+=( "--with-extrae=${EPREFIX}/usr" )
 	else
@@ -100,7 +97,6 @@ src_configure() {

 	econf "${myconf[@]}"
 }
-#		--without-cuda

 src_install() {
 	default
--- a/sys-cluster/nanox/nanox-0.15_p20210818.ebuild
+++ b/sys-cluster/nanox/nanox-0.15_p20210818.ebuild
@@ -27,7 +27,6 @@ IUSE_NANOX="
 	nanox-instrumentation-debug
 	+nanox-performance
 "
-IUSE_EXPAND="NANOX"
 IUSE="${IUSE_NANOX} allocator ayudame dlb +extrae gasnet hwloc memkind memtracker mpi opencl papi sqlite resiliency task-callback +threads"

 CDEPEND="
--- a/sys-cluster/parsec/parsec-3.0.2012.ebuild
+++ b/sys-cluster/parsec/parsec-3.0.2012.ebuild
@@ -44,7 +44,6 @@ IUSE_PARSEC_PROF="
 	parsec-prof-scheduling-events
 	+parsec-prof-thread
 "
-IUSE_EXPAND="PARSEC_DEBUG PARSEC_DIST PARSEC_PROF"
 IUSE="${IUSE_PARSEC_DEBUG} ${IUSE_PARSEC_DIST} ${IUSE_PARSEC_PROF} +cxx debug +devel-headers fortran +home-config-files +mpi profile +sched-deps-mask sim test +tools"

 #TODO: gd vite
--- a/sys-cluster/portals4/portals4-1.0_alpha1_p20190109-r2.ebuild
+++ b/sys-cluster/portals4/portals4-1.0_alpha1_p20190109-r2.ebuild
@@ -26,7 +26,6 @@ IUSE_TRANSPORT="
 	transport-shmem
 	+transport-udp
 "
-IUSE_EXPAND="TRANSPORT"
 IUSE="${IUSE_TRANSPORT} knem me-triggered pmi ppe reliable-udp test unordered-matching zero-mrs"

 RDEPEND="
--- a/sys-cluster/veloc/veloc-1.5.ebuild
+++ b/sys-cluster/veloc/veloc-1.5.ebuild
@@ -22,7 +22,6 @@ IUSE_COMM_QUEUE="
 	comm-queue-socket
 "
 #	comm-queue-thallium
-IUSE_EXPAND="COMM_QUEUE"
 IUSE="${IUSE_COMM_QUEUE} python +slurm"

 RDEPEND="
--- a/www-apps/uwebsockets/Manifest
+++ b/www-apps/uwebsockets/Manifest
@@ -1 +1 @@
-DIST uwebsockets-19.2.0.tar.gz 296110 BLAKE2B 6ca910344bef136e88ca94d75005e25713f2400c0b1f26f39d0249e2525cc64be0c19d1deeee7c31f39eda5923c85fe85d9125be65441d8b252de0181fba8f09 SHA512 9fbeef91c6c16e4ee75c212e386f10fffdbaac5d5b0abe4a493b3a50bb78aa366e20f6d7f4cac2b986dba86697c609555cd370a92378e5a1b19aebeb0d745ed9
+DIST uwebsockets-19.5.0.tar.gz 296625 BLAKE2B d6ae47872c903bb702300d59208fd7d7ac1ffe8580199babb0d7671c205af9a6e6832b27d4f7d2d032461a06f43e938f19d6d531a5671c6c739aee2c5d4e8b92 SHA512 1bf7bf44f258664450b8a6325d51a2cfe0c3ba4e128231dcf16a2661a51967f972957d3dd36ac5a4177e10e4a942b1661c4a60e503eb1517493a29381388f21f
--- a/www-apps/uwebsockets/uwebsockets-19.5.0.ebuild
+++ b/www-apps/uwebsockets/uwebsockets-19.5.0.ebuild
--- a/www-servers/hinsightd/hinsightd-9999.ebuild
+++ b/www-servers/hinsightd/hinsightd-9999.ebuild
@@ -1,7 +1,7 @@
 # Copyright 2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2

-EAPI=7
+EAPI=8

 LUA_COMPAT=( lua5-{1..4} luajit )

@@ -13,8 +13,6 @@ LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~amd64"

-mycommit="f04d7703f6cdbd2e33f8a7289d80a01dba5e970f"
-
 if [[ ${PV} == *9999* ]]; then
 	inherit git-r3
 	EGIT_REPO_URI="https://gitlab.com/tiotags/hin9.git"
@@ -27,7 +25,7 @@ else
 	S="${WORKDIR}/hin9-v${PV}"
 fi

-IUSE="+openssl"
+IUSE="+openssl cgi +fcgi +rproxy"
 REQUIRED_USE="${LUA_REQUIRED_USE}"

 BDEPEND="
@@ -51,16 +49,22 @@ PATCHES=(
 	"${FILESDIR}/${PN}-defines-v4.patch"
 )

+FILECAPS=(
+	cap_net_bind_service usr/sbin/${PN}
+)
+
 src_configure() {
 	local mycmakeargs=(
 		-DUSE_OPENSSL=$(usex openssl)
+		-DUSE_CGI=$(usex cgi)
+		-DUSE_FCGI=$(usex fcgi)
+		-DUSE_RPROXY=$(usex rproxy)
 	)
 	cmake_src_configure
 }

 src_install() {
-	newsbin "${BUILD_DIR}/hin9" $PN
-	newbin "${BUILD_DIR}/hin9_pid_helper" ${PN}_pid_helper
+	cmake_src_install
 	newinitd "${S}/external/packaging/$PN.initd.sh" $PN
 	newconfd "${S}/external/packaging/$PN.confd.sh" $PN
 	systemd_dounit "${FILESDIR}/$PN.service" # not tested
@@ -74,12 +78,10 @@ src_install() {
 	# logrotate
 	insinto /etc/logrotate.d
 	newins "${S}/external/packaging/$PN.logrotate.sh" $PN
-
-	keepdir /var/www/localhost
 }

 pkg_postinst() {
-	fcaps CAP_NET_BIND_SERVICE /usr/sbin/$PN
+	fcaps_pkg_postinst

 	if kernel_is lt 5 7; then
 		ewarn ""
--- a/www-servers/hinsightd/metadata.xml
+++ b/www-servers/hinsightd/metadata.xml
@@ -18,5 +18,8 @@
 	</longdescription>
 	<use>
 		<flag name="openssl">Enable tls encryption with openssl</flag>
+		<flag name="cgi">Enable old/slow cgi support (legacy should not be used)</flag>
+		<flag name="fcgi">Enable fast cgi support</flag>
+		<flag name="rproxy">Enable reverse proxying support</flag>
 	</use>
 </pkgmetadata>
				`@@ -1 +0,0 @@`
				`DIST pytest-marks-0.4.tar.gz 1978 BLAKE2B 1f9898d860734e940b77f926bc7513e9c1d26d4dc45b9f876378974db393b41f8e9c24073306c6d299d3a70d60d40ecea35efdf4e50aa861678837cf4626c46f SHA512 4c1b6bb88c022661705e31cdf0b2d25c4e6fe09a4f8632662410d0c7ab3e436c6091ee88620b7c6660c4194f7afaedeb11ae4eac6476e447b6653c6ac7668d7b`
				`@@ -1 +0,0 @@`
				`DIST rtv-1.27.0.tar.gz 17277593 BLAKE2B 25d504a7715cbab926d5dc612baee223d9fa192828763edffb3a8fa09861b2c6bf6835adda638b1300ecebbc2e1822709971dd9e63ea7e05b6a7eebc0d5dbda7 SHA512 38a136af0b9a4e693e9db119ebdee332a20002622029107c1860dc32f15fe2d4a0b68d1a45e6817e9c00a3aaece3dfcd604f04de71a6dec4bbf1c23df2bf6605`