commit:     a4c9a2a730cb219e241e32fa81119633ab6aecc7
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sat Jun 24 05:47:01 2023 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat Jun 24 06:32:28 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a4c9a2a7

dev-util/watchman: add 2023.06.19.00

Signed-off-by: Sam James <sam <AT> gentoo.org>

 dev-util/watchman/Manifest                         |  26 +++
 ...atchman-2023.06.19.00-rust-1.70-avoidance.patch |  50 +++++
 dev-util/watchman/watchman-2023.06.19.00.ebuild    | 244 +++++++++++++++++++++
 3 files changed, 320 insertions(+)

diff --git a/dev-util/watchman/Manifest b/dev-util/watchman/Manifest
index 879479ad6dca..44ebd802c1f9 100644
--- a/dev-util/watchman/Manifest
+++ b/dev-util/watchman/Manifest
@@ -5,6 +5,7 @@ DIST android_system_properties-0.1.5.crate 5243 BLAKE2B 
86f68ec3bdabf8c6ec47881d
 DIST ansi_term-0.12.1.crate 24838 BLAKE2B 
f636772c34e2d68cda7b8d3b2b86abda074585a62bd2654812ce92384244655a9197fa66e6939e19a674c0148ca605313d83de262bb18c2339a8a4eb4438a791
 SHA512 
b840e28b3e7700689a69a39659b1e066560078dd4a58326b91a028915819e7af883399ee53e920db68fd974c58d35bb1ddf8d427af5937d5f696f57c4376b671
 DIST anyhow-1.0.68.crate 43882 BLAKE2B 
0ccd8fcb746344dfa85674fa7c95aa648aed8d40134b8c1c1c0852f6c7d22f5622ca1704ec65c254fc20946b1733299e1517364d74f726952d5a951ef89a2fe5
 SHA512 
b8cfc132ebeac823edf18cba7e335d1939fcbb095ed4ea859f4dc4cde5b1ff35fd68f0743577c69085f74f019768a3359936bf6dc1b2aceb7e2b28ace7f74a0f
 DIST anyhow-1.0.70.crate 43803 BLAKE2B 
574da0e447592c12051deef171850b00ac2347dd336f71915dd21f45cc03439fbcdbaffe261097d53cc11fa0db75b1e3b21ba667f26c08db7125b1c6264973de
 SHA512 
6fd1338e4cbe915cb01fcc5e05e7e0c051868701eeb27f03577a7cfdd59057493922b36e2308f7050608a851112d4d24cff2826456160ac8930fe961640e809b
+DIST anyhow-1.0.71.crate 43808 BLAKE2B 
1ec6b440758e26b2328738bab7c6b1fe8670959793cc24f61cecd0d8b0ebe60b9855ee1cdac9b5f5a5b238daf796eae5b7c82b903e7c822a5625d95130f8b61f
 SHA512 
401b1c5d04fa0581f303395fcb3af5e7684ead367e2a173b4d90db9c04ac20010c5330a686f3ba91a541e1526a7185091b7dbfddce5134b5a74cc749b0338da5
 DIST atty-0.2.14.crate 5470 BLAKE2B 
2db856a9e898a430258f059aeaf7c844a153293e8856d90ac81f7d91a888c89198768ad5cb09303c23241fe85c560a55148fa56a303651a82b0edb895616bfab
 SHA512 
d7b6c4b9a0f898d91ddbc41a5ee45bbf45d1d269508c8cc87ee3e3990500e41e0ec387afb1f3bc7db55bedac396dd86c6509f4bf9e5148d809c3802edcc5e1d9
 DIST autocfg-1.1.0.crate 13272 BLAKE2B 
7724055c337d562103f191f4e36cab469e578f0c51cc24d33624dea155d108a07578703766341fd6a4cc1ef52acda406e7dba1650d59115f18261281e5b40203
 SHA512 
df972c09abbdc0b6cb6bb55b1e29c7fed706ece38a62613d9e275bac46a19574a7f96f0152cccb0239efea04ee90083a146b58b15307696c4c81878cd12de28f
 DIST base64-0.10.1.crate 41988 BLAKE2B 
6e28a70cc0d5e426d9a3944825952851928ec2e32fa2543a8e1d1b886ad306f38fd6e673da62e96581e56613f133265feeff5b0d2f1e2e34593e58c0424eee9e
 SHA512 
674a8cbee95a41f755499a4e3bb93ebd3f80140c3e8e2d44a0b73890ee423754e7ba8abcd92132683cd54501ff5d14438d023a202eaf12776aecbe36df9e5535
@@ -31,9 +32,11 @@ DIST crossbeam-deque-0.8.2.crate 21237 BLAKE2B 
f00948fe90806fcbf1585c0404250dc84
 DIST crossbeam-deque-0.8.3.crate 21746 BLAKE2B 
c24025c65d7c1c98e442af95491749dd4f777af0509636ed66886dcf656359ec50dc2a5e26327559c6659f6b355d2b0b992dafa691a36571c99637cb47372d0f
 SHA512 
f3201c9afef7d2d119702696f7e5e7997a104b8f7d67c7adebd1cbed84d3a3415636ff674f1ccdfd95d0dc162384e46c6138c8203ede69577b0d5359a4b44672
 DIST crossbeam-epoch-0.9.13.crate 48313 BLAKE2B 
6e548cd39fb400732dc179c5b7185555bdb8a367b5d3a27dcabe9ad36db6e9858604dee210fe487de8f9127fd6d0db1ef1fd04a1cc8cdcf34bedcf980c048555
 SHA512 
a4578e0e535f301b73f0332778e79b327bafea6afa43284317fccc49b410118360866a2dea8ac22f2977f309d07c663e5d95fbfa852ab795d414c170ee4e06bf
 DIST crossbeam-epoch-0.9.14.crate 48524 BLAKE2B 
439eec7e5e0364af0fe0a34ffc9354ae289798ffa7480bc656d4a610101e1ef2d5f484d84f82c87f961bd622434c36adfb7a87f7fbd2c71077b732cc7cc765ad
 SHA512 
543cb60cff7c0823733f6ace191b137a04025a2b40fe4fea5eb273772009627fb705aecf742bc59e01367d4c15a14aca73aa2caf7f4b509f4b25947e14fd1e19
+DIST crossbeam-epoch-0.9.15.crate 48553 BLAKE2B 
23aa0532d3126e22efc779859478098e505b4ec895c643530a3f7e8dba0543df3d8ffcb6825b1d3869a4418e17d798d464b3e1bb51522435d50f53ac224e22c8
 SHA512 
d9292c059ef1d156da52950137b2b3ea5eab66c4cc2f763d02078d0b0106980839ebed2ae2aec53e026ee7b3ddc37c4b51370d925ada1ad13d9981934daa7bde
 DIST crossbeam-queue-0.3.8.crate 16731 BLAKE2B 
80a8647bf491adc1a5dc736f662c01e77bcceb4bb2b876eaf684cb2a742a2f46d09e1221f6ca8b19340ddc9ed3a10bf07a08305a5bf069338d00873b1296ad96
 SHA512 
3c4e855184f8e2656305a59463f0170aab99f9c2df1001f54341b62e05e533864f384477a7a9cbc2b8b1a36bbe4b8076531c11b1492485029ef81ade6e7cbf8b
 DIST crossbeam-utils-0.8.14.crate 42127 BLAKE2B 
3e31e6371e46aba6697501a34e1b737680dcb692c0d1ba7cc1ce7025ec70ee69f7595e3abd90fb52c11e42cb43fa5fae6103f97add35cf87b0a68ea83213d0d0
 SHA512 
fa00a57c41c9daa152f8a6c6f4d3c77986de1aa21585984adf577e244c2f121db014ba2beb92241590e1cf78710e77d9a703ce4a4d44d8854bc3e60690151393
 DIST crossbeam-utils-0.8.15.crate 42326 BLAKE2B 
23e6bd2a6535c6fccf7b7d17487fdd4095c92a3f3ae383a72dd6d90c1c49c2ec8d96dc01a94c7127b2681bfaef843585b3ae8665ecbc43b2e7db8434e31c6c8b
 SHA512 
adb9ce1886396bc637299cb8122d102bcc9e561f25d67ef73e98c9ed8a8b13b78bc0f5bbacab19d015e1a7690bc0201f08b3d8e82393ec347e7f2933eb622533
+DIST crossbeam-utils-0.8.16.crate 42508 BLAKE2B 
dfaf9e7cade2cb5a2de90dc622e58a69c5b28fe9f69d3cbb945431683cf48fb409565190e3414a815563afb12631d990476919890fc482ce6b5792fdc25536a7
 SHA512 
4b8d599a8b93015eea2fd404cdf1526fbb94662fffc7c64d2f0659aeef349e4ad682f61b2b85d075c7f3fbbc4d8106cd7caf6e65dae117ba982f31262df3f831
 DIST crunchy-0.2.2.crate 2995 BLAKE2B 
74ddf8c5e0deb2ceab65c20a2743e1230739ac6aa3af60c9e867a7852270697a1278b7dee00df8949fc4268f9756a4a098df1211ab3b3e31a122652c3ba0a6fb
 SHA512 
36dc0aebc41a3aac5f1b178a7e61b65bcd9bb5c8539b2024f79428200f7c62daa7098af55c6ab0765febd2f8969bd6c0ac8096f73cdc0958e5c4e4eb6a4f7025
 DIST cxx-1.0.87.crate 589116 BLAKE2B 
c2d3a20e8e1988517079528112dd91f92409eca2889fab6df667f406fc5631e59ca0fde8a2768d9eeb218c128cf54d3779af88971ac4ee3e9c5cbb2291812416
 SHA512 
dd057961f20ed8b21a0b90185ad1fd851309ee6bac9b03f5299f14e82bc246e5057546daf8e75f26b679f7d2f0bb267c0b3e7955997e3568130dc11a27087dae
 DIST cxx-1.0.94.crate 196058 BLAKE2B 
f504685292650a076c3689540cbb5906721fcba1cda0391e855d75b9b1270249805986b501291d91c947c124ba8affa1659e43e040bb264d3ab3aa23b98d9718
 SHA512 
fb66c3d53dfa1fdfe8fa31ffb6ffe0f53fc87d5f56038b5d2f588fc56668f96954e75db1fc7304d183ebae2735f0c7297b396936d588242556f40557854f22be
@@ -72,6 +75,7 @@ DIST futures-task-0.3.28.crate 11848 BLAKE2B 
79cd7b01d24a5274b0e564edf0f5d041414
 DIST futures-util-0.3.25.crate 155866 BLAKE2B 
574e7cddaae172827179c1d012c8088ea84141d453b154b4358350f53f94d13b776339b0fe16b6e18429e2f83cf5fa35bd5079537a044f240c1471014e3b6a2a
 SHA512 
3e233a3093f3889af6bb5adf661c1cc32f821b00975bea05eee14c2b38e25974b65c10234eb060c52dea4c665ebd09895df666f8583559b7f7d7636070ea51a8
 DIST futures-util-0.3.28.crate 158510 BLAKE2B 
0721356a4947b39cd066dc8a88afa7686b832be269295af3ebff8cd74b42dffe5484399f66e3e11e2b54c2b8e04ee002a9d507eeb5259fbdc00b226e0f94b175
 SHA512 
0c7dd3701b7ab0a443a56aa64e6d9b6ba7bb9ccba4c05dfe17608df3e2bed1c2fa460a0cb4abb9fb25289d3a776128ffcc4fced75ca73a65d40b18ee2e9a46e4
 DIST getrandom-0.1.16.crate 25077 BLAKE2B 
0cbe96c27e78100c181a064e5fe524efa9a7a267fe60f8336d2ae0125883acd5d575ff17d1d56607255d9b2c30cb9d962026fdea1a5c3c29a5e0760d27c3136a
 SHA512 
c5450c522c07c7a38b326f9a9062bac7d089630219d577ea4b55abad4e0c31d17b7cde385fc43912dfa100b42334e7a52422c55fda8b738caae428c6f9addb53
+DIST getrandom-0.2.10.crate 34955 BLAKE2B 
8e7b8554ae360484ceca2a05f834c2664b08f41cbc6c955663e1f8f22fb5750481518bf1c7b49f49223a99a66914ef013347b9186acc97a20249f3222a13f9d4
 SHA512 
82af9e0417bff9272ed0478be4ac90426405ce210014b21899c6b95fde1b16893bf46295388ff5f13fa712a04c99c46b770fab83f41a1343af1590a86ca8da3b
 DIST getrandom-0.2.8.crate 30553 BLAKE2B 
30211bc6a8ceb5ba765cbf068405cfc08842b2521c5850647971f4cb4bc9a5b0a9195ccfbc1461de019eeb7744ee69f934922ff21677259d7b815800516df4dc
 SHA512 
cd7aea29f79a33a0de2a52a0a82f2b57ea8f27908ccfe00a5f42248766df88b225023603ec56d6fc634ef9c1eb67ad0135c90d4c695f6f659db0767e7fda44c5
 DIST getrandom-0.2.9.crate 34457 BLAKE2B 
ccf7232ece1047000140ed6bb9a1afa784be87b5cf83e2f58dff77abcd79e34120b45336cb05e47fbfde36407957fe9da8b04971092ec05f67b321fde9142d29
 SHA512 
48e341125223945d1c02c4dfc54df303ae27d3ceca0d5a30b42065f5e40da600cb2010bb59e88af6b990d54b5eb4bf83ae5bbd27e13e56363f5f68be03ea9082
 DIST heck-0.3.3.crate 10260 BLAKE2B 
dc756738081d855583f239908f671e9b5dde72ebfb577f6387b1a169817a03332464cf67071708a4c4f06b1ecb222118e8c719073ccdec1c0f938e5ef378b13f
 SHA512 
b3498e033f44e03206421e565efec5b21d13107b60d35e4476331c44e6effd75c81f7678f2452c822eefd581209a2ffefd2034779cca2d8b4fac4583bbbf777f
@@ -88,9 +92,12 @@ DIST jwalk-0.6.2.crate 37673 BLAKE2B 
c4c5912fc4c0fce31537a9c70237036bb31d49bf88c
 DIST lazy_static-1.4.0.crate 10443 BLAKE2B 
25b2e61bbac48f0dcbc79c81d7bf01f2403d8269ecb6be3ea6147bd00f7a588df15a91f44dfc18ada19b21faa71de4637c7d493a8628cbecd0e547d74e616a23
 SHA512 
e124c0521ec7c950f3c4a066821918da7a9c6e711115d98009ae7c351928fdddead852e7596fea5937a9c30e4e4ce8eee7099b20248b5d6e3b2494b6a6d88cb8
 DIST libc-0.2.139.crate 638983 BLAKE2B 
e92b296cf8c916e10e859722ed75f4790401662ff7aa2fe8ed84ef9b94a00538768be33c272f0881e42da887c8c43e1fd44d061343386216492a76fe5d308598
 SHA512 
ff5fae517c49c382dee9b1d7479b65b0a818780453e5c00c416847d02f42186e2fcf19a8a8dc5e9cc2611300690c6ad324f9c0f0e8172e913a1b781fb7c0b5b4
 DIST libc-0.2.141.crate 671145 BLAKE2B 
c0e37825ac3fba376e942a0e2c2aeefcab384b24c50a453d1948376cecb3f953d59735e37aef8a9ca7ae707fc6b4818823fae7330f213bf084e5460a82dd3ed5
 SHA512 
29d81f440d62fa1c9f7983c38138994e61f4897761a50a4f14abce1ced85a8994c6f0cc0ce86f77113b74495e36ddbebae6627f0b94c44621620a395a6723cdd
+DIST libc-0.2.146.crate 684707 BLAKE2B 
53091a46262389e327973185c26bf187beba392c45a92bfa424fc0976333d6c8afdac6527484032574086e32412a712bc2616468f7cb14e6bd0480ca2bef6da6
 SHA512 
4112c17cfda83041f33a7b616a365a0eb6603ba857fd7bedd64162021a6305c81da6ae8f37395732d7eea40d4fe648bae435ee0bf0b1a1a48400e6546d4d50b6
 DIST link-cplusplus-1.0.8.crate 7674 BLAKE2B 
cbb93184d9deadd4912f6e03dfb7bb9d37f01b6d8d47dc9744724c848f297adb9cafb1599c2bbaffbff336f883e9a24c3cb4f11745ec4716a9a2c8cfa05f6305
 SHA512 
690afe063eb9726faa03443bfd01789a559aa10ded4bb3714ef7b13095005c817ad019fcc62b5f7b286c974a81e387ca3342d238e60ed7ab237c3628383a661e
+DIST lock_api-0.4.10.crate 26713 BLAKE2B 
113adf8554c65e9782e8fd0360d0398567dfbfddb1fea4928cc152fbab98dbe086e42b81170f6f5c333d61dd3261e8a1ebfbaed786e6bf6378e6afde6d7f9e5c
 SHA512 
ffe8cad8099bc382832181c1ff95e0935993491f247114604201be7d4ddf8402fd4db8fd6499c611f95fbce7d57dc3d3738eddfab31c52f50ab8709e549697db
 DIST lock_api-0.4.9.crate 25685 BLAKE2B 
8adf5c3cccebdf6aff6ec977f230cd2a208b0b188ef57deacbbc6019431f0ede1a760b2384ba3cb49c96b8a589dc56c0f46a6359b3e62277e7ae1a1c3f586fa3
 SHA512 
9215381d9bb6b80d217c73a900db43df043b3e939b5bd7a292a02e9ab911cf0eacd8f883d35bdf72b3a0e78df8f1bc3e843ca4c775294c7a7a03091dc1a74990
 DIST log-0.4.17.crate 38028 BLAKE2B 
b46be3719fc0a53e50b1f342762e188587e9f1ceb692c72473ce2663edfb8253742d30024e68c1444780ab7fc0e2d5b0601b8ea7228dc3405a9342a57548e605
 SHA512 
2477d88db42b1d92c30708d88823212e236f613b3465e85eb425f83f8d16fadfaf0352f06c2999a1852102edd2f6ffb10ecb539d8a3b6c48f552a25622ccffa2
+DIST log-0.4.19.crate 38073 BLAKE2B 
bbc8ce51ad4a01562ecd204a531ec7d82101a342ec26405dfadd1761372f7039297dc97f4899889ebdf4eccbd56345e015d4ec6d2788851e523db56eb541aab3
 SHA512 
8f11ca6f5a99b61a5f3baeb7a23b7a879b3a5bed666337936bd1d8794864d14a6c4f0747d03505831783f15d8c14ebcf507267915481dfb1b32188b8ab36a038
 DIST maplit-1.0.2.crate 8871 BLAKE2B 
3cf975d35de2d2fbd50227a6d2c5e72227e99197b620c8f29be97bd3666ec162deeef0d9e6bd327a063f175201beeb73c4ed27272449b1df0b78238b2d36ca22
 SHA512 
917b5cf665e12b687035c895b60b2ae05622963f495f5693515fd24d56f49e95a06ffced68606d061bd20822c655100035930673fd4b0d4790168763b6961a9f
 DIST maybe-uninit-2.0.0.crate 11809 BLAKE2B 
5e517b8c59f9ae4f1a4f86b48679ea64d62450ec2519c8caaa914479ce9e5b3aff24707e2e37272ba74bb60499afdc602fff17756337b0c50a9184edbd8b8805
 SHA512 
3006fc009c7c743d9147a4122e677cdeb2546f7bb46963b2f266839614eb906f9d763c161044fd0bf3f7b54124ac0734ac9ae7f7151b1a7a5f45cbc739976434
 DIST memchr-2.5.0.crate 65812 BLAKE2B 
57966413a1f933dcb2d2d4ccb29c247070f65a83299b2a9f5aa83f5a48a5c5f1c4c7c632fa63bd19f9508e9291e7258db2f16e2813a56fd84e0856f70f1e67ab
 SHA512 
444a163b484c233e78c0e2e4d51f01ce2da93d7d29f516a95e4b0866b20bdfd3f34137653abed53eb70387991ee3e2b5937d8d4360a85bbcb50a93005a75defa
@@ -98,12 +105,15 @@ DIST memmem-0.1.1.crate 10665 BLAKE2B 
430da33ee602a8aefb0a827afd288cbf0ec16f1d53
 DIST memoffset-0.6.5.crate 7686 BLAKE2B 
9a797388702389076c426052c3d54dc62802d5db8bc5c9c83990429f2ffaec4fab4c7dd3f09cd0704d1ea555e87976563bb43408ba54b5e66ce7e406d4604009
 SHA512 
11bdd9185b99dfee8e659e051b09ee301c7142a372a8117864745a5085c015436d2efbb1478192886f09cbc562529e209d2e3325d94938a64bc75b1d91d2bf3f
 DIST memoffset-0.7.1.crate 8556 BLAKE2B 
1ef270f1c8dba32e66cf47a1835f10c342024762c0e56953f16e82d575250028154054d4c42b1324c60f955a40fad3bbb1c5fced147c11c9a4ad62f6f0e948c3
 SHA512 
40ca3c4b1fb929bec75bfcde0135037f81a6c5aa80181bc7dd7bbcd9c0946288eea8d23fca95e296567ccb02155ed0f66c7c23644b5cb3e6d3932be9f9742157
 DIST memoffset-0.8.0.crate 8912 BLAKE2B 
19ad3abed21fc39461b0382b15a8cc312378aba36f042b1e5335012115d31b350a4e3bc720f1eea300d7d19b9b317f75a28d4ccd78ff3b31defd9e4b3147899c
 SHA512 
47adcae0848ff967035e10543ea599c7af9c5bad387023eb4dc77c9e8d875994ec8139b9941b3ecc4fc17214d80944a47a3be174a45b334661914a5a7382dfbe
+DIST memoffset-0.9.0.crate 9033 BLAKE2B 
19090c1af8b8cf54a2cf7593748aff4d3dc685ec7080aa476139c1721ef71555495e1bc513b1efaddc7e7702f83e0e1c2a8f71ff40009d266539484c9297e0ed
 SHA512 
2f04f9b6fed31e94388c18162ad275897a835df7b9ac827f4df0f4b0ecf71064ef247f7ad11dbc27d7a6d448984a0f29d1c000e3c8d5fa6e121fa9571770ec55
 DIST mio-0.8.5.crate 93993 BLAKE2B 
6c20d66c3b5753234c0ab0461642b63e84383128db775c6e01d50bade5a69081f7da1626f87244c2c45c2451690e8cdca02e2d1ca20f279ba6f8401fb006c7cc
 SHA512 
e92bbc1d06ad8d4311d76f878d514d0c91e47de2c511c54bb53096ad689012c3d1ffeec18e2de05a5f66c03ad83150cd45d31edd203e9b9522ece13be00bcede
 DIST mio-0.8.6.crate 93658 BLAKE2B 
32b10be05ef5d1ed44da41cd03c1624ccec78b6a89b5104ab7a1a3b84dfd299bc7bf7f3671aaae0a2759a56120740915d380aff05af5f5f8b9e8e22fbcfa8203
 SHA512 
45b3d2a911b66be556dfb79d87ffcc57ee5f33a03fb30f319631796090caf8779e94cda37fc7a76685c69483f1cc7616c15440b71bfcc51239928d8879873f6e
+DIST mio-0.8.8.crate 94264 BLAKE2B 
f70334d3daa8794079c865c5e91d9b32fee2b90af95a6690f7cbe0765818ed9a0f5d539f3390119565c3ed47025979657e30ee2e871760a776829dcddb59783c
 SHA512 
448a05f19a147fe119965f7f1aaf24c2a40ed816ddf2e5c95ba3bdaded5e2812314c64a50dc7baada93bb005b65159cb6597f82a407936885ea376bb128b0c9a
 DIST nix-0.23.2.crate 242042 BLAKE2B 
b44292d87e9379debd1676952cde1175568cae88f64435cf2e347ae624ecbfd3bc08a9cd7de1c50b23a416754dff4b7cb51983fae06a66f7f16089cde94f440d
 SHA512 
8617a5d99c9aa729f35b42b3797ea46e3c1779c234a836c7460cabdc7d4229b79c8772098b1b95f8b444351bcddd2729515a0433f68ea035087ef6a93033ce93
 DIST nix-0.25.1.crate 272312 BLAKE2B 
5981fec66eb96dfeb4b380130c4f2927a1f904b10744690e361b480355be31ac625f52614f95a89ea19fa07cc383b0975b3985f743c64f6780800e64a2f11f14
 SHA512 
e80b3a4e38b26687ba39b52ebebc6415e9618ca41e037d571fcaa33638ef28d022be02e2265db0149088a927fb81935329e651e2cda5c29c92038eb07fe55538
 DIST nom-5.1.2.crate 136174 BLAKE2B 
32387d6ded0fbcdee8a1a0d0a08cd36bf92c38906cd199b574b6b9b24f6c245f2287e04374f7d84e2867d2785aa16d8c01ae3bd3bc811829770232681e2d33a5
 SHA512 
53b8ddab62475588efae46c78b5fd086a14c0fa505c84e625fbedd6dc74d4ac047e9fbed7312b797f126e9ca1f056458d8ffe0ab13f0117de685ef8b43f86aca
 DIST ntapi-0.4.0.crate 126602 BLAKE2B 
fb6ce09970a93eb45ce0e72d6c79474094aa5cd49feba3d780a00e756a2abc2e57bbf35f9683d09b8be979a6241daa1a84ed8b766c192670e0135438fb05eda5
 SHA512 
481833f9abebe412912c1228a81f733c64758860a71d300424ed3fbb6863d74af4e3538c14f67b411d4398ab9ef5d549dfcc0ca22b1c49b0a696d1eb4d233703
+DIST ntapi-0.4.1.crate 126552 BLAKE2B 
ef5291a32f5edab4b29648fcc73df30f993558e45ed862a62a4d7e85f963f195f0a74c9e61eecf928c8966799da45a23694d0c6a1ad5f7d9ab3a8bce86d6d2eb
 SHA512 
8e32d45a508d20f0d3537e056f363270120980dc23564713306e36acbc12a6d379eb3857026fecc16ca75080431e06742e3806801d3e0a848a01f64a8dd4f2d7
 DIST num-0.2.1.crate 9082 BLAKE2B 
d82bf8cf2f53ad30cee1364d65358e8421aedf66126184936d575e359307373ede66358e7672e1eedf3b8ec6a997439a077943c6f20045aa24a89bcdeb611e70
 SHA512 
9d094e0a29b2bb42d382d5167150418bc2ed81e8deb3c6636c99c86ca14abf5f69b82a49f1678dd110119eeaec2f476fe7a5d57e60558473a6b7c710dec7f778
 DIST num-bigint-0.2.6.crate 87275 BLAKE2B 
a7da84e705f8aa287b6704a42ae1822ac1555d25e7f51e69b4288a808557dba2c0c15552085a67f3cbd445d518fc8d4f668f7264237263acc4248d3dd1a2c0a3
 SHA512 
19c1ff0ae6fdfc690ccfe4fe6008c102e50ab9bf6b1f4e4f04a348d217d4d9d538585945466b72b70713053bcfd73685d1a907e41d135265d330bde996709eb8
 DIST num-complex-0.2.4.crate 24679 BLAKE2B 
175ee644720b6bbff108eb4ef94d0fea8f340533c2be0e18524e54777734d1c7dc10a7c36b1f2ca3f032ddcb3dc351e60564340aa59b29aa4fa7ecb2487314c4
 SHA512 
53be64d6f67b1ff7d0a4e1723ae21035abfd300ab27bed0976e0c3903fe8e29f47ffe75040832ee2f81da5c2f4f671d3d845d308365b9a5a989ace99a7d463ea
@@ -115,12 +125,15 @@ DIST num-traits-0.2.15.crate 49262 BLAKE2B 
942ab170b2acce1cb40e6847f766bf810a79e
 DIST num_cpus-1.15.0.crate 15680 BLAKE2B 
a4d98b29ad534de9bc262f58f615ec06bde5d5a2f5252f09b5a0a6ecb06a9daf9709ad9045eb08f7cb744d8a838854b9095aa73918e06624a84efbc11a9a5c1d
 SHA512 
fd4772868def9460a6ee17ef6fc00b0bc74115eec891bb3fdb07ba5b5fe4057a2ac69eb31ba8beddbd3189c7be4545888e5724879f3a89132fbc9b32aa7bb10f
 DIST once_cell-1.17.0.crate 32736 BLAKE2B 
767fc8f362ce5ed7a9eafceb2f0764a2a1c7f4070e22d1e6e2498b3c841c5f761e77fb66a34b899a75d48f1563f6b9b73b90aa9431055d4e0269c47a1b043c1f
 SHA512 
291d87380c0ea17fb3ffc9fdff8620d2ff55601c06ef65b2f0c54254fecd5b488645c6e94c6026b82071893f4d420491ff712399a782e14efa1e323e5c299c46
 DIST once_cell-1.17.1.crate 32856 BLAKE2B 
8bde2aaaf9ef45d1f6b8458686179f1fe9295ee8faea269e9b49779583ce26ab9dafe988c3584e841a9e5d05e28430ca967ef3b25e755f48f0120d9c99cdb7bc
 SHA512 
1302d51801e38bfee23e74c0046f1ecb1d3c27309b5fe11c2b6c99553b357db502ce1718695602f9d8b10429e8ff03f91c016d5d604957083728293824c05904
+DIST once_cell-1.18.0.crate 32969 BLAKE2B 
a08d5beee50a7add28bd9e50b18709e7b34574f0f55f80909d5efb7ac5917e5f30bdcf3fb43ddd0a4f420a427390c7ffe1cc1c7191a3a1d939bc6e3139e6eef7
 SHA512 
9328968afdf3535b2d9e0113d75afa725259d76994ef2e1948ad7efa4ec8a65bac7cfdc31b749d5cd55ad4e28d2e28ac57b871e3067b89182453c7e2413a13b8
 DIST ordered-float-1.1.1.crate 9983 BLAKE2B 
c6c2f5c33676fc88ca85c5a986b5f547e798dc93f35d6fcf4f3c71feb0c05d40965936c509c269d1b4ecc737bc425f479c78821572e646c96aeab09bc213faaf
 SHA512 
defec68f53e35793f579dedbfba46443df91a78332fb755ab6ab90831e09b02519c88c61f9270e9093f6843a19ebae516fac0a06e1080421eb038bf4944e3f96
 DIST os_pipe-1.1.2.crate 11375 BLAKE2B 
076382ac0ae63fa10073341f6a61a3749baf18ed3a7fa78b3fe4b9ad4bc146e53a1820f61de7390b5d181b4311b159ff6e4801a900f7d3fa18cc771b46c60163
 SHA512 
daff52e9f78695a964b7d9c0253ea9f9d97418a66875c01af161148b3189e88f7cd23e794106e8780ea99d8a57efa3b01a9f9ccce32c16187be99eee7e1832a4
 DIST os_pipe-1.1.3.crate 11438 BLAKE2B 
e3127b18b079da295ddc9b3887afead1ce0b6ac28dd9e3ef8a2e0a454842c70d2cea60d5b7db5a44ae6557a60825655a937c2c126080f19af925a1f829232bdf
 SHA512 
08ebca25a9364e476a87327212b67460eae383d0429e63ca85e361fdd1b69c382eb2a0de4a7ceafb1916029d219dc4e6eb183ae621eadb98db629e8eff5bba0d
+DIST os_pipe-1.1.4.crate 11436 BLAKE2B 
215f548a5b16854e156f785a1cc57ff16c241b50223c75159081017889cfe718d6dbdc6567dfc751d71eebda7476c95701c8ae88b1320a0cbba66a694b471d08
 SHA512 
8568008e30fdc47c1c89f7368654d26407fb6594cd89e2b85786c875d9dd99e77ed2bb84d281351072670e2dfe7a952d6251c6fb4d111ebe6a63cb34942b6aa3
 DIST parking_lot-0.12.1.crate 40967 BLAKE2B 
940a112a066e3cbd15e2f6df89bfff37e4ece2194118618a96fa14871813c91798f93181ab0f768d3e1f3d60805508f216724013afb7e3da95678d0d951a42d4
 SHA512 
07327d3b737a913508dffb66023766348ce7f9d555c224a099cabb05baefd16a28e15fec638e3a148a5169dbd980c4541b0f8820ae9d06dfe0704482838fbd5c
 DIST parking_lot_core-0.9.6.crate 32414 BLAKE2B 
c87976a3ffd1f6c9b2099490b44e125bd55c84a40aed321be4421f3499eb149694d045409e8da84983084afbc80e0666af97fc6f3d3b90f3dbbbf9d669a3c0d3
 SHA512 
a3ffa7196580583ee614399a35a3d7a494663932a20dabf326737c8a12bf90ce84924a376c7701d54b207a679d1b90e91cee25475be2d77ffc91ec89268da847
 DIST parking_lot_core-0.9.7.crate 32412 BLAKE2B 
fec3ed2cf28e6d5090aae6a7c0ad583acf3ce6e54e881b78a9cb6721ca1e7040d46c044d405852728e74baff6ff1feaee7a89a64c69d20531f29942dfaafcc72
 SHA512 
1f232f1a87ba9377621244ba49378663f3113da7192a399fdb70be971ff5e5ca0d0601e1210a3fd8ab75ef464dc8505e719f81902e3448cce5e7848ef4bdbef0
+DIST parking_lot_core-0.9.8.crate 32383 BLAKE2B 
2f9666872894d1c85895437d1353f9e15be2bc8d004ffc8f0e5be95e9dd4b274797db3752eba1c0b5b6071c1b8a71e4857cae0b2aff1afdaa39e92e70be2e6fd
 SHA512 
8d6dfdf661b0f7d0774cb9f61121f2daefd182ac8a2a0d24eab451febfbe1a664c815c163d34a7f3d15a54915a8e22e6c6cd10e89cb7d7598d48d81ad6a3c256
 DIST pathsearch-0.2.0.crate 3463 BLAKE2B 
6e1ce6e06e12249be3e03096aea7adbe27ad1b34a1f8921da9b287cd5a64d092dd8347fa582da05f069191e1c370d28ebbf875be7d44f5e544f1be8da75c1de0
 SHA512 
22b0da34d88d264cd920959202053fcb9384160d7ac241c2bfa27386fe5827889a0daca06b8883fb0d6ea38caffe5192f482c1521b4002d09d8e719a3ce4574f
 DIST phf-0.11.1.crate 17232 BLAKE2B 
ca7932652a154bdff90b0260439c74da70e5c01c69f8ce2f0f88fb95247236f3a9d9e509f5deb36b4c3e9c23294bcc30ad415f4be5cf6e36bd09c31b961eda24
 SHA512 
d4b020ad259889828cf224a1d70fe0f78498c4d40c375a1c437a60d9c9a1a9c623737da54d197c358e0557e6f0c5a35a9d64198df90dc104d11f5eb7a17315a6
 DIST phf_codegen-0.11.1.crate 9426 BLAKE2B 
16d929e0eb57f4c39eb8f2e761e5716238ac09240842db4aec29948d8afc8a3ebef916734aaf38a996c6c4903acad3cc94e81ba2184c50eca0718c9426cac084
 SHA512 
c89800b55e18053d01c9883993e8a79fc0a0e92e9393bcd3f5d8a74528ba0a9539b56a27a837d977f2607d49a8ab1981fda8c161b5bc5c54f58b67cad945f782
@@ -135,9 +148,11 @@ DIST proc-macro-hack-0.5.20+deprecated.crate 15045 BLAKE2B 
fb7b9fa57ad64f2920e80
 DIST proc-macro2-0.4.30.crate 34731 BLAKE2B 
0a27a06151b54e4ba50f08803a5de44d9c7702ed72cab1b775408696057246e3336dee3a61560886cb24fc4cf582339c8bde7d9211e4e0524f2c719b774339be
 SHA512 
73a8de3f1d76a8baf2d45afc1497bba8c0cbf231bf9b6750b9cee2473f492d5f3957ac149998da720acc8287c96d604971b51dcdfa629523bbdd97c297856ac0
 DIST proc-macro2-1.0.50.crate 41667 BLAKE2B 
6ee76c87013226881a0cb1221f449b052feaf1b92fa6f7a3aa82420ee1881713b8bb71ac6cebff67fad436f5c05b2a8f601a84ba361bc08a06b0b26aec0e11e7
 SHA512 
89ddaf9b994026519e5ddd618ffdca1fb39d31904a13229c1496dc862e2a259086ed9554821ff33f73adf6df45f446231217fa7e22922289fe6fbd71e06ddd2b
 DIST proc-macro2-1.0.56.crate 44454 BLAKE2B 
b2a1f28979245a784a4b3a0af8cb04bd01ef3e7aba32c45122fc05a6cceddb1b7303890827f1a2cb99b0b2ae013cd772bffd6e94ea226f0030cde867d6c22aad
 SHA512 
511fd8332eca47ed834736d405e18d53d83642cf528bebb8fd67fa5561e19b0a43c359b3e8020ecd28f9fafdb065c484ca360abc0287a0f97e94d4f779145f03
+DIST proc-macro2-1.0.60.crate 44160 BLAKE2B 
3cca40d5ffa85607212ea8da63995b35b1d59bf077ad1f708bb08f20a3f3d477e934205008984bf2e947e6e53689192df1d437772c75148e122e0f1f4fe43455
 SHA512 
2a3d33d2e42e3b7edac7a099dcaf83c43ad47852217424c2bcf8ed5b894292975ef5a11df01ebb3479971e94d5b032b9d043c28bed476d6f7087fb9297fbaac0
 DIST quote-0.6.13.crate 17475 BLAKE2B 
985287f3e619c46b052e704c6da78565fe5d8e4f9a0d503aa0e8818f595fbef32a437d67228c35cd02d817ee3e19efc03e75239013a87a79553bb252f15c8ac5
 SHA512 
bafa9ba42ea6ff2d6df652384485c58327de6eaea2832423eedd8ef8b4aace673c23b70f1f22106515ac13d7f625cb8b1a5e8c4388c1701ea3cd86fb9ac3056e
 DIST quote-1.0.23.crate 28058 BLAKE2B 
81c483fa26b36b5c4dbe85b386a74f5bfeaa854a99c0d678374507613da916a60e3f5b14d4a4d295e1c9ef0413fa1f16447df8f19a9db8cb0485b7a5c327fdc1
 SHA512 
3bce6846dda94d285de15771549099e60df39c8395c498b372c90a240f77df31d6d9048127913ec1c7ed8f3a189470ade1db2bede406bb00fa715ea641ec87c2
 DIST quote-1.0.26.crate 28397 BLAKE2B 
b468a5e9350843ea81e540d17c9fcb302b46fbd450e10280c5fff6fd7c98a439df8c3d3d47e551bc6d67ed02052b5b5c65d215d5ff8ee34f045747e75c1ba37e
 SHA512 
6fcfe4d31f601aa60beb858c25df217421b0a184d185eebc7a4cb9fbf97c687992b77bebd8671a9e6193716387c3e926fed9b75a08684eb2d9a5b155fbc321a5
+DIST quote-1.0.28.crate 28382 BLAKE2B 
9fb16c3bb2a7fec3d8138ffec1f58277061f4a643c9051e1f6525f9e347ed9de41a3797eb3140a6dd828526eb4114c1f7ca562151dc933f338d64b175ed35d9f
 SHA512 
846d718153f78cbae6dc714caa9413a5d5964bcc5e032f5c6c5356c62c33bf22635955ebdff0dede69ba1c9657387e65d61de7c537f6f56f8060721dfa52d735
 DIST rand-0.7.3.crate 112246 BLAKE2B 
ecc7c1bd70ac874c03bd8b7faa3016bb2d5ee5c19603280a12a45a81598f706e445971ee081e6ca410ab6f0f5f7a06d9315848cd556a2d8522a82024f6ff91e4
 SHA512 
f9b68ef9446f1ca2c8092c50990f15c1b4cb5529eeeac4df8d69755e0b7253c663c587775e7cb0a7298c31edb444975dda34926759306541f6d43d0d3cf57b7e
 DIST rand-0.8.5.crate 87113 BLAKE2B 
516f26bb2a969d0d79e957818133f35d2c0b4d9f1b401098ea23c5b80d27599e842b9298c0c5e46e2a6cb6953857bf8a9fb71ec9366c5ce6708cf17df14f179c
 SHA512 
8b33a8988906ba5e2057a9a84bdd11f867a5536c22f5056eec59ed4ec4e3a6da2fd773da4c0510d343762e5a4ea0f007db4c4a7cef87a47f90e36c1a84d86fb2
 DIST rand_chacha-0.2.2.crate 13267 BLAKE2B 
7908867ceac98243ade22e1b38f1903fe0249324484d91c948a5058a1e099e5213f325c5ba3400898c8319158ed69f4ed064164f235470856a8191bd990d5a10
 SHA512 
1e2117442e4ffdd834dcbf0ea1829e73202c0ff9041d5969d81a59330242145f2753f2a56de2fdbff65f26cf0d227c7d08b2094ab2f946b764aef88106a6ac84
@@ -149,6 +164,7 @@ DIST rayon-1.7.0.crate 169488 BLAKE2B 
518f0eda1fcbd1b1b230587ea18cab0023a699e796
 DIST rayon-core-1.10.1.crate 70008 BLAKE2B 
aa6dc470af3464ddd20f75faa5793bbc684d1550e44e0148134be7219dbded5dc7c1a1da96487ce9132330f26a587d9861b64be342566d6550cf3806a764d51b
 SHA512 
a9261aa4a648029f50bcca30bd991ef51353c258b9b8c98027efe9ff62e4b7be200e59bc7aa9144d9a3d39873b01bbe104c1d7875d61e02e089bb04e0312798f
 DIST rayon-core-1.11.0.crate 73118 BLAKE2B 
313d65bb6e3a010569b317b32ac91c72e38282f4fcddbcb56ffa97de42d88c0d34f35f76b62e1ad60ee96b596aa681caf2071a8d5dfdca085fb1fbafb07c3ee4
 SHA512 
00ac782f49d688da90e823980e83b5ccd858f93769e2d801061fdef78728cff37d3a9fa4fd47a5cddb058f28f3289de349f8c8fdd94fa2f8c400d73bc4529800
 DIST redox_syscall-0.2.16.crate 24012 BLAKE2B 
9497a52044458b1435ea16e86ee072e379b6b11ee31602ea72d6b6072a4a99426f409c2e58108a4e9c36dc193fa49c83951e71f4fd4e158eafff18c594dc01ad
 SHA512 
63b5d876baaf99f5cf737679bc6ac7a9e3d8a41aa93f5c59416ce7e3841e2513bff678773553cfe62fb452707f82acc384ea63aec932a31bf94679cd1caddd27
+DIST redox_syscall-0.3.5.crate 23404 BLAKE2B 
85aa4299d9816666bf576f523da5cdeae87b3c8fbb2af103e82258d23f73303c068a4b6c3ef4117ad67958cb31e41f836a9f59f2ce1bc52c23605e34399afcf1
 SHA512 
16f8f4766932bb54e4740cfdb4f0802f76246c0bf88c1d76c69c115949b124b625d8c3b85d8947073c2e9544f425aa16c10f71fabe3c03d29e424c47fe4ccdde
 DIST redox_users-0.4.3.crate 15353 BLAKE2B 
5e3b4e902566620cee8856c092cac193366ddcd2f5aef787b1d485353a0da11486ae1359dc60f3c87a198cb68f93ef99ac7551cc2315412b93b10ffb10540633
 SHA512 
0d3366e23cf93e1b0e025a29025eaebfcd1145bd158e2663b94fd952dc2d8a25566819e3a03c4136ca16a6408d37396e2ead0814c3f0c2bb10334dfd0b838fda
 DIST regex-1.7.1.crate 239648 BLAKE2B 
d68591ab0627f0bbcead8e81de2b9f6c7eb7be2d29b2c1700e06ffb541c073ecc054dfc76aba8f55ac0630b191d4136805bd04c7d1b9f6cbb1ca2437668ab244
 SHA512 
ee19bc6d24b981a151324ad4115488383227ec33dfba0225b35b6252f0d363b8d906db59a45170139c7a687fe681a983c2392d2921c7365db38c7c0e9745066f
 DIST regex-1.7.3.crate 239886 BLAKE2B 
8d9413178b626b09243e18a1c5e0336cd41e05659128d4026bd551df0c34b9e141e36c3134f3b22200b18828ef89082a08515047159afb4f4960e5fa840fd54b
 SHA512 
f7e8dbcfaa10c2443b9a6dfa514edf0e149d33f1a135e4a828adf97dbb0f1af5a4b58a2bad75ea8cbecb9641f499b30ed06b8ba60c7eaba79409ca18ede85e4f
@@ -166,12 +182,15 @@ DIST semver-1.0.17.crate 29685 BLAKE2B 
b9beb685eb9f6cffe557d1185997e1a93d0e50ecd
 DIST semver-parser-0.7.0.crate 10268 BLAKE2B 
e46b7cf9d292f8fc54561fca4df8534dc96f6be920a5c869c405ddb31b9d1a18eab0799207113cf4910a52cc0df5017ab1bc1883a7c3787ebf2d60f09ac0ab4f
 SHA512 
17320468ec6b9862d595f358d70c09ac6e09db7885fe0ead7a1e596f79350a6306e8bfde5bbd6512008a7c5454da1c7ae55fe1e3bc1c1ff02ac9df54c0a6121f
 DIST serde-1.0.152.crate 77091 BLAKE2B 
89c01ce359042ebe6b1b64ea710580886f965a98e1d6085c58a75269a9b43401e2cace080c4c93ee51982855fb7e2f09fdefe9bd237bbf30c5537f3a4258283b
 SHA512 
b47bd58fdc1a81d96cc0c9d14c8b19153b6689e893851975b1d7c7010c4448750e7fa09056dd4f13ed475a4aea2a3950952ff528832976919a6e78504a37bea7
 DIST serde-1.0.160.crate 77010 BLAKE2B 
45d2585bd7e5dcd368b72c29046bd595c577826da4aea6d019adaf07d23adc096db7aba952037dfdac9dbf08a1e92ababd44cc784ace557fe2cfe83beca446cf
 SHA512 
b03eb453ac01a483843829952462de4e8f6d0fa4a244d38a6f476a911e2e991a508121265befd108134ae7cce8a7a40c4d217f80f3e025f9a612a0bf80862306
+DIST serde-1.0.164.crate 77057 BLAKE2B 
a3c9c7deaa841a559ec901eed72a768e0718a77683897a84149dc8211f3e6f8f016e6b86e5b3c7c3c3d512486dd7fdda2860f69e7d9e600fff6ca6da8870bfd4
 SHA512 
17376fad0d3f0fc696d713c0eec81fc4a83992f6f9dfbed7c3e700e7ca8a3241abd46d4c11303d26a5fe049ddaf3308c2e76b650cc7350e03a1e34002700552a
 DIST serde_bytes-0.11.8.crate 11174 BLAKE2B 
d54b319a834a04c7064a7dfa063831da6c39e4f6fa3dc3388f387cebcf24a8b7b895e911cf4a19dc144250f52e74843a7daaaa9cb6fcae3496001f175e1eccc7
 SHA512 
68c77839d1bf2efb58ac43182225ba54c40dbf95b70183941887e7fc29d12789b115d3438a173db6d0e1f33cd65b6b45a351bc398bcefed6a2237ca6237a9ad3
 DIST serde_bytes-0.11.9.crate 10833 BLAKE2B 
cf429312342a13d0590271c4b3c5b841e5831ffcc5be76cf0dbbcc7e17fc6f1ebd5b701dd7a14c13cc1c40de5aa9aae1c6baab5f048378a213a37c2244df6ce0
 SHA512 
1b449758986aff89b931bfaff938ca5ca9ef01f37602afe1b0082627ae9cdff50ae57ef0320acf71a4d97543013861a9ed348caaae8f57c5cdfa2162ec8d3d00
 DIST serde_derive-1.0.152.crate 55586 BLAKE2B 
f133c6cdb87d435ea0c05144e685047fec22b93df7c61df4aa139358c2732326c98d0f62fda629da0f648aaacfc9d6f312813940238f45b359546dd435e7a516
 SHA512 
2f4dffb5671b4758f0b7dc0939f6b5cfe3b3ba02a53c62c75b5a0ec89d2db26bdd95f3e269d1fd4b07ec921bc0ca5f0741c26fdfcd25bd6532ac698c6c701e91
 DIST serde_derive-1.0.160.crate 55081 BLAKE2B 
851cbd173bd758d46c9f545f05a17f65f7b0a2cd353cc75a985072e3772ca6d8395b63208d845dfba231d7cb5fcee97ec0df0bd0df010096577d618fad8bffb0
 SHA512 
14b2a2ad7131efa7ec95d5a6e7633a9d1e991b046c0b00cce9c3681edd73cb53ff477aa52a430d8465aa8b362696244ea80f12ffbf0e6f98e35605fe4c60f407
+DIST serde_derive-1.0.164.crate 54789 BLAKE2B 
fb8e50cabecb66bfbb4eff07bbd034510ebc4eef5fa21c855887beb84d19b1201a4e9dc0f68a2aeabc559f2229a905cc44e780a7e6bdc55aaed399bde5dbe168
 SHA512 
08777ed5775ee6ea47daf084f4ee15869b3969d54e43e6820277535e79b70f61f6152decaeea29bca67137d354bad079393a6709fd10d7cfeb50728e46030c04
 DIST serde_json-1.0.91.crate 144654 BLAKE2B 
857f25cb43f8153ed4266fdc38b0a426ea04edd9e7954ceeab384729abb51ead1378a819eca6ced5cf20ed0cf237548b4c81ad507e3f4684aeb9bfd7e4958684
 SHA512 
b0bfa3d64fe9fb0d09ec8dcb6e41eba75ad0f0c4e34e0ffd5e2a3230057d7499a57ffda8c1615bea5195ef398afe414f3b0a143a39865123c1c5f976ea1a0337
 DIST serde_json-1.0.96.crate 144652 BLAKE2B 
2754e63479aa07507015dcb0f989d6447f5b2c01e5f02cf8a843d90c90c6fd0acd3ecb68d80d76c249efdabe0bd0670649a9e576269928d2276ba00a3153131d
 SHA512 
39779419900e1d395d81e70cff0e7a688564a66124b08e74da54ac30f389c912707f4bf5e29afab6fa106faf4bf4e0b841f42fef125cf7bec185482ff6bbba0e
+DIST serde_json-1.0.99.crate 145102 BLAKE2B 
c6911880feab10a782aebfbe06b1eb37f415cc362db41ee8f6b0353c3f909d3c92512197503da81c7b74e54cb7dae49fe62c53487b1981480269fd1e657e3088
 SHA512 
7636fbd4f1f12e0675a8b13d8af80f09a2dc6036f8d6eaccfe0593e2f2e7a36a2ea28fcbf36d396217a8f7995ba29c14a17e695d1c914866055c69768292b292
 DIST shared_child-1.0.0.crate 8939 BLAKE2B 
dd7aa5bc4f87cab26cd0cd382fa00f42ae45ab6944e3367e355d19fd1007ded068642a35941e0cecc100120bcb1ea7d07d91bc36227261e8207b87c53de87a17
 SHA512 
d0e16cc7253271e6468659db0d7344c2d75772dd3428f686c49ce34bfea6ba8fa010b1ba83375241bf019e77c842001c6e1ab5096af54af03586e05c3f8fc476
 DIST shared_library-0.1.9.crate 10566 BLAKE2B 
be5497dd6ed880d33f7b4d3721d3747794e29715fae352fdcc5d153cc9512da2c2f4b21804ce68077654eb3ce989dbd1fb688120516783dd78db7f48afc8ea0e
 SHA512 
8696f5d9ae976b04ac3f559ff1c4945c5554fc741bd9e62207a475a331f8c90fa8c2d583ac9cf96dd18fd543b65fc469aa76dad2f526c00c68182130d4396462
 DIST signal-hook-0.1.17.crate 27085 BLAKE2B 
0e58cb64b07cb8c76a043f603edbf27bcc92040a1aadb2d0c96993b1ea1a55ef63a222ec51e1396d95bb4907016e1dbf20ba3f0c1915303828f187af44ba2df4
 SHA512 
253d1478d7a6491a0b423637a706c941cc2a9707d32d29126f48af808daf8acd88e59013936f8e164df687c04e3a8f5c201b5eeb1952e3269b1419efdb4df94f
@@ -191,6 +210,7 @@ DIST syn-0.15.44.crate 184212 BLAKE2B 
b735040d69d10b30c94de2e8f776d25ff5ec427e79
 DIST syn-1.0.107.crate 237539 BLAKE2B 
5a65968806c72fedf69638661f827a0426b9e49c2f9a5e5208f986105f8facca2bdf241f92f74bde790e9a0dd68240d4827a345a939c087364360e19a5cbeff3
 SHA512 
58132adb76643521a6a9cbc0316431318ac25f8517bba3cbb98e7e28ed536f9e24f643e898fa21a2f74cc8c1aeafaecf9b4199b23048c7be8c0bab2fe3aa7623
 DIST syn-1.0.109.crate 237611 BLAKE2B 
e827445d00c79a8eeb91eacde472f1987addd6ce9e1df95d7abf6446a77ff4173a8006845f3ae71c1da47193cfb72e0ead9a6d6bad2573be12c17e90735d9ad9
 SHA512 
12816b9e8cf984024b2fbce9f0ae14cf94d4d2c06f08cc54fb793ce78770bb4cc1288eb7df0ba5e8e937756e1e8e295c53fe07a0c5dde1ea8ddba03b6203b37d
 DIST syn-2.0.15.crate 240785 BLAKE2B 
ee2a2250e7083770f8fcb5ac0b387a28bab041e56dc9a835bdc366d39830cbd464aec156b47947331864220d78856f74e94c24061bd0c4fc908584efd355bce6
 SHA512 
19520d13b417ad2cabaf7e31f45271d41f26158607d0ab21e76a04e824133c64f4acba0f8c044c675028832563ed7cc73fd88d519520ef3834008dbb3d04663b
+DIST syn-2.0.20.crate 241198 BLAKE2B 
c7ed95aa079577ed8630fa8ee1d8b87c825f6987224f898297af5eb34f4b1037181ccfb74c111598081ba1747070c741fa28f9ff5338139dc378032aba828c39
 SHA512 
ef73db46cfad2bdd8d3a28f3c28be8111deb3acc30cf49eaabba47f6d4102755a57c7fd10a8d698d4e78e4893cda35e0e209f8716f6912e977f28c868c5d7a2f
 DIST sysinfo-0.26.9.crate 137194 BLAKE2B 
854af1c7b7f197c68d772cf4d665c3773511f8e32bacec27dbd81bb1c4a96f7c4c0de6c4707975bedb09e320e3e6d115e043f5b3bc4fa2a5cf037b48e6c41961
 SHA512 
899fca372fd82d1ee694181f334bb0f80c36f3dc7dba3fe88f0aa019eea8d4886dc16ac8701eab5e6a68156ade9c1302d7b390ac68173e1c68daf3f34b5b50e8
 DIST tabular-0.2.0.crate 16693 BLAKE2B 
cd34be5602091dd04db71ae72ceb5d6f1c9d6bd203e3ceac04225fd6f81e3097932fd9b26519b809a18e17106da52832ded7ea4e473b5ed526f111feb8a76333
 SHA512 
71fbf887f37b1c901e06354fc3c8303b85cd7c2fea713f98e96253e98ee422a795e1caff79e8b31fd50283ee030604203913fef69409a957f4cc8f2cc7758edb
 DIST termcolor-1.2.0.crate 17917 BLAKE2B 
5ca7802b0bd29495bcd2deaddcdb4c3ff964073a373eaf39964a24ed91a48c5c33e192d676099e2837064df3149fdd73aba7d241e9aeaad9887bf1bcae9d38f0
 SHA512 
cf1896523353390b2f90b2a8bf30f47da5fc7c2daa635bd0cd8059bdc73feb243e46e4279562fe45d5726f2840833b1e967c7de19ffc0c853592d9f86c0c1be7
@@ -206,14 +226,18 @@ DIST time-0.1.45.crate 28911 BLAKE2B 
d43e2431752881f6885d572017f461b304d07ee5ef0
 DIST tiny-keccak-2.0.2.crate 20129 BLAKE2B 
105a2d2af36cc053cd95721ea563108f33b8a3feb2ae84c75a04a65ed5d548dfe35d8b2e48977a82f725c0ebcf914f21157c547f4a74bb4d98c2e894385139be
 SHA512 
c0219f23361eb07e0a68575c461a36b7286d9bdebae89080d9e259178d402b0c7762ccf33e65a16951ea168392322c44a24eb55189cf143e22d09d6dfc4acec1
 DIST tokio-1.24.2.crate 625576 BLAKE2B 
fd83b7561140a69f359ef9cc3de62839962643bd7f62ba6ea0dd3105da06568791336fe1415e793ef8a0ff866f322b0580db807bf42ea433dabd81b435c38d9d
 SHA512 
ce84c4f6dd3504e834bcdd7e49ffe4cb5f08999b874cc6f86472450cbc5e1b085a667319f745157af535f4fc1ed43c7c14c20da9062df93eda2e2fec85b521e5
 DIST tokio-1.27.0.crate 653991 BLAKE2B 
c474285ae456eedd001d13ba6d1a9cc16c581dd692ed96c98797c11314a402861f43a9fa5fa24d47a4ff3371dd609f774a1d03a4272cda48a07d227dcdf0bf12
 SHA512 
d7c36e07348a5067678bbd7729c59e81ca71ef6d9581e5cefb122041b1a3f693f77ebad79382cf4dc8e38fde5cf731cdabb02adf55f297fb7b4907cd42775b09
+DIST tokio-1.28.2.crate 660565 BLAKE2B 
cd0ef19422856248ec9a8c6a70fabb300064377fb3a7dc73c36b46a18941ffab10627422bf0a17a40952696f5ba179af51b39855d06807fb749c192eccf82fd6
 SHA512 
434a74d93e5069b0081538289478a1fa7929f3fef9f7db01105df5be57aa30bfb7cb234be2a087028e3ac6da350eb564d70544cd004f2a1a3857b725f5734d03
 DIST tokio-macros-1.8.2.crate 10071 BLAKE2B 
c35e8043195b61bdf3e863f2224c41e3fc5ae0b32b02e53c2bebd36ad9f486e573cdd0e15b7a49e640696edc050e0d8dbfb5b33f1d12887a8ce418edb80abc53
 SHA512 
753888eed2d7a39e616851918b707c7634d30a54d8d276414b17ce310a2a6fa586bdce4f29b4fbc23f175654caeaa4b0589e571e2a346d99e948297a80f24994
 DIST tokio-macros-2.0.0.crate 10382 BLAKE2B 
0201cc5c3a34568ded2439f54b21e6040b7ae380a55922ff65562e741ea2a30904367db2bb12eb3d8884044ef6417ff1544fb6b67763d1074bc68db6dcca48af
 SHA512 
db3abe409c28f8502b6ad49bdef5570b6b9bdaf5c5ab7967d02acddefe8043b162648b65751854c651f5b3167d8201354dc2f3d0137116a0aaa275a0e387060c
+DIST tokio-macros-2.1.0.crate 11472 BLAKE2B 
ae03d8812bc2b8f833e0ca77f1df8edeb8e0476c06f8f5104fa632ce77369ec54a80ff3da86439192971bf2e11147eade3765c447d76238b768732702004db95
 SHA512 
e2a24c1befd512d68b5d8b26a3f1d940dd10bfe0979b5d61a71052478d9fd19b28eb7bcbeaca4cf3c9736fd3da0386c899e3a619f47c2d9f7e6b497140586b9d
 DIST tokio-util-0.6.10.crate 71140 BLAKE2B 
54dae89f8c3886feeccb905d371d9c3f1411fecc398eeb388677e364583fa42ecaa3ea21f10ad76e1873eb91da017ad19ab56befcca81d4e89ebc1253a9bf029
 SHA512 
0fbf96817b32fe561b26793e599377e9b58c28513e48d0ac070e81f64c0c64fb4d41a626f27b841e88970e8beb75fc2e94a8e9564e63416719756a9d845d8bc1
 DIST toml-0.5.11.crate 54910 BLAKE2B 
9ecd5103b33ab47d4be23c897c7095ca381cb79bedcaac4918cddc36fc7cf5d34ab664da52c2273d935f04486e9325241d6b66785d50aac78453c219aab49e1e
 SHA512 
eddb82aeb8fdeb5436579292c6f7a64a90a2c7bb54070beb437bc7890b99795d0505faa8d6451a99e8bcf440f78db8a1b273a697c8ad44275cc4163a9ee49317
 DIST tracing-0.1.37.crate 73888 BLAKE2B 
60c74379bf84d7b152f0b4d5b4d4669a1227dce0f3b5c10210338193853ca332de7eed3cc3b6160ee3719da7fdfe565665a887f2f82fb1e1c716c421048a2e87
 SHA512 
2116045f51b35e90fc933cc136d045d09c0aaa33400a9056051d887fea2d2982b394830e4d4c3bcb4b831e62b9c19f6c751c2d216169f663aa18c4067aed7d75
 DIST tracing-core-0.1.30.crate 60351 BLAKE2B 
eadd1ad68830f4fa9972d207fac3b5be6b0f6d3d2ee4299f2fcd6d03313db6850ae0bb278ae618615e0bc2cd83ffbde0928857fe8e01dd9591a9e80114e0ff88
 SHA512 
9a14edf6338eff6636473f4ea844dfe337e434c14f40e7b9af6d7e6cf25f745f37bbe372bc63c01043667bea2f5b248b8afa8d6aae4cac3dc5193e3383ef1c65
+DIST tracing-core-0.1.31.crate 61263 BLAKE2B 
feec046ddd3e04995bfe24defd6ae1187fd7ad78d80d69031178f67ed534e9aa6ab6aaea92dad509f57e220df5f6f025ab8f96bbc957834126f53dcad36580c3
 SHA512 
66fcd0b4f32de3816b1dcbeda1af26fae0a79d088894637984dc6a0ca65b609f5f166cea376601f6a75f8e3a281da6d4450dc796aa0a7177ad615330237e2bed
 DIST unicode-ident-1.0.6.crate 42158 BLAKE2B 
6e4ef61fcac69b4ccbf743a2c2f857a6ea9fcbac9b9890f5b7208cc0732c6892aa5889b3030e87c8c29ce4ce24ddb7adec6bcf47b7aefe9cb5d19f920f12cfbd
 SHA512 
ee1dc78fe535f46bdaf3e19dd8dfc859bf3133d9271026cadf626a07ba586c39caca4e45d905156a6276cf852f9cebef196b2229c3ba4b5e2b26c956fd6cff86
 DIST unicode-ident-1.0.8.crate 41962 BLAKE2B 
3e3394a421460b0cdd56f96e1149b3816651ffd7064f9ec85c12050917d0b271eeee4bc3f6d3f0a3c1596635df3dac54bd610243d34e459743fe29b3b931a237
 SHA512 
8104999c6fff002c5aa109e2ca75ce3eaf772155d31dff87bcf39e3eb3da58b6cb543717be7b55acdb0cb1a4bd2a3d2e9c9974f7f75b6528668f5ef665ef4088
+DIST unicode-ident-1.0.9.crate 41978 BLAKE2B 
4e78cefb4e7d7f173f1826a5ab6c8ffde386fea67cf3227bd22e6a6e65d3348dc53c9438e6bde9af06fb5e04b0beac866209d2426e7f04cd10b2435db85df7e3
 SHA512 
4d8cffe699c6f15ee82ab5f5a73421a6bb8b1a476237aefefa6e932c45c30683a4fb015f138bce99d7cb27a27fb7972909c828e77daef091da84ec162315625a
 DIST unicode-segmentation-1.10.0.crate 93893 BLAKE2B 
f0604ca03586726b878f7884a639554037816ae01965fbb97b4998fbbd12e614f2af50065a59c834448413418a56b198b016e685ef9509513e8994a5c063da40
 SHA512 
e6a1baacb557a5a7ed7ff780c542c5947eb473763eb2a6018cb1e0a1abb9f4bf3f8073610e4897393f15df076f6657a0f162a5c5bb7ed5f3b3fd832e533a522c
 DIST unicode-segmentation-1.10.1.crate 98416 BLAKE2B 
4c391ad34c5f8a00096ce89793b15212555f2d8a367f3ae78f26a36c5897b69f3efcd280a1bd3eb3f61c87b8a26061804b1cd56e1c1500cbcd62e8bc74520014
 SHA512 
e96224bba73fe9a167bbf226bb13fe5bea085765a90f7232cb20b42f3c584242b7291aeba1eb8edbe2ae40e5bee2f4714f434324f79316b22e8437c77a50e86b
 DIST unicode-width-0.1.10.crate 18968 BLAKE2B 
6174e307fd3ee290d0a5d1d31233baaa5315cdb73f19b8580718e9f9eb04cfd3aeaeb474af1e50c4b9fecc6fc777937dedc527c9dc9ed14ccf42af099e591f31
 SHA512 
9836a8d489d18ea1ecfe1957ed6d5da7dce825e138cd1848aef093fa8d2eb83fcf01eabb1a2446df4f5ede4e67316e9e81b5d58b59d4e8c5d67870e8fa5dca3b
@@ -240,6 +264,7 @@ DIST wasm-bindgen-shared-0.2.83.crate 7194 BLAKE2B 
4dd1cffea1edc98dcd4993bf6fdde
 DIST wasm-bindgen-shared-0.2.84.crate 7219 BLAKE2B 
4910158ed884dd9dbb32b1539b0c89a583f98df05cb29654487a26db063c973d44cb086dad4b466f9bc63104e3d4da72fe9feed32618f8243151dfb9ccfaff29
 SHA512 
fc4bf134a33c71852b91d09fbf1e1801e2b97b5c2756e2680d0c1f8701da30b22b56777d8e806e13602beb040775824966e378f7b9805e131a385e7816ddd010
 DIST watchman-2023.02.06.00.tar.gz 3811103 BLAKE2B 
9a7ef8b809855bd08bf7a75441a6399ed4fd852e40f749391d4f1377ad095e7f2d58800e9c44f058723751fa51fdd8ff88122276d1af6d3128344cd48457eba7
 SHA512 
4d7b4835130bf343f596730f0ec4fef30a9c0a521c9c35c06a80f652c26486dfbc8fef405fd0cc2586965b20c75c260383971da19d148173801d39c51a6d42ee
 DIST watchman-2023.05.22.00.tar.gz 3963980 BLAKE2B 
08b6cb1e6d47fc7e29a119184b2fb9284802dcd56133bcecdc225a31acb207b82dfa86f12370eb5d804ce51a6ebbbc873a5ce9096bee4ea4a3386315ee97235a
 SHA512 
3ac9ac5c864667e217b32b078ba44be097e5ab0ba63bc88a23b9c1b9bb8637d2ccd08f1a314ee974ebdcde04f6ab1ac847657c9386e36a30ab99af9694be36cc
+DIST watchman-2023.06.19.00.tar.gz 3966589 BLAKE2B 
69e4545e1c6e288bff2ac37af27c4066bc677cdfc64e09feecd466d5225619320c4c371498cf81f29a51442c5acf737bf288a066fd837ebe27c43ba0ca74c9af
 SHA512 
0a4fa3883d6a5418b63641d344b43df2516532371e1ef9c3cc6e6395948a6cd9702475fd20adb68aff3f47f6f4355d5acaf11a4515f0fae57495010948612738
 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
 DIST winapi-util-0.1.5.crate 10164 BLAKE2B 
fc800aceae5249a858c806c3e969ef2545766099872d856ebee51c883d9acf1122278db9607d50ca53eac351502b700fd2463900932d342240f97f683d517963
 SHA512 
7baeb661f397c4693dfa001fdc774b323c51a7c55caad40f2de5112a1cefd1d6151e3df41fa4ee193460a5905917c83d2b1de5fa10b4bd014ad96690af95c0fd
@@ -247,6 +272,7 @@ DIST winapi-x86_64-pc-windows-gnu-0.4.0.crate 2947998 
BLAKE2B 2ad1ea8b5fa07d544e
 DIST windows-0.48.0.crate 11864177 BLAKE2B 
39c0e4f058f68a829ee08721818a0b04287af20dfe6e03a125b75566b4c8a58b56557d685600f1f9c215811154f9782f12368d42848445d54dcf9bfd6471349d
 SHA512 
7c906f885fa0a730f1cb1ef4e62f5b602a49d44343febe1d38fcd4cbc28e0342766983796042585fe457aa229333558715b6270e378946faa8f398a7ecc2af8c
 DIST windows-sys-0.42.0.crate 3006791 BLAKE2B 
7a0962364ecc416cf0ae7e49cce1298a12d819003e488f6e77aff1a52710f00378638b6a05db5557a031e1b75659587657971ddc63eaab35495133762f99a7b2
 SHA512 
b07b119688f3e3ad234d36979947f34e8e19988fb62101afbe18ec8afc9c8a4261128939df8bbb849d5c5982422cb4c50dbcba70f2bf401fbb7c605df1b2b354
 DIST windows-sys-0.45.0.crate 2568659 BLAKE2B 
6f2d634d121a9bf41e2887e277a73f33aee69b04c7fcfc6ff973d21902787997f1e186f530e9226cddc003ffc3f85a179c069c8a8688de459f617df92d33f94f
 SHA512 
f239346c0141b95aa76e0771e2f4e38b9a592f3cd92c6001de353637cd65cd73b94cbf9917a4eaa9b0c0b2e6e2af920b9cf6b3fccb52770df5160254cffc1c47
+DIST windows-sys-0.48.0.crate 2628884 BLAKE2B 
551e900de4f67187ef034b60df9fd0e0d8f82a3100ef28e1eabd543ac129d882dc86ffcc1714071aba09e4cb2ae2d2f07ace1a32b99fd989ce525cf05991edab
 SHA512 
bdf534bcf3face31e9ebe11427a911a53f89f4ff5eaea8cccd094e139bfe14b2aec602b1cab1df774794d999477439d9adc6b627a8e33c20334fc348ba2c47ed
 DIST windows-targets-0.42.2.crate 5492 BLAKE2B 
42fc4a7d3e287fe2a70637e890304b49737776596f4a94a6d216668247092135e84322bd04caddd19c83b7700b0f27278e600ce8ed326957fabc21bffcae89b0
 SHA512 
84fbaffcad9a80beca77506aac26d0c5cb75aa0f21a5a70bcd3f6a16e71e8753ae00d3b89da9262c99756624163dcc0d6074fa9f99dfaae0dc098018209025f9
 DIST windows-targets-0.48.0.crate 7466 BLAKE2B 
4ef6d89ad5b1acf26a1a24348122b86d3943bd95935499bc9032fbc7aa01c04999c723df7fecb4989854cb6b7cceffe141537dfb05a9eaf3902c4cb490533116
 SHA512 
1d2a29602a1e0846c8577ec9167c5f9972091998a5df449d67b13ad918bf37680e7f97247baf5e3010c166d0b3182418c2925470998b92893ee9469939b91e22
 DIST windows_aarch64_gnullvm-0.42.1.crate 362795 BLAKE2B 
722b45789bcd1d973803b327d44072fbf9c904d448e29ae9e56d2f9d1a3e9b64e06883e4bf5ebf141f1e924235858fd1472e07a744cc5b16a0a3a4fc8ec8f6d4
 SHA512 
51eb9fa7ea441a9fef590c12576a8bbef74932d40fafde8f9e3a28f2734ce5aee6dd5fa478fb3847443241c8c392bb4abbc6014c71260bf924431779f7184f73

diff --git 
a/dev-util/watchman/files/watchman-2023.06.19.00-rust-1.70-avoidance.patch 
b/dev-util/watchman/files/watchman-2023.06.19.00-rust-1.70-avoidance.patch
new file mode 100644
index 000000000000..78c6d139e483
--- /dev/null
+++ b/dev-util/watchman/files/watchman-2023.06.19.00-rust-1.70-avoidance.patch
@@ -0,0 +1,50 @@
+From 625967e8d00a3564ce5c6634b84b0e3b89aa6f4e Mon Sep 17 00:00:00 2001
+From: Sam James <s...@gentoo.org>
+Date: Sat, 24 Jun 2023 07:26:10 +0100
+Subject: [PATCH] Revert "Replace remaining atty usages with stdlib"
+
+This reverts commit 39290c123d1606e520bbaa1f92737fea010ec278.
+
+This requires Rust 1.70 which is currently masked in Gentoo because
+of a bug involving strip.
+--- a/watchman/cli/Cargo.toml
++++ b/watchman/cli/Cargo.toml
+@@ -9,6 +9,7 @@ edition = "2021"
+ [dependencies]
+ ahash = "0.8"
+ anyhow = "1.0.65"
++atty = "0.2"
+ duct = "0.13.6"
+ jwalk = "0.6"
+ serde = { version = "1.0.136", features = ["derive", "rc"] }
+--- a/watchman/cli/src/rage/stream.rs
++++ b/watchman/cli/src/rage/stream.rs
+@@ -6,7 +6,6 @@
+  */
+ 
+ use std::io;
+-use std::io::IsTerminal;
+ use std::io::Stdout;
+ use std::io::Write;
+ 
+@@ -59,7 +58,7 @@ impl Stream {
+     }
+ 
+     pub fn new(hostname: Option<String>) -> Self {
+-        if !std::io::stdout().is_terminal() {
++        if atty::isnt(atty::Stream::Stdout) {
+             Self::new_stdout()
+         } else if let Ok(reporter) = FbReporter::new(hostname) {
+             Self::Child(reporter)
+@@ -73,7 +72,7 @@ impl Stream {
+         if let Self::Child(_) = self {
+             true
+         } else {
+-            !std::io::stdout().is_terminal()
++            atty::isnt(atty::Stream::Stdout)
+         }
+     }
+ 
+-- 
+2.41.0
+

diff --git a/dev-util/watchman/watchman-2023.06.19.00.ebuild 
b/dev-util/watchman/watchman-2023.06.19.00.ebuild
new file mode 100644
index 000000000000..13634496c9ad
--- /dev/null
+++ b/dev-util/watchman/watchman-2023.06.19.00.ebuild
@@ -0,0 +1,244 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# These must be bumped together:
+# dev-cpp/edencommon
+# dev-cpp/folly
+# dev-util/watchman
+
+# TODO: Split into different variables then combine for each component?
+# Not all is in rust/ dir.
+# Rust components:
+# - thirdparty/deelevate_binding/Cargo.toml
+# - rust/watchman_client/Cargo.toml
+# - rust/serde_bser/Cargo.toml
+# - cli/Cargo.toml
+CRATES="
+       ahash@0.8.3
+       ansi_term@0.12.1
+       anyhow@1.0.71
+       atty@0.2.14
+       autocfg@1.1.0
+       bitflags@1.3.2
+       byteorder@1.4.3
+       bytes@1.4.0
+       cfg-if@1.0.0
+       clap@2.34.0
+       core-foundation-sys@0.8.4
+       crossbeam-channel@0.5.8
+       crossbeam-deque@0.8.3
+       crossbeam-epoch@0.9.15
+       crossbeam-queue@0.3.8
+       crossbeam-utils@0.8.16
+       crossbeam@0.8.2
+       duct@0.13.6
+       either@1.8.1
+       futures-channel@0.3.28
+       futures-core@0.3.28
+       futures-executor@0.3.28
+       futures-io@0.3.28
+       futures-macro@0.3.28
+       futures-sink@0.3.28
+       futures-task@0.3.28
+       futures-util@0.3.28
+       futures@0.1.31
+       futures@0.3.28
+       getrandom@0.2.10
+       heck@0.3.3
+       hermit-abi@0.1.19
+       hermit-abi@0.2.6
+       itoa@1.0.6
+       jwalk@0.6.2
+       lazy_static@1.4.0
+       libc@0.2.146
+       lock_api@0.4.10
+       log@0.4.19
+       maplit@1.0.2
+       memchr@2.5.0
+       memoffset@0.6.5
+       memoffset@0.9.0
+       mio@0.8.8
+       nix@0.25.1
+       ntapi@0.4.1
+       num_cpus@1.15.0
+       once_cell@1.18.0
+       os_pipe@1.1.4
+       parking_lot@0.12.1
+       parking_lot_core@0.9.8
+       pin-project-lite@0.2.9
+       pin-utils@0.1.0
+       proc-macro-error-attr@1.0.4
+       proc-macro-error@1.0.4
+       proc-macro2@1.0.60
+       quote@1.0.28
+       rayon-core@1.11.0
+       rayon@1.7.0
+       redox_syscall@0.3.5
+       ryu@1.0.13
+       scopeguard@1.1.0
+       serde@1.0.164
+       serde_bytes@0.11.9
+       serde_derive@1.0.164
+       serde_json@1.0.99
+       shared_child@1.0.0
+       signal-hook-registry@1.4.1
+       slab@0.4.8
+       smallvec@1.10.0
+       socket2@0.4.9
+       strsim@0.8.0
+       structopt-derive@0.4.18
+       structopt@0.3.26
+       syn@1.0.109
+       syn@2.0.20
+       sysinfo@0.26.9
+       tabular@0.2.0
+       textwrap@0.11.0
+       thiserror-impl@1.0.40
+       thiserror@1.0.40
+       tokio-macros@2.1.0
+       tokio-util@0.6.10
+       tokio@1.28.2
+       tracing-core@0.1.31
+       tracing@0.1.37
+       unicode-ident@1.0.9
+       unicode-segmentation@1.10.1
+       unicode-width@0.1.10
+       vec_map@0.8.2
+       version_check@0.9.4
+       wasi@0.11.0+wasi-snapshot-preview1
+       winapi-i686-pc-windows-gnu@0.4.0
+       winapi-x86_64-pc-windows-gnu@0.4.0
+       winapi@0.3.9
+       windows-sys@0.48.0
+       windows-targets@0.48.0
+       windows_aarch64_gnullvm@0.48.0
+       windows_aarch64_msvc@0.48.0
+       windows_i686_gnu@0.48.0
+       windows_i686_msvc@0.48.0
+       windows_x86_64_gnu@0.48.0
+       windows_x86_64_gnullvm@0.48.0
+       windows_x86_64_msvc@0.48.0
+"
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{10..11} )
+inherit cargo cmake distutils-r1 tmpfiles
+
+DESCRIPTION="A file watching service"
+HOMEPAGE="https://facebook.github.io/watchman/";
+SRC_URI="https://github.com/facebook/watchman/archive/refs/tags/v${PV}.tar.gz 
-> ${P}.tar.gz"
+SRC_URI+=" ${CARGO_CRATE_URIS}"
+
+LICENSE="Apache-2.0"
+# Dependent crate licenses
+LICENSE+="
+       MIT Unicode-DFS-2016
+       || ( Apache-2.0 Boost-1.0 )
+"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="llvm-libunwind python"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+# See https://github.com/facebook/watchman/blob/main/CMakeLists.txt#L342 for 
libevent
+RDEPEND="
+       dev-libs/libevent:=
+       dev-libs/libpcre2
+       ~dev-cpp/edencommon-${PV}:=
+       ~dev-cpp/folly-${PV}:=
+       dev-cpp/glog:=
+       >=dev-libs/libfmt-8.1.1-r1:=
+       dev-libs/openssl:=
+       llvm-libunwind? ( sys-libs/llvm-libunwind:= )
+       !llvm-libunwind? ( sys-libs/libunwind:= )
+       python? ( ${PYTHON_DEPS} )
+"
+# TODO: Make gtest test-only (needs a fair bit of patching)
+DEPEND="
+       ${RDEPEND}
+       dev-cpp/gtest
+"
+
+PATCHES=(
+       "${FILESDIR}"/${PN}-2023.01.16.00-python-working-dir.patch
+       "${FILESDIR}"/${PN}-2022.02.28.00-libatomic.patch
+       "${FILESDIR}"/${PN}-2022.08.08.00-musl-fsword-fix.patch
+       "${FILESDIR}"/${PN}-2023.06.19.00-rust-1.70-avoidance.patch
+)
+
+# Rust utility
+QA_FLAGS_IGNORED="usr/bin/watchmanctl"
+
+distutils_enable_tests unittest
+
+src_prepare() {
+       # Avoid cargo_src_prepare
+       cmake_src_prepare
+}
+
+src_configure() {
+       # 
https://github.com/facebook/watchman/blob/789678cf9855fb07b402afb75b01e4f8786deba2/build/fbcode_builder/CMake/RustStaticLibrary.cmake#L17
+       export RUST_VENDORED_CRATES_DIR="${ECARGO_VENDOR}"
+       export RUST_CARGO_HOME="${ECARGO_HOME}"
+       export CARGO_HOME="${ECARGO_HOME}"
+       # Build system already handles avoiding 
Rust-jobs-while-CMake-jobs-spawned issue
+       # 
https://github.com/facebook/watchman/blob/789678cf9855fb07b402afb75b01e4f8786deba2/build/fbcode_builder/CMake/RustStaticLibrary.cmake#L69
+       # so no need to force -j1 via cargo jobs
+
+       local mycmakeargs=(
+               # Rust wrangling
+               -DUSE_CARGO_VENDOR=ON
+               -DGENERATE_CARGO_VENDOR_CONFIG=OFF
+               -DRUST_CARGO_HOME="${RUST_CARGO_HOME}"
+
+               # General bits
+               -DWATCHMAN_STATE_DIR="${EPREFIX}"/run/watchman
+               -DWATCHMAN_VERSION_OVERRIDE=${PV}
+
+               # Fails to build against fbthrift for now in libatomic troubles
+               -DENABLE_EDEN_SUPPORT=OFF
+
+               # We handle this ourselves
+               -DCMAKE_DISABLE_FIND_PACKAGE_Python3=ON
+       )
+
+       cmake_src_configure
+}
+
+src_compile() {
+       cmake_src_compile
+
+       if use python ; then
+               pushd watchman/python >/dev/null || die
+               distutils-r1_src_compile
+               popd >/dev/null || die
+       fi
+}
+
+src_test() {
+       cmake_src_test
+
+       if use python ; then
+               pushd watchman/python >/dev/null || die
+               distutils-r1_src_test
+               popd >/dev/null || die
+       fi
+}
+
+src_install() {
+       cmake_src_install
+
+       newtmpfiles "${FILESDIR}"/watchman.tmpfiles watchman.conf
+
+       if use python ; then
+               pushd watchman/python >/dev/null || die
+               distutils-r1_src_install
+               popd >/dev/null || die
+       fi
+}
+
+pkg_postinst() {
+       tmpfiles_process watchman.conf
+}

Reply via email to