sci-libs/pytorch: add PyTorch 1.10

Signed-off-by: Miezhiko <Miezhiko@gmail.com>
Signed-off-by: Andrew Ammerlaan <andrewammerlaan@gentoo.org>

3 files changed, 351 insertions, 0 deletions

diff --git a/sci-libs/pytorch/Manifest b/sci-libs/pytorch/Manifest
index 65e5fc7a8..add8ab40c 100644
--- a/sci-libs/pytorch/Manifest
+++ b/sci-libs/pytorch/Manifest
@@ -17,11 +17,13 @@ DIST XNNPACK-1b354636.tar.gz 1353346 BLAKE2B ce286e1a1f14aa195baffa48ef8c21c4ae0
 DIST XNNPACK-1b354636b.tar.gz 1353346 BLAKE2B ce286e1a1f14aa195baffa48ef8c21c4ae0ec85ae89169a429fc06077e34f28302930e081cf464dbe78252bb065a247b65b61d8aa3872375043176d150f97651 SHA512 9e7528334a8e3df18a54fce44a122fb6d989a946bb456b01f81772f160bd6532fad460e787c976bbdd76ebaa78cd1c64329ffeb498c5d27e1cd53195bb8a9db4
 DIST XNNPACK-79cd5f9e18ad0925ac9a050b00ea5a36230072db.tar.gz 3955905 BLAKE2B d787d4a965c53c8d65887f3b111da950f3b5558cd28ce468764c5bf8efbaddeea567803cfcd89a1aab4a0bc781816871dcca2901e762257aaf96a1d8f868ffd2 SHA512 72c3e53b00d77cfd94db93c60276ca7fd419554dadddf74286e85e0500dbdad0bf65694e451e832de89ea17e7731a9ec9e9f1d831b03c1b81946e0dacb96197d
 DIST asmjit-9057aa30.tar.gz 534633 BLAKE2B faec98981c67110294e4135a9cb7f47b038d44a02483728a4c79c7094da62b8a6a1c805eba69f1258a99b24b699823f02516c50d166a96eb5ff65227406f402e SHA512 678e5ce4a8d96961be4c10aac67d43aa8949ff022dce855a92cf6d626738be8667668c48953d43b6ef21ad7c5f913d07f7f692ad719870700aa97deb80662baf
+DIST asmjit-d0d14ac774977d0060a351f66e35cb57ba0bf59c.tar.gz 717277 BLAKE2B 1e743a3293f780aadd413efe896d75851dfde03a60604f09f2230a6bb3923e57a12a5b124531dddb8ca3d226b4abf7c3906c007da47e9326250a5864d5241f9d SHA512 2822763fcb3c18f6699119c1773404667d81f8afb86f8f2e8dbe627526a2877b049d16505557e680e4e310f0e0667263dc4ac442f682e95f2568bf0bf8b61b4b
 DIST benchmark-505be96a.tar.gz 129647 BLAKE2B d9f435f464fa1db18b86258947b8c5077b8b20b9c26ca00aeeca79da604f299f776673c374b7d0db10a5d40cbc84774642b29e756a83f02cda5d085280387346 SHA512 2ec79b66c31d4741b214c04f7865cf0139b4c0b14a8fb2a70bf332cf90e73821282b510719689bc2fe59542ee51c87e9f9b49a47b6a67cad897f7f906f0b05e9
 DIST benchmark-505be96ab.tar.gz 129647 BLAKE2B d9f435f464fa1db18b86258947b8c5077b8b20b9c26ca00aeeca79da604f299f776673c374b7d0db10a5d40cbc84774642b29e756a83f02cda5d085280387346 SHA512 2ec79b66c31d4741b214c04f7865cf0139b4c0b14a8fb2a70bf332cf90e73821282b510719689bc2fe59542ee51c87e9f9b49a47b6a67cad897f7f906f0b05e9
 DIST benchmark-5b7683f4.tar.gz 102332 BLAKE2B a7210a2c7a173a9df8bf03b83fc9712d5b52ded13c932e4d13a93004b93ad816895b722acc941b1d94c6b403e4ccb846141f5a38f42baafc5fb3cb108c039559 SHA512 a4e69ee8ec824e418abd713cb3597175cd40ecee9bc539e2d3592f9ec0f8ee54e7466984874f410b78beee82b4c396a7f2824880f808c4217704cf9970411ebf
 DIST benchmark-e776aa02.tar.gz 126890 BLAKE2B 389a4fc0bfedc20227de31d4b1447b8370300a8e3cbea8a8d4b1c82ee90757c2a035ea0324e762217f5a6279a4277f431b7e511d8a9a3bcf226fe31c0022b83c SHA512 d9f70c617af75683dfcf5a0d7ff14b3374258bcf869e3b69b23e85c980366cc4f9859fef3d3dd84a2a92933729053eb02663eaf4bbe0a020a2e001f42b85230d
 DIST benchmark-e991355c02b93fe17713efe04cbc2e278e00fdbd.tar.gz 176771 BLAKE2B 22280c0777635d57574852e6e3ad276683d582eed9b17ef93f09f6a5560dc3d06bbabdead9cfc72f5059570436515855a841118c47f23c3793e1b83e368cc75b SHA512 aa4455fa0f8546ec5762f14065e0be6667b5874e6991ca6dd21dc7b29e38c7c74cfddb2c99c7a1ed2f7636aa7bdec8fc0fc1523967b179f5642c2dc2e968089c
+DIST breakpad-7d188f679d4ae0a5bd06408a3047d69ef8eef848.tar.gz 5325601 BLAKE2B 6594296797e9dcec37db3a42303bf2808370125368b90d227635d34d911b3d1c8d1ac31ddce88e9fc9822c43551a92570e7c57285ffd5b20a54d65a746e3ca9e SHA512 eab70bfb55be0ce527e599d964e4d27ef2ab4da88e9a4d077c56d5ab162d63a2748e54e402ce157c4b7dab2b9afb7e82c67f40acb1ad84236f600f39f2484b47
 DIST cpuinfo-5916273f79a21551890fd3d56fc5375a78d1598d.tar.gz 3496223 BLAKE2B 4da452faf12138fbc1abd266d8ae6e0a0192f48a84faccb55fd05c3ac85d0bea2ecbd80b5eda69bb51c6704a223f90dd83d1f0fc79d56d35dd21cae5c5b8fab5 SHA512 50e537b61d991e8579577fb1ecf8d9ceb2171dbad96dfe159a062eadfdc0b2372b94988fc6f223c20e327453c7f55042ee06779f5b5fe0922f4470f746c9686b
 DIST cpuinfo-63b25457.tar.gz 3495405 BLAKE2B bb7cefa2bfe6e44134c52b8ba8048a84f0063623e566e89dd92ed6ff5e383a150c554a45b66ee5c4ba6d1544de948ac978ab6e53101399d4768bace20110b4e6 SHA512 44f4a55eea9c0d707818dedfec26f007c2bc2271c7bf9375e6e30171384fb0fa2e1d5731cb946570c717e6d88e6b1496d498e6e55dbf37d66174a4c675a3a006
 DIST cpuinfo-63b254577.tar.gz 3495405 BLAKE2B bb7cefa2bfe6e44134c52b8ba8048a84f0063623e566e89dd92ed6ff5e383a150c554a45b66ee5c4ba6d1544de948ac978ab6e53101399d4768bace20110b4e6 SHA512 44f4a55eea9c0d707818dedfec26f007c2bc2271c7bf9375e6e30171384fb0fa2e1d5731cb946570c717e6d88e6b1496d498e6e55dbf37d66174a4c675a3a006
@@ -31,6 +33,7 @@ DIST cub-d106ddb99.tar.gz 398104 BLAKE2B 287f020189be877c7a9e667bdfb591da1404619
 DIST cub-d106ddb991a56c3df1b6d51b2409e36ba8181ce4.tar.gz 398104 BLAKE2B 287f020189be877c7a9e667bdfb591da14046199b7336074040c3301d69110c8408d89a72cdcd74d8519deb200ec61823a6d2160d4ecbd00002338651dbf312e SHA512 8d65c0407448125378495190ee2a2c0e3b27a3577efbd6bb5aa8ad76f5bf2bf17becdc6ef931672a4d16b033fd7c0a199bb60e62b0b2b311e5f59c4136f55835
 DIST fbgemm-1d710393.tar.gz 259645 BLAKE2B 7b159c67ee66679985758f59b001aea02f141e2a36af2dd12731bd260ba5a5834a2a5eefd9b8b43454a0d4c75df929fa302e7ba0e5210ee67c150b405d3b4cac SHA512 19bbc9ed274bced7b8453d9ec4f43bb998725764aeeee72782abff36fc77e9ef918396f5c462da7b448e9a3bb7a834f143cfdf6777ef0cdddada63bc2bf98761
 DIST fbgemm-7495417ad31c38a06b1b13db66b355b6f23cd96d.tar.gz 444575 BLAKE2B 97c0672119eee2e0a770445fbc7d3fad8d91d86d7a860f75e20b0a9b8dabae555b324f12d63092463eb1882ccb9d587e73cbb34013acaa3a76f015f093792e9f SHA512 b4cb8964e84dbe4065d7b9292c5877305a43b7dc21e896e3d20d3082c208eca2afe2348face8ce2236256e436c611d6adf9c9f729ef07b2ae9f939e25ec21e00
+DIST fbgemm-7588d9d804826b428fc0e4fd418e9cc3f7a72e52.tar.gz 465305 BLAKE2B 6ec6915d9a0ca91600ff3d948bdb17a8db75d5b53db2c32488a296a9c114259501f98df460fac50e27486bd1302fc3279bd6c37a719ce5fea5911d53f992f893 SHA512 f3f01bb8e3abf415001812cfae423fee39267baec13e7794f703a14c58f34c23f0e03f26c8ac9aaf9341cb4bdaae745b99b9c8f301cd23d8b6e7ea621745ab71
 DIST fbgemm-87c378172.tar.gz 244850 BLAKE2B 322d892cc34921c9ffd7b9faf67804f3cfc3a427281e12afeeca4af3df37a8aa47198695e28e33feb836605d29925f566a4a290206ce6209478af87883561564 SHA512 42e678560dc774694ed6e2eb7d62a0284532be9c206aa1e056810e00bb7c06d557541e0ce56446735e163d480b504854e45cce9d7f23368974c500ecfe6e9961
 DIST fmt-9bdd1596c.tar.gz 733867 BLAKE2B b5c62ea43bfd99268dd120d5a09eb5f80bc29411268367e63bdf7034aeb98c9aed00da019ad6e259922adbb849b4484353142e9d3449a256909e72f4a50ddee4 SHA512 3639b4984a88fc5495c6cb1a0a09bb0a13f5dc05286f5a2b15e60dfda780bcc1fe213497006cc27247c3c358be27d8af4dd995db2b3de0f6a5a1288dc1058585
 DIST fmt-cd4af11e.tar.gz 740467 BLAKE2B da998415363b8205cb3be5c677ff8c3ea4aa5636741a5cfe45d7b6e54c1f6d0a36696158e2e21f37978323a11150e01efb2793de6a42af4ed19aac52381e0afc SHA512 24b42288be97849533dc82282fc08833d74642ad2afeb511e65c6389d88c709cf25345dec5b550c18af3705f4c0847fa0d4066308b51cd41ccfdda1a2c3babd0
@@ -51,9 +54,12 @@ DIST googletest-e2239ee6043f73722e7aa812a459f54a28552929.tar.gz 887296 BLAKE2B 8
 DIST ideep-938cc6889.tar.gz 27315 BLAKE2B 967bff56175d6f6b6e9895ef8e7ecf22f2bcbc4aa33074654b8c527165beb280e70c1b39da37ae2cd432eaa8d0ec600b83282d86faac05e17319dbd647f22107 SHA512 24a3f0b35756e3892af99658f7de7d17dff369601ffa7d39a6e2c3609c9c667f341cc66b6664fb69c4d938a1f7b3454e7106b8e27ec9995be5ad2d541927e2e1
 DIST ideep-9ca27bbfd88fa1469cbf0467bd6f14cd1738fa40.tar.gz 30949 BLAKE2B 07028f6544e5e088c01b111e89defd02eed022663536c4b1fe582e3b8da65a383aeb75e191f433e4cf497236630dcc531fa16a2758cd9be6db504c6b04f2a9b0 SHA512 0b51c41124ed033fd608b1ae7a6de3ebbb5c8b96c53cea594966178b5e0bd38d8b1b2773c4ba5e8f7b2f4af6d6ce1aef8fcb84bbe05780822976644d0e79b20f
 DIST ideep-ba885200.tar.gz 27307 BLAKE2B 710dde31a8784315c88df9869e50c3940416263958ab653bce9876d60786906565b12f36c2d716a8a1f6009bc9e532e06733ddfac0d4079dba13ea153b8acbd9 SHA512 0c1bca04adbe797e5767f8b86fb3b247a2a287ffa2b3b19a918f976312175b459a6488166d12cf55e68c9aced84038fcda0d1d1c51a5034c83f844f51d462727
+DIST kineto-879a203d9bf554e95541679ddad6e0326f272dc1.tar.gz 7478317 BLAKE2B 0e73fdb99d2f8b4fb0ed53ef6d3f0360a313c5ed26418a705bcaf6fdd0e73ad578cc0793da4015eb43be007aec6420f46f1b3678da5687a42fe87d522fabe7eb SHA512 1d530eceb5d2e1d69e50951983c6b3d1e5b7a07552b7e7ffe7d776a3034566b7176ed5eb124c25d838e1d7b381fffa64a98ce5cbeeaa5f77fd94f186e61eafcb
 DIST kineto-dbfa0ead96612f7ca265c63a35fdf0488395179b.tar.gz 7245955 BLAKE2B 09e6b1b1e15c485bbcc20713d07dab42fcc1b075557b6f202089696944b379d9fb3a860f68c16946b6f3eb76b12cf52a7fbc99a14af1baa40fb09b3f6d295c4e SHA512 6c479c3a14887c0703843416a961b6c92169caada029683a1d6d8463b4001a5bf8606dcd480df509c0f1fe53206001ab7428c9352fa638acc581523f55687e2b
 DIST libnop-aa95422e.tar.gz 124202 BLAKE2B 5a74ecbf473dba09db1a11172a4aa432d81b14adb3826bef9aa8bae1bf1e2d0d5a7bf775fd4343fa9d7b235b17cafe949e47c903e92fd5eae9cc0717a552ea45 SHA512 62b21be874d2117294925c2497394d166da43d534776764c9c124699b5799d99790a2c6420804f8e143e1a18a536106852082f3a9d0052a726abc624fc19f937
 DIST libuv-02a9e1be.tar.gz 1250418 BLAKE2B 49d7c6161614218bf856f7e23cd3e483bf1ac682bdc78b9624b9b5b52edde31aae005638bbc01e89f01421097e0bd4e07893db464326741ca6d1abaf45e633fe SHA512 de6d5d014b61804884a3945f2992f4aecf642fdd330927aa9a3bc17b76c29c51f6615d3d04542b24bb9ccdfd5207155e282f2fcd3aac14233d5bde4b1bc30284
+DIST libuv-48e04275332f5753427d21a52f17ec6206451f2c.tar.gz 1293971 BLAKE2B da9d51bb0bf577f7221676a58a1d92b4cc4eaee5389ea68e9cc6ba28560727ab1c1890847caeb2df2da19cf83cb666aa59d9792be922677d693fadc0084607f2 SHA512 27e442de6bbacd58bf63c76cb6608d513ebdd1289232a5628d961a88aee7e1e104cd494e3318a2c62ea8a247f96a3274ee49536a6a2690695f1018f8a46664c5
+DIST lss-e1e7b0ad8ee99a875b272c8e33e308472e897660.tar.gz 38399 BLAKE2B 6646858cde85b62664d157c9af9697f41c432fc97e4492b8159718c15c00de2b6441341648c5925d6d1a987cc6dee942382abaeebbae3b850a683dd42b5d648e SHA512 79b0deb923d69b34cbb239bfda9c36635b27f67eca0e2112967fa72a4d8235e0232dae3782eebf8a61e109503eac50e962bcbdd10b32e8ad8ddaf87ea953f66b
 DIST mkl-dnn-5ef631a0.tar.gz 5799312 BLAKE2B ea2aafcf45adadb0546781b00b44a0e9712c28e4937ef4daeef8b910e76bbb152e5434e45bec2aae0f6cb86fd7b5098e61842d7e99258db6fa846a79996d2e23 SHA512 66df9ea574010616df46d85ef25d23bd9ed31f9719cdbec4c727de58728fe095cd412d7663c2d456dba2f26848e45c1d67e34bffe4e25beeef9c1d40f187e8d6
 DIST nccl-033d7995.tar.gz 146624 BLAKE2B b6f15d5d4690a5cbcf882c10826def400a14c58ff5f5af276b5b9a615a567de36ca907120cc681cdf2f2eb207f22bc87ee87d145a365097a64fb3d9de82432fb SHA512 3b3e087cb729b10e3251dfef52196bddd33e3e777df289c5fc537e99473e78f8720255fbd3e14ae2d2a6126d1e9d59aa6d57d7c7958d919e65834fef92c1c835
 DIST nccl-5949d96f3.tar.gz 147548 BLAKE2B f3d3dd222ae90ac9ac1457a9695f112a21f5652a5b40e10ac049da910f07707b1c3910f59734fbe5e2c6523c1e83f3801f809efa77d122a57e859828c74ba8c2 SHA512 d9ea83caf7940fb47134293236fcb7478c0d4e40365d3b0a29427758e2e2dbb980c5e8c05fc9fc3956ed5e21a82ec0efaa31d973fe9c73fa3f50465f76756131
@@ -70,6 +76,8 @@ DIST psimd-072586a71b55b7f8c584153d223e95687148a90.tar.gz 6825 BLAKE2B db255d2a6
 DIST pthreadpool-029c8862.tar.gz 45970 BLAKE2B 09bd7d258f45fbe703238826b7435d8a5d013700cd734282b646420ba0854c0a386712f6bc3ed44e7496d51471b1e0a965f01ebdb09786e2020d979ecddb767a SHA512 b51099fa9d62065883cc43dcd5f9717a17be5ee2e87fc861667172a09acb3a62929c8bbc8a5c0c00885a638af0ec2ae4149adde2ba85bf3c80834f9b973c2d5b
 DIST pthreadpool-029c88620.tar.gz 45970 BLAKE2B 09bd7d258f45fbe703238826b7435d8a5d013700cd734282b646420ba0854c0a386712f6bc3ed44e7496d51471b1e0a965f01ebdb09786e2020d979ecddb767a SHA512 b51099fa9d62065883cc43dcd5f9717a17be5ee2e87fc861667172a09acb3a62929c8bbc8a5c0c00885a638af0ec2ae4149adde2ba85bf3c80834f9b973c2d5b
 DIST pthreadpool-a134dd5d4cee80cce15db81a72e7f929d71dd413.tar.gz 49011 BLAKE2B 7bfbca81321243e64aa53c668dfe380ce4f7b88477a1c794a4dea9062c9b0969ca745dbfe0abbb95fffbf44080763506609c387ed085d89f6c612be6804b5cc2 SHA512 5f5a1275bbcef13cea88e381010bf2654c9646d30c5fb061f1d6e9e9a0ae6398e137c5e4f7da69f7d8d8b58fb5a7e79f7a4c0c1c3bbaad8f3d0c896d21bc7691
+DIST pybind11-8de7772cc72daca8e947b79b83fea46214931604.tar.gz 648390 BLAKE2B f262eb972154b51adf27f213aab95012c5d9c27df94855fe495e264f34996d1ed0de7651cc78ecae25798b2c62a5ec150a7373858f3ce0e5497ae33674bbbc25 SHA512 9bb688209791bd5f294fa316ab9a8007f559673a733b796e76e223fe8653d048d3f01eb045b78aa1843f7eacf97f6e2ee090ac68fed2b43856eb0c4813583204
+DIST pytorch-1.10.0.tar.gz 18474149 BLAKE2B 6b0dd6e92733a7e421d0ddc3f809732e66c06bc9f4538064d92f0469749ba2546b6a8c77ca09b8840b00e0d1d5d8fd439a37f8119d73fb2f734139559e69a5d8 SHA512 92b70e6170a7f173c4a9cb29f6cec6dfa598587aa9cf6a620ec861b95da6ea555cbc7285914c0dab6cfc8af320fad4999be4a788acc1f15140664a67ad9dc35d
 DIST pytorch-1.6.0.tar.gz 11376568 BLAKE2B 30aac34e14837ed6942ef7577aea77752cd9c809cb751fa837693b2b60eeda9a371421c4b4678fe94763a47e434b65ea60afc56aec7863887ba12bf362b96f0a SHA512 117ff1588ed1ebd0df15fbed066c65ea026893fe9a40d14aa1f73d848fab114b1b11bd7ed083815030f7fdf13a824480521cb40865f48a24c7028f4d195f2127
 DIST pytorch-1.7.1.tar.gz 13012087 BLAKE2B ff498814178281ca59ae80bfe51dde3ffb0cde1eaa762bd9b36c2ff7f07d4b5ae4d68e10c76158e5e9e4250fcb01265a3755575b761495e20cf677e9a9825454 SHA512 359e271093e7afd374202f48e40356d195f644f78377a0b88f38627ad7aeabb9201a18c12ff35fb4aaf0d731168e511504445d8b4c08e92eed50264e23d81bae
 DIST pytorch-1.9.0.tar.gz 16772380 BLAKE2B 16f369cf2752082ab07fa0e497aaff7b90daf94cf39cce533c4a8b06a9237710089af0c137e29fbc79b4cf72d8d47681408e9ada1692431b573d90a07c373f1e SHA512 389ff114367a4337ab6e68178184f04751e4641fac685923afa019093951fa3a446f5265f6661f3aaad99c733c0107391431896c6e876796b8837f5ae75edd99
@@ -79,3 +87,4 @@ DIST sleef-e0a003ee838b75d11763aa9c3ef17bf71a725bff.tar.gz 1642070 BLAKE2B 366fa
 DIST tensorpipe-3b8089c9c.tar.gz 141980 BLAKE2B 6c2a1e630412e9f8e039d5c44aaed4623f51516d59ee4237b9ec95d5b30970dbf4961aca0d84f1fee621ab8b8f668f0e8dbfbe558614d5651a00d9be21259a88 SHA512 1e9473532b11c23ec7dd9fdb148c0440263ae41f42a7826a4f7e098ed2a7e0c99d5e9df344b310e17098c3d70749a38d20d8af992c4820bebdbd5078d1a20dcc
 DIST tensorpipe-95ff9319.tar.gz 155511 BLAKE2B bc074efe7501fd29fbff177c2782d4be1d514c8f2f5c9fe0fcdcbd0ca3a33bb91cab8fc95e8e5dac1bc4f65d904d0beef3d30f001eab9884b0506edbbee774fd SHA512 5ef38f10c65c49b3feea964c45564196005ebf47b365ed0cf60916215bac4fa04525ec9de007342fe520206b8e8663c0264fd838e89073a752d308418a2b1dd6
 DIST tensorpipe-c0e7623adb05f36311c7cde6dac8fc4c290419d9.tar.gz 253518 BLAKE2B fcef24208f97c1a96a3b0d30a76c3956de4383823c908982bcf1ef7fdacd14f6ada6fa3b797d3b6c9bd3dea3d1dd4bfc6f7b2136057a385ab42b2909cd1beee3 SHA512 734e919df485b590ff3bc022b53bbe8aeda1c2178ab8c6938e9fb6d977b48d4fa9a395f65f3727f602d0b25d0a7d419ad9ea96566b644b83073291ae40c54856
+DIST tensorpipe-d2aa3485e8229c98891dfd604b514a39d45a5c99.tar.gz 259599 BLAKE2B 89a948430a4a662a475417b60c8a962e5f89eadabe72f303275d113bcd768ad4d86308cceb902c9c65b1c6f23eeef6fe0e5e5329d270d37ae87632ca34406de8 SHA512 fbefc18792458ac2234045df8e3cce8dbb17a5e719258f020c2c1d388092358bd2562e53a0377ca18f40bcfbeae4367c277a74c31c5e45296b891453a962e460
diff --git a/sci-libs/pytorch/files/pytorch-1.10.0-nonull.patch b/sci-libs/pytorch/files/pytorch-1.10.0-nonull.patch
new file mode 100644
index 000000000..adc258556
--- /dev/null
+++ b/sci-libs/pytorch/files/pytorch-1.10.0-nonull.patch
@@ -0,0 +1,12 @@
+--- a/torch/csrc/jit/frontend/ir_emitter.cpp	2021-10-15 05:35:23.000000000 +0400
++++ b/torch/csrc/jit/frontend/ir_emitter.cpp	2021-10-15 05:35:23.000000000 +0400
+@@ -1678,7 +1678,7 @@
+               << "Union type annotation `" << type_hint->repr_str()
+               << "` can hold " << vector_repr.str() << ", but none of "
+               << "those list types can hold the types of the given dict"
+-              << " elements, which were unified to " << candidate->repr_str();
++              << " elements, which were unified";
+         } else {
+           refined_type_hint = candidate;
+         }
+
diff --git a/sci-libs/pytorch/pytorch-1.10.0.ebuild b/sci-libs/pytorch/pytorch-1.10.0.ebuild
new file mode 100644
index 000000000..d3d347325
--- /dev/null
+++ b/sci-libs/pytorch/pytorch-1.10.0.ebuild
@@ -0,0 +1,330 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7..10} )
+
+inherit cmake cuda distutils-r1 prefix
+
+DESCRIPTION="Tensors and Dynamic neural networks in Python with strong GPU acceleration"
+HOMEPAGE="https://pytorch.org/"
+SRC_URI="https://github.com/pytorch/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
+https://github.com/google/benchmark/archive/e991355c02b93fe17713efe04cbc2e278e00fdbd.tar.gz -> benchmark-e991355c02b93fe17713efe04cbc2e278e00fdbd.tar.gz
+https://github.com/pytorch/cpuinfo/archive/63b25457.tar.gz -> cpuinfo-63b25457.tar.gz
+https://github.com/NVlabs/cub/archive/d106ddb991a56c3df1b6d51b2409e36ba8181ce4.tar.gz -> cub-d106ddb991a56c3df1b6d51b2409e36ba8181ce4.tar.gz
+https://github.com/pytorch/fbgemm/archive/7588d9d804826b428fc0e4fd418e9cc3f7a72e52.tar.gz -> fbgemm-7588d9d804826b428fc0e4fd418e9cc3f7a72e52.tar.gz
+https://github.com/asmjit/asmjit/archive/d0d14ac774977d0060a351f66e35cb57ba0bf59c.tar.gz -> asmjit-d0d14ac774977d0060a351f66e35cb57ba0bf59c.tar.gz
+https://github.com/pytorch/cpuinfo/archive/5916273f79a21551890fd3d56fc5375a78d1598d.tar.gz -> cpuinfo-5916273f79a21551890fd3d56fc5375a78d1598d.tar.gz
+https://github.com/google/googletest/archive/0fc5466d.tar.gz -> googletest-0fc5466d.tar.gz
+https://github.com/fmtlib/fmt/archive/cd4af11efc9c622896a3e4cb599fa28668ca3d05.tar.gz -> fmt-cd4af11efc9c622896a3e4cb599fa28668ca3d05.tar.gz
+https://github.com/houseroad/foxi/archive/c278588e34e535f0bb8f00df3880d26928038cad.tar.gz -> foxi-c278588e34e535f0bb8f00df3880d26928038cad.tar.gz
+https://github.com/Maratyszcza/FP16/archive/4dfe081cf6bcd15db339cf2680b9281b8451eeb3.tar.gz -> FP16-4dfe081cf6bcd15db339cf2680b9281b8451eeb3.tar.gz
+https://github.com/Maratyszcza/FXdiv/archive/b408327ac2a15ec3e43352421954f5b1967701d1.tar.gz -> FXdiv-b408327ac2a15ec3e43352421954f5b1967701d1.tar.gz
+https://github.com/google/gemmlowp/archive/3fb5c176.tar.gz -> gemmlowp-3fb5c176.tar.gz
+https://github.com/facebookincubator/gloo/archive/c22a5cfba94edf8ea4f53a174d38aa0c629d070f.tar.gz -> gloo-c22a5cfba94edf8ea4f53a174d38aa0c629d070f.tar.gz
+https://github.com/google/googletest/archive/e2239ee6043f73722e7aa812a459f54a28552929.tar.gz -> googletest-e2239ee6043f73722e7aa812a459f54a28552929.tar.gz
+https://github.com/intel/ideep/archive/9ca27bbfd88fa1469cbf0467bd6f14cd1738fa40.tar.gz -> ideep-9ca27bbfd88fa1469cbf0467bd6f14cd1738fa40.tar.gz
+https://github.com/intel/mkl-dnn/archive/5ef631a0.tar.gz -> mkl-dnn-5ef631a0.tar.gz
+cuda? ( https://github.com/NVIDIA/nccl/archive/033d7995.tar.gz -> nccl-033d7995.tar.gz )
+https://github.com/Maratyszcza/NNPACK/archive/c07e3a0400713d546e0dea2d5466dd22ea389c73.tar.gz -> NNPACK-c07e3a0400713d546e0dea2d5466dd22ea389c73.tar.gz
+https://github.com/onnx/onnx/archive/a82c6a70.tar.gz -> onnx-a82c6a70.tar.gz
+https://github.com/onnx/onnx-tensorrt/archive/c153211418a7c57ce071d9ce2a41f8d1c85a878f.tar.gz -> onnx-tensorrt-c153211418a7c57ce071d9ce2a41f8d1c85a878f.tar.gz
+https://github.com/onnx/onnx/archive/29e7aa7048809784465d06e897f043a4600642b2.tar.gz -> onnx-29e7aa7048809784465d06e897f043a4600642b2.tar.gz
+https://github.com/google/benchmark/archive/e776aa02.tar.gz -> benchmark-e776aa02.tar.gz
+https://github.com/google/benchmark/archive/5b7683f4.tar.gz -> benchmark-5b7683f4.tar.gz
+https://github.com/google/googletest/archive/5ec7f0c4.tar.gz -> googletest-5ec7f0c4.tar.gz
+https://github.com/Maratyszcza/psimd/archive/072586a71b55b7f8c584153d223e95687148a90.tar.gz -> psimd-072586a71b55b7f8c584153d223e95687148a90.tar.gz
+https://github.com/Maratyszcza/pthreadpool/archive/a134dd5d4cee80cce15db81a72e7f929d71dd413.tar.gz -> pthreadpool-a134dd5d4cee80cce15db81a72e7f929d71dd413.tar.gz
+https://github.com/Maratyszcza/PeachPy/archive/07d8fde8ac45d7705129475c0f94ed8925b93473.tar.gz -> PeachPy-07d8fde8ac45d7705129475c0f94ed8925b93473.tar.gz
+https://github.com/pytorch/QNNPACK/archive/7d2a4e9931a82adc3814275b6219a03e24e36b4c.tar.gz -> QNNPACK-7d2a4e9931a82adc3814275b6219a03e24e36b4c.tar.gz
+https://github.com/shibatch/sleef/archive/e0a003ee838b75d11763aa9c3ef17bf71a725bff.tar.gz -> sleef-e0a003ee838b75d11763aa9c3ef17bf71a725bff.tar.gz
+https://github.com/pytorch/tensorpipe/archive/d2aa3485e8229c98891dfd604b514a39d45a5c99.tar.gz -> tensorpipe-d2aa3485e8229c98891dfd604b514a39d45a5c99.tar.gz
+https://github.com/google/googletest/archive/2fe3bd99.tar.gz -> googletest-2fe3bd99.tar.gz
+https://github.com/google/libnop/archive/aa95422e.tar.gz -> libnop-aa95422e.tar.gz
+https://github.com/libuv/libuv/archive/48e04275332f5753427d21a52f17ec6206451f2c.tar.gz -> libuv-48e04275332f5753427d21a52f17ec6206451f2c.tar.gz
+https://github.com/google/XNNPACK/archive/79cd5f9e18ad0925ac9a050b00ea5a36230072db.tar.gz -> XNNPACK-79cd5f9e18ad0925ac9a050b00ea5a36230072db.tar.gz
+https://github.com/pytorch/kineto/archive/879a203d9bf554e95541679ddad6e0326f272dc1.tar.gz -> kineto-879a203d9bf554e95541679ddad6e0326f272dc1.tar.gz
+https://github.com/driazati/breakpad/archive/7d188f679d4ae0a5bd06408a3047d69ef8eef848.tar.gz -> breakpad-7d188f679d4ae0a5bd06408a3047d69ef8eef848.tar.gz
+https://github.com/mikey/linux-syscall-support/archive/e1e7b0ad8ee99a875b272c8e33e308472e897660.tar.gz -> lss-e1e7b0ad8ee99a875b272c8e33e308472e897660.tar.gz
+https://github.com/pybind/pybind11/archive/8de7772cc72daca8e947b79b83fea46214931604.tar.gz -> pybind11-8de7772cc72daca8e947b79b83fea46214931604.tar.gz
+"
+
+# git clone git@github.com:pytorch/pytorch.git && cd pytorch
+# git submodules update --init --recursive
+# ${FILESDIR}/get_third_paries
+# cat SRC_URI src_prepare
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~x86 ~amd64"
+
+IUSE="asan blas cuda +fbgemm ffmpeg gflags glog +gloo leveldb lmdb mkldnn mpi namedtensor +nnpack numa +observers opencl opencv +openmp +python +qnnpack redis rocm static test tools zeromq"
+RESTRICT="!test? ( test )"
+REQUIRED_USE="
+	?? ( cuda rocm )
+"
+
+RDEPEND="
+	dev-python/pyyaml[${PYTHON_USEDEP}]
+	blas? ( virtual/blas )
+	cuda? ( dev-libs/cudnn
+		dev-cpp/eigen[cuda] )
+	rocm? ( >=dev-util/hip-4.0.0-r1
+			>=dev-libs/rccl-4
+			>=sci-libs/rocThrust-4
+			>=sci-libs/hipCUB-4
+			>=sci-libs/rocPRIM-4
+			>=sci-libs/miopen-4
+			>=sci-libs/rocBLAS-4
+			>=sci-libs/rocRAND-4
+			>=sci-libs/hipSPARSE-4
+			>=sci-libs/rocFFT-4
+			>=dev-util/roctracer-4 )
+	ffmpeg? ( media-video/ffmpeg )
+	gflags? ( dev-cpp/gflags )
+	glog? ( dev-cpp/glog[gflags] )
+	leveldb? ( dev-libs/leveldb )
+	lmdb? ( dev-db/lmdb )
+	mpi? ( virtual/mpi )
+	opencl? ( dev-libs/clhpp virtual/opencl )
+	opencv? ( media-libs/opencv )
+	python? ( ${PYTHON_DEPS}
+		dev-python/pybind11[${PYTHON_USEDEP}]
+		dev-python/numpy[${PYTHON_USEDEP}]
+		dev-python/protobuf-python:0/30
+	)
+	redis? ( dev-db/redis )
+	zeromq? ( net-libs/zeromq )
+	dev-cpp/eigen
+	dev-libs/protobuf:0/30
+	dev-libs/libuv
+"
+
+#ATen code generation
+BDEPEND="dev-python/pyyaml"
+
+DEPEND="${RDEPEND}
+	test? ( dev-python/pytest[${PYTHON_USEDEP}] )
+	dev-cpp/tbb
+	app-arch/zstd
+	!dev-python/pybind11
+	dev-python/typing-extensions[${PYTHON_USEDEP}]
+	sys-fabric/libibverbs
+	sys-process/numactl
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.6.0-skip-tests.patch
+	"${FILESDIR}"/${PN}-1.6.0-global-dlopen.patch
+	"${FILESDIR}"/0002-Don-t-build-libtorch-again-for-PyTorch-1.7.1.patch
+	"${FILESDIR}"/${PN}-1.7.1-no-rpath.patch
+	"${FILESDIR}"/${PN}-1.7.1-torch_shm_manager.patch
+	"${FILESDIR}"/${PN}-1.10.0-nonull.patch
+)
+
+src_prepare() {
+	cmake_src_prepare
+	eprefixify torch/__init__.py
+
+	rmdir third_party/benchmark || die
+	ln -sv "${WORKDIR}"/benchmark-e991355c02b93fe17713efe04cbc2e278e00fdbd third_party/benchmark || die
+	rmdir third_party/cpuinfo || die
+	ln -sv "${WORKDIR}"/cpuinfo-5916273f79a21551890fd3d56fc5375a78d1598d third_party/cpuinfo || die
+	rmdir third_party/cub || die
+	ln -sv "${WORKDIR}"/cub-d106ddb991a56c3df1b6d51b2409e36ba8181ce4 third_party/cub || die
+	rmdir third_party/fbgemm || die
+	ln -sv "${WORKDIR}"/FBGEMM-7588d9d804826b428fc0e4fd418e9cc3f7a72e52 third_party/fbgemm || die
+	rmdir third_party/fbgemm/third_party/asmjit || die
+	ln -sv "${WORKDIR}"/asmjit-d0d14ac774977d0060a351f66e35cb57ba0bf59c third_party/fbgemm/third_party/asmjit || die
+	rmdir third_party/fbgemm/third_party/cpuinfo || die
+	ln -sv "${WORKDIR}"/cpuinfo-d5e37adf1406cf899d7d9ec1d317c47506ccb970 third_party/fbgemm/third_party/cpuinfo || die
+	rmdir third_party/fbgemm/third_party/googletest || die
+	ln -sv "${WORKDIR}"/googletest-0fc5466dbb9e623029b1ada539717d10bd45e99e third_party/fbgemm/third_party/googletest || die
+	rmdir third_party/fmt || die
+	ln -sv "${WORKDIR}"/fmt-cd4af11efc9c622896a3e4cb599fa28668ca3d05 third_party/fmt || die
+	rmdir third_party/foxi || die
+	ln -sv "${WORKDIR}"/foxi-c278588e34e535f0bb8f00df3880d26928038cad third_party/foxi || die
+	rmdir third_party/FP16 || die
+	ln -sv "${WORKDIR}"/FP16-4dfe081cf6bcd15db339cf2680b9281b8451eeb3 third_party/FP16 || die
+	rmdir third_party/FXdiv
+	ln -sv "${WORKDIR}"/FXdiv-b408327ac2a15ec3e43352421954f5b1967701d1 third_party/FXdiv || die
+	rmdir third_party/gemmlowp/gemmlowp || die
+	ln -sv "${WORKDIR}"/gemmlowp-3fb5c176c17c765a3492cd2f0321b0dab712f350 third_party/gemmlowp/gemmlowp || die
+	rmdir third_party/gloo || die
+	ln -sv "${WORKDIR}"/gloo-c22a5cfba94edf8ea4f53a174d38aa0c629d070f third_party/gloo || die
+	rmdir third_party/googletest || die
+	ln -sv "${WORKDIR}"/googletest-e2239ee6043f73722e7aa812a459f54a28552929 third_party/googletest || die
+	rmdir third_party/ideep || die
+	ln -sv "${WORKDIR}"/ideep-9ca27bbfd88fa1469cbf0467bd6f14cd1738fa40 third_party/ideep || die
+	rmdir third_party/ideep/mkl-dnn || die
+	ln -sv "${WORKDIR}"/mkl-dnn-5ef631a030a6f73131c77892041042805a06064f third_party/ideep/mkl-dnn || die
+	rmdir third_party/nccl/nccl || die
+	ln -sv "${WORKDIR}"/nccl-033d799524fb97629af5ac2f609de367472b2696 third_party/nccl/nccl || die
+	rmdir third_party/NNPACK || die
+	ln -sv "${WORKDIR}"/NNPACK-c07e3a0400713d546e0dea2d5466dd22ea389c73 third_party/NNPACK || die
+	rmdir third_party/onnx || die
+	ln -sv "${WORKDIR}"/onnx-29e7aa7048809784465d06e897f043a4600642b2 third_party/onnx || die
+	rmdir third_party/onnx-tensorrt || die
+	ln -sv "${WORKDIR}"/onnx-tensorrt-c153211418a7c57ce071d9ce2a41f8d1c85a878f third_party/onnx-tensorrt || die
+	rmdir third_party/onnx-tensorrt/third_party/onnx || die
+	ln -sv "${WORKDIR}"/onnx-765f5ee823a67a866f4bd28a9860e81f3c811ce8 third_party/onnx-tensorrt/third_party/onnx || die
+	rmdir third_party/onnx/third_party/benchmark || die
+	ln -sv "${WORKDIR}"/benchmark-e776aa0275e293707b6a0901e0e8d8a8a3679508 third_party/onnx/third_party/benchmark || die
+	rmdir third_party/psimd || die
+	ln -sv "${WORKDIR}"/psimd-072586a71b55b7f8c584153d223e95687148a900 third_party/psimd || die
+	rmdir third_party/pthreadpool || die
+	ln -sv "${WORKDIR}"/pthreadpool-a134dd5d4cee80cce15db81a72e7f929d71dd413 third_party/pthreadpool || die
+	rmdir third_party/python-peachpy || die
+	ln -sv "${WORKDIR}"/PeachPy-07d8fde8ac45d7705129475c0f94ed8925b93473 third_party/python-peachpy || die
+	rmdir third_party/QNNPACK || die
+	ln -sv "${WORKDIR}"/QNNPACK-7d2a4e9931a82adc3814275b6219a03e24e36b4c third_party/QNNPACK || die
+	rmdir third_party/sleef || die
+	ln -sv "${WORKDIR}"/sleef-e0a003ee838b75d11763aa9c3ef17bf71a725bff third_party/sleef || die
+	rmdir third_party/tensorpipe || die
+	ln -sv "${WORKDIR}"/tensorpipe-d2aa3485e8229c98891dfd604b514a39d45a5c99 third_party/tensorpipe || die
+	rmdir third_party/tensorpipe/third_party/googletest || die
+	ln -sv "${WORKDIR}"/googletest-2fe3bd994b3189899d93f1d5a881e725e046fdc2 third_party/tensorpipe/third_party/googletest || die
+	rmdir third_party/tensorpipe/third_party/libnop || die
+	ln -sv "${WORKDIR}"/libnop-aa95422ea8c409e3f078d2ee7708a5f59a8b9fa2 third_party/tensorpipe/third_party/libnop || die
+	rmdir third_party/tensorpipe/third_party/libuv || die
+	ln -sv "${WORKDIR}"/libuv-48e04275332f5753427d21a52f17ec6206451f2c third_party/tensorpipe/third_party/libuv || die
+	rmdir third_party/XNNPACK || die
+	ln -sv "${WORKDIR}"/XNNPACK-79cd5f9e18ad0925ac9a050b00ea5a36230072db third_party/XNNPACK || die
+	rmdir third_party/kineto || die
+	ln -sv "${WORKDIR}"/kineto-879a203d9bf554e95541679ddad6e0326f272dc1 third_party/kineto || die
+	rmdir third_party/breakpad || die
+	ln -sv "${WORKDIR}"/breakpad-7d188f679d4ae0a5bd06408a3047d69ef8eef848 third_party/breakpad || die
+	rmdir third_party/breakpad/src/third_party/lss || die
+	ln -sv "${WORKDIR}"/linux-syscall-support-e1e7b0ad8ee99a875b272c8e33e308472e897660 third_party/breakpad/src/third_party/lss || die
+	rmdir third_party/pybind11 || die
+	ln -sv "${WORKDIR}"/pybind11-8de7772cc72daca8e947b79b83fea46214931604 third_party/pybind11 || die
+
+	if use cuda; then
+		cd third_party/nccl/nccl || die
+		eapply "${FILESDIR}"/${PN}-1.6.0-nccl-nvccflags.patch
+		cuda_src_prepare
+		export CUDAHOSTCXX=$(cuda_gccdir)/g++
+	fi
+
+	if use rocm; then
+		#Allow escaping sandbox
+		addread /dev/kfd
+		addread /dev/dri
+		addwrite /dev/kfd
+		addwrite /dev/dri
+
+		ebegin "HIPifying cuda sources"
+		tools/amd_build/build_amd.py
+		eend $?
+
+		export PYTORCH_ROCM_ARCH=$(rocminfo | egrep -o "gfx[0-9]+" | uniq | awk -vORS=';' "{print $1}" | sed 's/;$/\n/') || die
+		sed -e "/set(roctracer_INCLUDE_DIRS/s,\${ROCTRACER_PATH}/include,${EPREFIX}/usr/include/roctracer," \
+			-i cmake/public/LoadHIP.cmake || die
+	fi
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DWERROR=OFF
+		-DTORCH_BUILD_VERSION=${PV}
+		-DTORCH_INSTALL_LIB_DIR=$(get_libdir)
+		-DBUILD_BINARY=$(usex tools ON OFF)
+		-DBUILD_CUSTOM_PROTOBUF=OFF
+		-DBUILD_PYTHON=$(usex python ON OFF)
+		-DBUILD_SHARED_LIBS=$(usex static OFF ON)
+		-DBUILD_TEST=$(usex test ON OFF)
+		-DUSE_ASAN=$(usex asan ON OFF)
+		-DUSE_CUDA=$(usex cuda ON OFF)
+		-DUSE_NCCL=$(usex cuda ON OFF)
+		-DUSE_SYSTEM_NCCL=OFF
+		-DUSE_ROCM=$(usex rocm ON OFF)
+		-DUSE_FBGEMM=$(usex fbgemm ON OFF)
+		-DUSE_FFMPEG=$(usex ffmpeg ON OFF)
+		-DUSE_GFLAGS=$(usex gflags ON OFF)
+		-DUSE_GLOG=$(usex glog ON OFF)
+		-DUSE_LEVELDB=$(usex leveldb ON OFF)
+		-DUSE_LITE_PROTO=OFF
+		-DUSE_LMDB=$(usex lmdb ON OFF)
+		-DUSE_MKLDNN=$(usex mkldnn ON OFF)
+		-DUSE_MKLDNN_CBLAS=OFF
+		-DUSE_NNPACK=$(usex nnpack ON OFF)
+		-DUSE_NUMPY=$(usex python ON OFF)
+		-DUSE_NUMA=$(usex numa ON OFF)
+		-DUSE_OBSERVERS=$(usex observers ON OFF)
+		-DUSE_OPENCL=$(usex opencl ON OFF)
+		-DUSE_OPENCV=$(usex opencv ON OFF)
+		-DUSE_OPENMP=$(usex openmp ON OFF)
+		-DUSE_TBB=OFF
+		-DUSE_PROF=OFF
+		-DUSE_QNNPACK=$(usex qnnpack ON OFF)
+		-DUSE_REDIS=$(usex redis ON OFF)
+		-DUSE_ROCKSDB=OFF
+		-DUSE_ZMQ=$(usex zeromq ON OFF)
+		-DUSE_MPI=$(usex mpi ON OFF)
+		-DUSE_GLOO=$(usex gloo ON OFF)
+		-DUSE_SYSTEM_EIGEN_INSTALL=ON
+		-DBUILD_NAMEDTENSOR=$(usex namedtensor ON OFF)
+		-DBLAS=$(usex blas Generic Eigen)
+		-DTP_BUILD_LIBUV=OFF
+		-Wno-dev
+	)
+
+	cmake_src_configure
+
+	if use python; then
+		CMAKE_BUILD_DIR="${BUILD_DIR}" distutils-r1_src_configure
+	fi
+
+	# do not rerun cmake and the build process in src_install
+	sed '/RERUN/,+1d' -i "${BUILD_DIR}"/build.ninja || die
+}
+
+src_compile() {
+	cmake_src_compile
+
+	if use python; then
+		USE_SYSTEM_LIBS=ON CMAKE_BUILD_DIR=${BUILD_DIR} distutils-r1_src_compile
+	fi
+}
+
+src_install() {
+	cmake_src_install
+
+	local LIB=$(get_libdir)
+	if [[ ${LIB} != lib ]]; then
+		mv -fv "${ED}"/usr/lib/*.so "${ED}"/usr/${LIB}/ || die
+	fi
+
+	rm -rfv "${ED}/torch"
+	rm -rfv "${ED}/var"
+	rm -rfv "${ED}/usr/lib"
+
+	rm -fv "${ED}/usr/include/*.{h,hpp}"
+	rm -rfv "${ED}/usr/include/asmjit"
+	rm -rfv "${ED}/usr/include/c10d"
+	rm -rfv "${ED}/usr/include/fbgemm"
+	rm -rfv "${ED}/usr/include/fp16"
+	rm -rfv "${ED}/usr/include/gloo"
+	rm -rfv "${ED}/usr/include/include"
+	rm -rfv "${ED}/usr/include/var"
+
+	cp -rv "${WORKDIR}/${P}/third_party/pybind11/include/pybind11" "${ED}/usr/include/"
+
+	rm -fv "${ED}/usr/${LIB}/libtbb.so"
+	rm -rfv "${ED}/usr/${LIB}/cmake"
+
+	if use python; then
+		scanelf -r --fix "${BUILD_DIR}/caffe2/python"
+		USE_SYSTEM_LIBS=ON CMAKE_BUILD_DIR=${BUILD_DIR} distutils-r1_src_install
+
+		python_foreach_impl python_optimize
+	fi
+
+	find "${ED}/usr/${LIB}" -name "*.a" -exec rm -fv {} \;
+
+	use test && rm -rfv "${ED}/usr/test" "${ED}"/usr/bin/test_{api,jit}
+
+	# Remove the empty directories by CMake Python:
+	find "${ED}" -type d -empty -delete || die
+}