gentoo resync : 10.09.2021

4 files changed, 320 insertions, 3 deletions

diff --git a/dev-vcs/mercurial/Manifest b/dev-vcs/mercurial/Manifest
index f6388b456804..4f19c829b736 100644
--- a/dev-vcs/mercurial/Manifest
+++ b/dev-vcs/mercurial/Manifest
@@ -8,8 +8,10 @@ DIST atty-0.2.14.crate 5470 BLAKE2B 2db856a9e898a430258f059aeaf7c844a153293e8856
 DIST autocfg-1.0.1.crate 12908 BLAKE2B 40c53cab298e4f26634c3acff3ece6a3371188d91dbf377ed664eabedcde20536edaa93daf406618f37edde019f049a6e7b9a47f627344587dbd126bee2b5e3a SHA512 630b348acb98b012e97804e6325d03c89abc22f2157762c59144c04e6c733daf550bdc7f0fe0b9f3b50e15dae8c1c3c4bdfce3d805b02f0fc987311f5332419b
 DIST bitflags-1.2.1.crate 16745 BLAKE2B 0fa6d3ce44aad7616d5cd02aad8c1d0b0fed4022650eb43067c4a72e6fc88da05442674fa51826e4858a47c9de233e1ba2229820af094197cd11bb416ceffb2b SHA512 ad89b3798845e23737a620bba581c2ff1ff3e15bac12555c765e201d2c0b90ecea0cdbc5b5b1a3fa9858c385e8e041f8226f5acfae5bbbe9925643fff2bf3f0b
 DIST bitmaps-2.1.0.crate 16717 BLAKE2B 817045077c198a84d114f68474b14515309bf56abde29398fcb47d7593d41c3fac069825d8a2aa1a598dea5b4865b94a21e83d03dc8d069672e1b835bc1ad551 SHA512 a423ea009bf61629e6dd7cb954f2781dd3c578d2216cd843957e0db05abc8f8c5971d2cca1915929b2b3c7b712450c817bb1de8d08715a1ca2641ace015a1dc7
+DIST block-buffer-0.9.0.crate 7108 BLAKE2B 42e99ec46c6e43d5f85e8d6d0a8fcef7175c97828758c93e55505c0e18e2646ae77bf264076041bf682532e28268a4978dd9c822c0475347ee3d29c5df2601fb SHA512 2d0f8908f59d4b1cccd1fbca0c1fa3cc4b224f09549669b28a16af5acfd4369b66851e9be8d65e1df71be998fbc42fc130ad32b71e035d6055724e8fa31fbf98
 DIST byteorder-1.3.4.crate 21943 BLAKE2B 278b24e036e920f84683f883991a967d997883bc80edefc5b69f52551794a37e5051786a1ac1b7a30bf2f5cad7318d781f189a7b2e496e2743df01262d5c33d6 SHA512 0618ce2cd6f3f6c586201d9aee8c8aaa08f99c9f9f215cf448b3cb6af1ac741845f5279953544caaec7fcf0beec1474bb991bee1ad0c0dac0c3f1d3ddd99e2d9
 DIST bytes-cast-0.1.0.crate 9869 BLAKE2B 658d66fc50faf4e3b9c2182c50cb38e14a6b38d42e2be5bdb5052cff98593fabc14d9d296f28f5231f49a197a9744dad67669732f8dd76c16d711c0f44dc4bc2 SHA512 7f23243a3cb3d6451ba4914c186a42896d071a304d95442cd230a5b1e48622809c5a20c33a8f5d4aa99a4f1636e7256648623c6fcbad8fa96a62ec0e0b8854c9
+DIST bytes-cast-0.2.0.crate 10006 BLAKE2B 8f6f8ddfea01e84de29b626682643e0c00baa6852ad6a869c1963ef8f2d60141adfaaf1f1d8e440c318f4ac1226fedee06d82a3df73ada5a02be19fff0de2d32 SHA512 70de77e9e8f33efe58d6883541b8762c0cbdfe6e401ed738104184fccc49cf2ec1d924f68123edaccc2b29c618eea245cdaad646498a41010044ebbec15bc186
 DIST bytes-cast-derive-0.1.0.crate 6477 BLAKE2B 1f5192d4ba994c483686c8b35dfa9b8d59936be48bd9478404361b0a3a405f9204d80ced4495ca1366c050e43267ff3fefe57428b974a79b3b2a75b30236abef SHA512 360ca8c763cb5486d4cccb19a1a8546858671aac145ff4b21261bc9e075b57f830ea00ca0c48c7de89de9ab757b06320c86e7621620eb83bc1d2e08c25b65065
 DIST cc-1.0.66.crate 53454 BLAKE2B fe34309ae50a3b022c36270a1dc819713f9d70e9ade2f421c33c542e865dc861e3b5191e8949de253515aef6878f786a6abe048391a819d09bf57f33054a90ce SHA512 b07a70f88fa0588fb0f6bc7376e985834672cc9914a0713afe01740af6bcf01821d15720d831e8b7ea8b42f5866dbd011a245997f35bf8febc3b13d66089723e
 DIST cfg-if-0.1.10.crate 7933 BLAKE2B 063a96ed176f34f788666b40adc483d147fc011dee941ab60569ddd0e57502b5dd06ed71090f4e14ce005d06e240500a286f74652615e9d068fba649610d8cf8 SHA512 9d22616bfb4a75770a828a0a3cddac6787297a5fdc53eb17e25811cc94de717f2de8bd66d53c5d65ba1c83d8892aefee5ae758cf56a1ef0a0c3120f70b244339
@@ -17,7 +19,9 @@ DIST cfg-if-1.0.0.crate 7934 BLAKE2B e99a5589c11d79d77a4537b34ce0a45d37b981c123b
 DIST chrono-0.4.19.crate 155663 BLAKE2B c92c273fb6475bbb2546dfb75eaa23321bc8f9a5fa8a7c652f527649b96ff8718fa932f52b500b02a4acae7837df5bdb14f69cb821d4962be2790dbd1d023a54 SHA512 a119349bfc2243a249f1d18b1ae548a04b30fecb75913a56f26d1ff8c0eb53097a2674d9141e2094018191cbbc1620843fbddaf52999824e077c1157f0907980
 DIST clap-2.33.3.crate 201925 BLAKE2B bec9c866481c5b3fddeb314f68af9bce38fc421e42816182de3209e8ea3447b72cf033e6251eea27fe974eff8085b7d98cdd2911b5cc0ec6b4bf4c750deb8a25 SHA512 3eb0fd648e2e3f9e5ff69a5e6cf0d867304fe18523accd036f28a86de368e4774088a6936c108ccc045092c539fe7f7494ea96420ebf6b4bec16880cea84bedf
 DIST const_fn-0.4.4.crate 16138 BLAKE2B 80885ad10a5649876d37635dc6eb8b426e68f23d7bfdac234ae32816e7fae6d246ff0657d904a3b18dc5ab93fcaa3d4ff28984a1144fa3557d082c1c4d064fd1 SHA512 d79f07982c8ead364f314672ed471d41c6f31431cf511eff5e4c42ebdde324842110ffb8238394d9e8ba2ac19d884fa5f359ba04cef83acb1ca9431e14acb030
+DIST cpufeatures-0.1.4.crate 10129 BLAKE2B a497cb23661b52c8627ec7a794a6ded37277ecc6aa3a405258e712cca4194811645947368ac5db4e22360f52a98205d9420de2288879635e5269e3de3aa684ea SHA512 8d6fbdf934359f4fa5f65df30801fef2ef1d011107884060b542a8f521c86ad3ce808f39bd78e971794a888d53df8dc045efc00e208df8c26ccaa9d951e5570c
 DIST cpython-0.5.2.crate 118024 BLAKE2B f50bfbc15b280cda22a7c7c47ec5453139fb8591b66c78de7897937296bb3805d7fd356ab09233293cedb5fe131699cf4517fcbf9b1ef61bb7ebb99d1c21e84a SHA512 9b2406afa2e309f9c748e42ac8d7d875b125e5cd40b8dc515c45ec87d1610bce50ab1ba2d95d7bec584de98e171377f08cb8a3ce0a0268383f030ed8631b728e
+DIST cpython-0.6.0.crate 120585 BLAKE2B e5d39cf53d982839125cc74f362974a8fa455f19094c6cd1955e9a7012dd2d4b6172e1a74a3fd609ca0063af48099b48f2f1fcd6f1ba903ee3127b5357165dc5 SHA512 d656b3671c5d50216f80d757278d2b25c91a6da659f65832fbc621b7aa2e5975318189e33139fa31d84dad1cf052fd7af2c6b1fa6287ab19dc4ec89939e537c5
 DIST crc32fast-1.2.1.crate 38172 BLAKE2B 80801a345f4c5ed8a5fd335bbf672eac1733a1c2b333dc8a8e0254338148ce7b34402201a8d2d7434dd1b057f33d99d3a8f02610ea50b54115d80bb8da28b2b0 SHA512 4c04236bb15a5c63b712c62652777917e947823abb20a0d0b372c850ec1c8695faa414e8de73904f1f1a296d7b00a6206cde8da404cf4cdaa2e8408e64b62b5e
 DIST crossbeam-channel-0.4.4.crate 86868 BLAKE2B 88629c72c0be41bb3a0d7dc92f6908d46cb397223449da5b2c990b7660e09dfd3e3f3fb708d13586f5dbf199d62f781f1f7e0b73d279de0ef810f7bcf25b3f27 SHA512 2933721d6af3126f492f112f3d662fc40fb49139a84c72d33b6c2b0aa94fe964acb302fe726e999be4292a1410d3ee896169a0434dccfbf44d166008719846d3
 DIST crossbeam-channel-0.5.0.crate 86811 BLAKE2B 9af4384f2b74d202971f1967887cfd0e71ddba9a6456ffbdfc80bf192d527f61242239d2eb6a0d9dcbe47be22eb414736976e6b1840c021610d96a3bf03c3d18 SHA512 838b433d48b84f1fea020a1d1324e366e6cdae30ef07396140f195afc45b8f705de6347d949b68ce1ed0708fe533ffaa2cfdedc9d2e6288a7325c188ccde9aa2
@@ -28,6 +32,7 @@ DIST crossbeam-utils-0.8.1.crate 35914 BLAKE2B 8d8e7e2df01f061d3596127dd62c1d531
 DIST ctor-0.1.16.crate 4770 BLAKE2B d1234c086e370d0f86b3ef7011c111a0e439c94ce0aa25bf16fde3496056d3143e5798b7eee1d47c72d90f564dbba06e49d9e7cd381597276c1789b47fbcd574 SHA512 68b4a39ff49bd1ccbbf467da5f376cffb68ca10290ee9c587b063f7281c84d36a5c93ae242702e2135b53178de984d99d4dc0c246d4fbd566b8e81b573f442b3
 DIST derive_more-0.99.11.crate 53812 BLAKE2B 84b97e9be1ad2ab0bcc7616cf6f75996dd9b67f0f9798fd4b80cc87568ec5dd3f782f2964fb82623dd0f249640c2eae69a3ecdb15719840c75a29b4ffdbfa788 SHA512 1a7957c440ae4ed62368bfce4d100475fcd02c8e2fcdb08143abbebf3746a4eafe29208cd9f2dd8872546cffccb17e29a2c2d2192d433e2829644ea0e9e8d020
 DIST difference-2.0.0.crate 147616 BLAKE2B d720202ba8d73fb9b3cc6a982208e4fbe22eda4b3e296f4238a7b2d8ed0339827ca5a3d93a983396901614a9eabe36a0baf55ecc5f55075ebf7fa1e4c0699eb2 SHA512 cc9956757770ecf237d8f46abef25ce219193c877be6cf83163e87c494956cca3202951ac01bba0728e7202fcde2261009c1b4599f389cf979858f25936a5482
+DIST digest-0.9.0.crate 13247 BLAKE2B c5f2fa8a5bc12021d99ea63f08fa8c8b5b3353d90cf9d58ba84252b3f81b88b52f28c15c24c61fcee44f7d547a0bad11def7fa8f4616d070db163e48f89ab64b SHA512 8637a322c429f51ecb0fa4c3b58fabef01368c1a093492fad65f48eeeec2366fd1b7876e6e47723e089ec5ce11f881bfe4dcebdc605811252b797db027746a45
 DIST either-1.6.1.crate 13641 BLAKE2B e5f40c40a5edb6dcb07a10bf79183cbe42438f1f70f3932dce72f6f6e91f75f24d17d82bc447507def4dad4345ffc9dd9162dde778afb253bdb1218e91887949 SHA512 4bfe56920e30cbc8eb4f90162db618f7dca653b42db35ab6a7045d3fd9a24ceb1778b1f79613850bdb1a87ad3794fa0d73015e46c48d513f368d8c3776fc9ddf
 DIST env_logger-0.7.1.crate 32281 BLAKE2B 6f1894c64f301ca4b687270c911dbe230f674662aa0561b97c4d2537886e404664b5773d4e223e2018047c222a951232c3cb52ec5bddbfb6665e34c3e7ea52f5 SHA512 604060d2ee83ab337a2d20d6784d1b7541534d2fd9e1662fc5c709fa681672a9db5e34d00face864b56ae321962e644ebe29fbb6d68a0d556419cf5d71c6149f
 DIST flate2-1.0.19.crate 73768 BLAKE2B 1cdce9db71ace32d45b90774cc0804f4f663d1193687e9487ffcb8b8962006c680449dcdabd296e1b1046bb3dc2d910a11106f24debea5c63f757b471fc33fa1 SHA512 6e802f351085ce8804afad32d9502980269e2c03e2315349b9dcdbbb6895f61c89fbde822e31504eb00d94e665e1a8186ea3d128b5b612c61323494a8dd4332e
@@ -35,6 +40,7 @@ DIST format-bytes-0.2.2.crate 6532 BLAKE2B 81d77323851ca2c2d722709846a53d15a4031
 DIST format-bytes-macros-0.3.0.crate 3434 BLAKE2B 24a11e9ebd57ea6a645e13d5190b269fd4a1a5174e77aed519097e677520488331bf84904370452870f96aabd77be901b57eb6a096ce56ae259bfc816be34f59 SHA512 e775b156ed51b81850d949952f8ee02fb7cfd9c1f98ce6d92462b589646cf60482ff8bc442006d27c031729cd7b3082238da5829bada5e1aabdd163bedf45962
 DIST fuchsia-cprng-0.1.1.crate 2950 BLAKE2B 8519407ab5d1f04d03cc946a07050db4dd7bc70e03894e35b9e66910a3be11224084a86ba45103fdec845e94b7ba4defbd7c5217b035a0796c0c4a94b9562cd7 SHA512 ea9f5beb0dfcb023c22cfc2b37ce52dfcf3a2cbbed0f79ffffc332878858386805c65dce8469a431002367562d857a6c064e075688540c27fcb4056a110059d2
 DIST gcc-0.3.55.crate 37262 BLAKE2B 3341dc7136c14fa822a67fdeb72f7ea50b1264823e695e189d69604b8b8cce898ee2d40d8a536d0f520f5e190576afde16afa5d9cbe0a2c4b8600cf50bbd1447 SHA512 b045b60cf65c1deae44e4f40d0f511dab05c82be5065390dfbdaf5b51ee2d0653c3a6d8d1e7606e4bb6d234adfd22a8c68bde724406f3edb4bb6366617d46a86
+DIST generic-array-0.14.4.crate 28916 BLAKE2B 41adcb738bb316d17967e029a829dcf7377427977309b010c2f2e365f16306b44991eb5f65698782497f614b129b14cad11bfeba2ae19b45efd117114492517e SHA512 34ac71fee2cd50ff786d39b4abacd9e090a8598baf4dc36ba5fecfb7171cd8e4f58e5360cbb0baf02a87eea26b7dca85b35555b82bbefe06635d2fd38f7b8b40
 DIST getrandom-0.1.15.crate 24786 BLAKE2B 868817d62ee44fa5bbf54f9af0bd71a29503f92bc93e190a834f4ebdb8eb73dd29e175c661f9964298987949c0b82a53e99080cbe4090fc9c5453daea4b05595 SHA512 b26d9558554058f8a54b03f56f488db5ebad2d5cc84f737e489f8f532f8464ef9038d104173eb30acca61caa1f99e1ce267bc493c01ba1611b829e0a090cc87f
 DIST glob-0.3.0.crate 18724 BLAKE2B 1f1dd380e7d668a0c2cff9134279ebda958b4bccdd4a65ff01f9665b45ec4cce8ffbd47eb46e52cf516c5fd5803561e6bcb60cdee21ddfbb8601a95d45500620 SHA512 87098ffdbc518442995c422120cef71f83069c8f88a1970ecec5105b0f284ddd92bcee929f5c230d5b90ae1ead7e1214c3eea26f4a8b26715a00c1ab8b09bc46
 DIST hermit-abi-0.1.17.crate 10065 BLAKE2B 79aeac5f72873a29b53368fb01ed4288224692cc7c55221633775641ade40693bf3fb44db22cbe4422a74d1d6330450110f21b586426b6fb8ef93f116476c644 SHA512 1ed4688f2cc1f1d5ba2f7637e2a9dc230712ce8907e1fa3d95ae374cd4b67a325138a98f2a524cb03f99625775057aa0370f480a73ab20485f0456e2f108baf2
@@ -53,14 +59,17 @@ DIST memmap-0.7.0.crate 15214 BLAKE2B 44a5bde9b85b2c378fd4c6ebfaa322ef8d0076472d
 DIST memoffset-0.6.1.crate 7706 BLAKE2B 351e6ff24a61b1016e7749571e1e66dae370c58746baf00b4688bb1e2d8c88621aa6f135468593bcd8ba30acf2c097d06a0dd7243eb06b9825e3fc1ffd31ea52 SHA512 74d081af00b7e442198b786d79e4ef35c243d2e78347ab9cb50e127569aed3fd77b47b95df6f361a716abce27c8cc6cb1dfa12c92b0b2208b21f9eb9527b61be
 DIST mercurial-5.8.1.tar.gz 7988000 BLAKE2B 7805a7141a503f8533a25d0cfd3c58c421c966cb9ec83503c855e02aeb8a7fff98bf529f4807bf6fc5f606ae110c4a0571e0e249441bd4be6b5eefb07284958e SHA512 d17c809fc48c55d646b677ad23b5cf4a1755f5a81790988109cd50ac259acc230edad7bf5ccc7a6384a490aeba4a7492327bb9878a541d5fa7207e2c378be966
 DIST mercurial-5.8.tar.gz 7985326 BLAKE2B 3b64343b692c389368b9c61baf367fe739bb79a7b555308fcd4f09069472b393343f57608954017038c849d6812cd6fe5e1e20bbc6a95974d827d7e402c60bd7 SHA512 79eec3a468a1826d4910d140797f26f281ff5e5fb9a0e09656d458577e05cf11ac6032c0d282aeec2996edbd7af954652c97097ea4485b211dad7424c4d20979
+DIST mercurial-5.9.1.tar.gz 8120006 BLAKE2B e482f8b38d864f5a371d94a28393a873d98f4353bd8201d2b5a5c073b7fb48de7e7e66dc06d315a1fa0fad79526432f372f6406ca25a5ff4f84e2c0db521d873 SHA512 2fe734ff707a73d2537af0b0c98e1142fa52b41f7ec4d5572cc5a8479f2d081e69de8b3dd136915d84cde4283f239e0519435c1dfd861824e3021c4c78cd305f
 DIST micro-timer-0.3.1.crate 3357 BLAKE2B 13c518d2b3de6fa683078b9906b719498da2e2be5a23e7a2511f3d1d69730769031ed6b488927bec845c0405782f55cfe5af8610d56d92e716ff5d9056650f5a SHA512 197beadbdf35dd0892f6e0c1a09b6b57472166ecaec3e10be12c436e1381540100092c9e717684db44b53375390cf2c245fdc6fdb376117fdf5b4405ade73cf7
 DIST micro-timer-macros-0.3.1.crate 2928 BLAKE2B 148639d1f22965c7487fefd19b1413797aad0f9e0c4eb8ee7be181e7b6bd39e03a6d3d68131b05e09f87a3ef653d6eda643952025983b49736a9c6ddb778aafa SHA512 9c9ffc8432c9377d2de3fce931f398d7f77012f496dd6c011718abd46535205766d9f5a7c97ff14ecd87bb172039d8e92a8c45cfd9c14d220a368448da1b7917
 DIST miniz_oxide-0.4.3.crate 50058 BLAKE2B bc7a152a984de061803c11255459ce3d8fa64dd5b38de9f2ed29213abc1922d68746ff523de3b99e0e95a8933ea75448a9fa1e14cbbe248549074cd5ce7b3c1d SHA512 8c0e2b3a585a0986a61977d4459adb1a7c396ab53f4f688dcbeb2a09c60878b0423f54fd1879c190f5c64690a2473ed2a07d4162a650f6c39f402f6b27e863b7
 DIST num-integer-0.1.44.crate 22216 BLAKE2B e1c08427e006cde6f2084adadb6086e87e6d6f8bb8dfa757a8228aa671e862a366e4bd8ca5e0500008c18bab128aead9bd5b1e53568a4f40afadcaf3882ee98f SHA512 d07e27ede02a1d007373935fd91e57a26e0e84ae14bbe24be66763baae6850788bd64ad2598d2bde4f4fad6c8a4675c40bfe0927164b16b9b69de5e9a83d9771
 DIST num-traits-0.2.14.crate 45476 BLAKE2B ae310d9d5640acc3e45e1e5d1d2f519539795922c0058ee940c94c94b6654b39358b7c18dd23a276f2c1b16a30dd4de4cbc8575bcda6a5c11e70665d670e6439 SHA512 c3028eca9f7b718de0db3a36cf3e462bdba43562d52c9b809ed4cc0aa6af403aea542d6d4da743cd1dd541397815a3c5a84cef4d6e40122994e4be6a62319b2e
 DIST num_cpus-1.13.0.crate 14704 BLAKE2B e7a26e597ad5e45309393a9500b031ba64a77831320cbb96d7861139a2f7a453b7ba06a3255439b43ac1e2e36269b0a350d514020d3cd82c2513b57934b3ebbc SHA512 e75ec298fa682be84bf4efb6cf40126da9233ef25f07e887c2fa7421ee78790204564e6406c8219466651f47421e27f69eca690bb9cdfc982b644d78cc10de3f
+DIST opaque-debug-0.3.0.crate 5767 BLAKE2B fb5d32c876a271b41582563f5d6978d75bc1cba2cc34167f491bc198e6eded45b9dea65effa3aa972ede20978808b37ad1aadb6837f926fa3378ffd382076d41 SHA512 9909b06668a4f97b4d0e916de3e1d0a922a5a0b911a7ce190de786f62ceaccd382cbd0dbe01ab0f15e5472c10848482da2307a6d897928b6b7d5365bc0321cae
 DIST output_vt100-0.1.2.crate 4062 BLAKE2B eed08c0a1800560d4f623f451d818e3c7f0dcd72fa99f4e5e6dd4934e50a9649011ec955e06728fd017d58bb9f36cecbeb9b4aa8c13c040225c24019f774e63a SHA512 b8eb00a541bebef2e0bb44975c4547fadfd4ab88a14aa8e31945f3c73531a550cf5729f1f3d18fae5cf36286b82d1a54fb08b28720f1592ab6cfe0814c8d3036
 DIST paste-0.1.18.crate 12259 BLAKE2B ed72b93a27166b0989743c2528d4a41f4b87ffdd0c588557d11a5f37f85d5b8f03ced86150af6209f9fa8d0f6efee705769b26a2f4dc3363f35cc3ac12c0e6ad SHA512 a4d9c75f6f358d6c86eb0a66cdf22eedec180db37358ca2870a992e215d5b389b7991837d8f2769742ac1b093674cb4352ef9d6754a249253472fbcb3a81c001
+DIST paste-1.0.5.crate 17669 BLAKE2B fa8eafd98dec09e488cb7ce0600c18554887249f1f1dd4c4cf3d1902b7ace184324a4b9afe16a7f16bbbac0d7b15885649bcf8a33473413e37fcfe3fa1b57c4a SHA512 c363e56e1b9bc2e401827c292625951cf577ede568033cee53da2ec2383c4ca17082b52b82477c48d65881a8c76f535a66768022d1eae2cd5f55218dbfb9be22
 DIST paste-impl-0.1.18.crate 9451 BLAKE2B e465c4c7eef44d02eb1b61b5290090513607b452f4adc11487947b7047ddc44905d7a02df827feb2142f0e74583afdd9648c1c66086f10e1bd861b663200bf8c SHA512 c635efee46cb251b76ee9427432f81a0d944cdf1d0a95693d824c6085e7dea7e1e3f48c692ae27946f69e4e78d8080220058acf98e5c8a78482007349f8a7a4b
 DIST pkg-config-0.3.19.crate 15451 BLAKE2B dc23b5ef12719b4b3d2fc5c93c087399ba954a5e127be91b26619466d5d7422e71684d02905304dca65273d69b66338d94c0642e3810a14df845ef507ddc0bfb SHA512 42bc13c4e39c8f71690db527d815884acdfd2ccf5fbfea700c6ed60257e852cdcb1c443e7774409e51da53612b0ff0aa165554b99fd0cba973f94a8df52982d9
 DIST ppv-lite86-0.2.10.crate 20915 BLAKE2B 83a075381c24b2b89f5266929f5672ce051c3781c1a199252738dadbf471618c8b87452ce84e1cd87a9eac11b44107002894f544091210cc7e77bf52c045288e SHA512 c9941052e504b9b310024064026e4b1d540dd877705ef450a833d9ff6dee70ba874cdad68c46381a71d5b54482cd80b3dbb8e0c225758fd339069031a55195f1
@@ -68,7 +77,9 @@ DIST pretty_assertions-0.6.1.crate 61551 BLAKE2B 1e92be2282e42720c9e1d1d26f9e675
 DIST proc-macro-hack-0.5.19.crate 15556 BLAKE2B 98c22fc3e5f5fa8b6f44d15de42b6ffcc82ba3f98a07ffa48bcbc5d3abcfca6af136c5d0d8c7f1ca34261ed8f8c9c17a394231f97a4c342c81aa7f8b9e74b203 SHA512 9e4cbec41056438287f5b23086264c86e2f0cdc193064006556736377b2954229de13a585149b9995002c9aee3334ee2a80ae4afdcc96cabe7ed2bf718476952
 DIST proc-macro2-1.0.24.crate 37716 BLAKE2B e2bdbc7cc9ea254529e322f6a2eb44002b4994fc4a00df32012f66740e8e73ae70820dd40b7fcfcf024f3c7784ab9add5cc1db37f4c72d5af5c8f00164ebc145 SHA512 c3d23a5136c55d734084ce1d76d54f237fc1003074af102c2ad96d851ac496ffc7513ddc505a68af4051c9d6de09725a0ecb6e76ebcdd77a1c056f8f9242c9be
 DIST python27-sys-0.5.2.crate 37459 BLAKE2B a122bf29fbb16b46876c885811219e08376f666e385055ddc4976a0ba9a7d90954143a55a68033113d1e52375bdba68519fbade2cc8bba56174ada9e89448790 SHA512 670087e6edf55084fbe005f33baddd7936900f18753181288d9fb06deec56bc09cb78cd2ec2c94529be5ae603b95de364ea7f92e5d4cd2aad727672fe96754ec
+DIST python27-sys-0.6.0.crate 37198 BLAKE2B 9d35f3ceb1be97d9404d5a3de6419696a13a941522701b6b6506a3f8e936ead2046eeb62986a70fa35fd5283c451379288b80d5ce1bc358ff1b57365368023bc SHA512 8104d7675ef9e92d17bcb34b2e7919a5dd7163be3fee66f4802c99153787a2d38f3959bb72f8d975e2cbca3d35949408d1911bc79e31b20905a5ee173775504d
 DIST python3-sys-0.5.2.crate 44605 BLAKE2B 72e68e32334e709bb291ef609b1da2f123cb0f080f6bc517bedc9eb46ae68fe37b6fe4655aca9b478a65726f03097ef6400c351b7a301885e019fa45328161d2 SHA512 abcc7624b5c8b018f553c5971414a33974e759056b50a20883c98168e790b26b94287f111fa1e00c6c78841cc5cc1a7462262462e6a9e72e5991140b729d4046
+DIST python3-sys-0.6.0.crate 44905 BLAKE2B 2cd2d4379182a5af623fa7b1f35c4c999a02235600d669e717e34e7550161ff5702f300d84bb148790cbc3517a1f1c4d34e61af71f24a85b111d2f09682f23bc SHA512 c5fa01dffd12aa95794c71798de21ac8619c42da2b6f408203032d6c4d1c17b72716cab7c54e981fb1eb1983dbaf0a845c6294893058c2ce2ce818e5378e72fd
 DIST quick-error-1.2.3.crate 15066 BLAKE2B 1c61525d383f3588c1c5017f016f60b484bbf2035e7f63c553bd9a49b638ab0c6106ac3676a41072b24da4e13dde78706e0f99fd1ec9ee329d5be81d45a85866 SHA512 f8aaf9024d20ccd42b706c756eed8320aee339f8776392b47a41cc82ca06b03df1a5b1f00854cea96689c5af261b4d8c5d2b1a242d10f2755e7e33dc41be35b9
 DIST quote-1.0.7.crate 25170 BLAKE2B 9597c94ac365bb6e9d632738a88ece2da7818cb9f3fa0e755324e693eb513c76347032737025375a486319caad13c22ae13bcb257703eacdf2fdc755cbac0de2 SHA512 b7cb576c07419854f71072a88e4216f50d78196703d3d8a1068dfd0f2ccb1e417c3a865ec3be613b46e74e46654f64378f527800701f74d50352cb766a885953
 DIST rand-0.3.23.crate 11318 BLAKE2B 5ad9b187fcdfc515c606a73bd1e9aa3215e367659c35a013c9d4d0f80f9832331dfb971ca370a627c0a2afe2b8860514740e00b1d7572e221a557b5570cff6ff SHA512 a4f46fb7dfe39677dfc112eeb56fb3c28cec4cdaaf95f336f2a494f0b2b30fdf22ceb9ea956f90e13c7ffe711a68aef9fc1a80d9a911d93221ae263c243fb2c3
@@ -93,6 +104,7 @@ DIST rust-crypto-0.2.36.crate 857879 BLAKE2B c486a2e43eb9ac9d2558bb39a249dcd689e
 DIST rustc-serialize-0.3.24.crate 45926 BLAKE2B 11dee8dac7eb007067ee0eb19d122bf45d912e6cefa95fd5ae3db7a4585a3f37e66b123c8c7bb761cc451b402cb9191dd5c974618331bb9aa9efbe9215115abc SHA512 60b40a0b41678287627cf5898e0ff6ac5668865f1ce5a482190ecd7539b59a955a73c675fedac76e68a5126efb92ff0cf1d1b4f24359a932463434bb76d9e884
 DIST same-file-1.0.6.crate 10183 BLAKE2B a320c8343e0b38078ba81c4f0159d886bf47764c74efe0d7cd2b3218426e8341b51e523c00a9e5fbc2ee1057618296bd70b576c68751bd55d6ddb352defaca15 SHA512 3ba35309742c8db63210d9ea78bff4ecd80471d69e6238eb96c7bf0673814f221e2d838fe6311bfc5a0e71b4a7ccba33e07859c0b9cff2171969ff08a4214a7c
 DIST scopeguard-1.1.0.crate 11470 BLAKE2B f774eb90b7d3ffb2efba47518e9d1dead4017ab4b38a4bd74914daa84a5af4bf9eb63da0496e3924499d79cd0439c37447aeda4a21226f95645bddcd6becfabe SHA512 368fa5726df8f42b599993681579a9ffd0196480ee3cd0f9f671e8493f3bedd1e1779bdf2beb329e77e0005fa09b816e3385f309490c0f2781568db275d4d17d
+DIST sha-1-0.9.6.crate 13758 BLAKE2B 8199c2cbdab2954edd44aae6bee8fdbaa883f27993722845179aa2117849c5ea86df08ef58da514d0bb78612381977f9d101928a764a62b8b14ac04e86e83d6b SHA512 10a37e30b0c65cdb64a49e14185faf7d0bb776910f87c5dff128674762b4375aa1f9f2bf90b38ef37c521ad365d3a2f02c0e33157593fac15fecf9b33a5fa9fc
 DIST sized-chunks-0.6.2.crate 40265 BLAKE2B eb02254a9feaf421460130345969ac244f8b46a536f6eae27e9fe55133ab6149f545864bacee70d839a492b81b790a9eb74a0f31f44c6f2d6ce7f470a6a2eb48 SHA512 524eb5ca27cbadc6b3a2ee32e4968308ab7fd01c961511b2c783338fbc0435303a607d92c2066a9dc1fe1772ccfdc0a97875da9a929e7cfcbbb8d0647768d26d
 DIST static_assertions-1.1.0.crate 18480 BLAKE2B 358dd5ac413d06f62da0388e2016c5fcb8ec68fd7dceb0dbbcb97665c032b7509b7e083c20701648b6a9174485f117c02682ae4bde7ef037e80a85cdf6a0c86e SHA512 46d0e35f77941dee6f60f574c130472248063dc38494c1c4f84f7c048244cc2a58a86fe17c0990e3f0f01406b75ed385a13d00058612b27cf0e867c8d31c92ee
 DIST strsim-0.8.0.crate 9309 BLAKE2B 40a8be506c43ee1ffe006ddc7dee98c3d418bdd205d57b78f5d1e4c9312feb57e1eaf952e02d92d4e0932db240c6fba45beb06ea8c4fc6de1cf1faa8b6a3a939 SHA512 1d55a8d946cd55f5f37d06aea536549ded95739fa58c0f2da285a0041154c181f663682bdcac643aa198b3e762d694a04f058db985c62ebe22b5c16327ba6d34
@@ -119,7 +131,8 @@ DIST winapi-x86_64-pc-windows-gnu-0.4.0.crate 2947998 BLAKE2B 2ad1ea8b5fa07d544e
 DIST zstd-0.5.3+zstd.1.4.5.crate 26013 BLAKE2B 033e839622b8403268a1a98c2f525b4f6dc624378e64fd644e09cd1b11a8751c1097f134a5f40793a8a6b57635ad28ba3534dfc48e7ec818873dd4819311c80b SHA512 cb6d2adbb3d400ffec19ce7c942b47a0e5826ed62bb8de195b0e8817b4a1e00c1569a080457452180cf869b7bd99fdb150e4a981a992f977b2dbd03eb5a073ff
 DIST zstd-safe-2.0.5+zstd.1.4.5.crate 9002 BLAKE2B bf92884b629d5685dd563e481e63c67dd4c6aff52a402e0ec4f675cb40dad1f9e5ab675b45d4f326bfd0f75a22673ad8538b2924c4bb6220cb1fe23fce2262fe SHA512 cb4b33059da628e103a0fc9a83217fe96f5201cc9db0572b3c2d102b181dc29c346aea12ddec902ecf36886fcb6a2177155791d00ee2fbb267ddf84a48d3c2c6
 DIST zstd-sys-1.4.17+zstd.1.4.5.crate 2046794 BLAKE2B 40584094797d4cc479cff9d1b89abd1f7e800f774725dc03c531b67078027d5b82464984d4e2a76cabcd9d336234d245f93692d0111e2469ef21ca1ea6260d77 SHA512 89439b20e4e0bce6455d982fb7467c45436ee68572395db662d056eb2e09e95ad600947bf11c27ba60b161c2e2511e04cac8dcfacc5f85fcf9222d4a206bdc30
-EBUILD mercurial-5.8.1.ebuild 6573 BLAKE2B db6593d8feeb6697eb8756008488629d637f6f54ae424b204012dcbbec25a822d7ee15141a3c0f8df1c39e98c041f7c3eee4708933add8d8cdb6532f570fe45e SHA512 7ecd993c98396298810f1fc4d1aea0c08ccd949ecd1e8805958525e996db7ffc3c24d57909d9b8510794b4037d31286f5923595288adc6df9d6d9d81278f0fd1
+EBUILD mercurial-5.8.1.ebuild 6570 BLAKE2B 6c241b207435f5e05d3e1e96ca198287a546cf3e7a5b77b7d42dd48fff7edd1dfce4149eb7c32f7735c8f8cb36c16f5d62942cf5e197da59ec022cf7e6d07f17 SHA512 5460def2a230fb17a20ecaf938d4ec01ad17b3b45b613d103a6a551f61d7802651d2eb06758f95942be5472c442d1b022ea4e5e870ab6f467c1568d17485d108
 EBUILD mercurial-5.8.ebuild 6725 BLAKE2B 58728901788b4055ca9283ecdad0bb1225baa98ae814c5807ed3bd2fb77100f2ba2e6678630bbc4736e9522254bd3098bcce5f0aa764d35f7187ed65fd958171 SHA512 570f8c6b535bc7d8d68da878f179388c15a75a6edb37ef4e0de0e78ef7ceaf32452ea603624ad980fb0f9bbbb32cc610f0e84897927ccc3351345ecc0961a67d
-EBUILD mercurial-9999.ebuild 4246 BLAKE2B 0e975acf5ad01cf1ff7fcba3e7ddf8a21752d72a35faf7cdee242f3dd579b48b7ecb8c745bb5da4fc713f4222ea2bb9c59134477723c2a4960a33148fea8ddb0 SHA512 0347db61939c870577c2beb0a67e6451d359cc7ba43c4a7217e0904680b90148a5d0093137c683333e6abce95623e13d8b9cc21c4112ef77c0e7de2600c4a079
+EBUILD mercurial-5.9.1.ebuild 6578 BLAKE2B f0d99ac4fa4be28c412e079e5555022d04b6df9f21a7c7d24ed6e1df2553a13c10c92428ff6b007af871d7cebd6e1c6f2f25408e82d5f3aee19caebc3bd6045d SHA512 51c164dc46ae4f2a3b931735df3ceb720272e4c3bc99bc4e5405a57fd4d28ee624f747f7f535aa7e85f483cba0d258c8e4695ae4f2d8fb973f8553eea859959a
+EBUILD mercurial-9999.ebuild 4323 BLAKE2B 79df61d71aad73073e513cb5e9b2417d62cffdf1358a5c92f4295df8c64e6ac693ab934c9efc6812a81516cf3e71efdef59efa0fe722d4bb769b3d47400ff07f SHA512 6476fadf553ac6d9c82ec0b5af41c41f0183840374e3e0e9ef007bfbee43efab60c2e9da3c6d792daeb223a6a7755aecf99ed97746b633bb489712426fd8d40c
 MISC metadata.xml 531 BLAKE2B a9536112ae921c160f7ac8535c50cb25743fa72bfa92529874eb5888c7d968d68080e4516c531143870cefdc7d78efa7e816b042c540bd0c7785a34dfcc133f9 SHA512 ee4dae2ce506e6c5968f1d917e43839366eefec2ba7ad3119b8a61ee527449fbeb87b51bea2b826ef184bfa322825b4e8bf7693d26d063e117773ac9d15fbc08
diff --git a/dev-vcs/mercurial/mercurial-5.8.1.ebuild b/dev-vcs/mercurial/mercurial-5.8.1.ebuild
index 2fffa7f4bcff..40001869a2f6 100644
--- a/dev-vcs/mercurial/mercurial-5.8.1.ebuild
+++ b/dev-vcs/mercurial/mercurial-5.8.1.ebuild
@@ -137,7 +137,7 @@ SRC_URI="https://www.mercurial-scm.org/release/${P}.tar.gz
 LICENSE="GPL-2+
 	rust? ( BSD Apache-2.0 Apache-2.0-with-LLVM-exceptions BSD-2 ISC MIT PSF-2 Unlicense )"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="+chg emacs gpg test tk rust"
 
 BDEPEND="rust? ( ${RUST_DEPEND} )"
diff --git a/dev-vcs/mercurial/mercurial-5.9.1.ebuild b/dev-vcs/mercurial/mercurial-5.9.1.ebuild
new file mode 100644
index 000000000000..bcba2835a327
--- /dev/null
+++ b/dev-vcs/mercurial/mercurial-5.9.1.ebuild
@@ -0,0 +1,303 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{7..10} )
+PYTHON_REQ_USE="threads(+)"
+DISTUTILS_USE_SETUPTOOLS=no
+CARGO_OPTIONAL=1
+
+CRATES="
+	adler-0.2.3
+	aho-corasick-0.7.15
+	ansi_term-0.11.0
+	atty-0.2.14
+	autocfg-1.0.1
+	bitflags-1.2.1
+	bitmaps-2.1.0
+	block-buffer-0.9.0
+	byteorder-1.3.4
+	bytes-cast-0.2.0
+	bytes-cast-derive-0.1.0
+	cc-1.0.66
+	cfg-if-0.1.10
+	cfg-if-1.0.0
+	chrono-0.4.19
+	clap-2.33.3
+	const_fn-0.4.4
+	cpufeatures-0.1.4
+	cpython-0.6.0
+	crc32fast-1.2.1
+	crossbeam-channel-0.4.4
+	crossbeam-channel-0.5.0
+	crossbeam-deque-0.8.0
+	crossbeam-epoch-0.9.1
+	crossbeam-utils-0.7.2
+	crossbeam-utils-0.8.1
+	ctor-0.1.16
+	derive_more-0.99.11
+	difference-2.0.0
+	digest-0.9.0
+	either-1.6.1
+	env_logger-0.7.1
+	flate2-1.0.19
+	format-bytes-0.2.2
+	format-bytes-macros-0.3.0
+	generic-array-0.14.4
+	getrandom-0.1.15
+	glob-0.3.0
+	hermit-abi-0.1.17
+	home-0.5.3
+	humantime-1.3.0
+	im-rc-15.0.0
+	itertools-0.9.0
+	jobserver-0.1.21
+	lazy_static-1.4.0
+	libc-0.2.81
+	libz-sys-1.1.2
+	log-0.4.11
+	maybe-uninit-2.0.0
+	memchr-2.3.4
+	memmap-0.7.0
+	memoffset-0.6.1
+	micro-timer-0.3.1
+	micro-timer-macros-0.3.1
+	miniz_oxide-0.4.3
+	num-integer-0.1.44
+	num-traits-0.2.14
+	num_cpus-1.13.0
+	opaque-debug-0.3.0
+	output_vt100-0.1.2
+	paste-1.0.5
+	pkg-config-0.3.19
+	ppv-lite86-0.2.10
+	pretty_assertions-0.6.1
+	proc-macro-hack-0.5.19
+	proc-macro2-1.0.24
+	python27-sys-0.6.0
+	python3-sys-0.6.0
+	quick-error-1.2.3
+	quote-1.0.7
+	rand-0.7.3
+	rand_chacha-0.2.2
+	rand_core-0.5.1
+	rand_distr-0.2.2
+	rand_hc-0.2.0
+	rand_pcg-0.2.1
+	rand_xoshiro-0.4.0
+	rayon-1.5.0
+	rayon-core-1.9.0
+	redox_syscall-0.1.57
+	regex-1.4.2
+	regex-syntax-0.6.21
+	remove_dir_all-0.5.3
+	same-file-1.0.6
+	scopeguard-1.1.0
+	sha-1-0.9.6
+	sized-chunks-0.6.2
+	static_assertions-1.1.0
+	strsim-0.8.0
+	syn-1.0.54
+	tempfile-3.1.0
+	termcolor-1.1.2
+	textwrap-0.11.0
+	thread_local-1.0.1
+	time-0.1.44
+	twox-hash-1.6.0
+	typenum-1.12.0
+	unicode-width-0.1.8
+	unicode-xid-0.2.1
+	users-0.11.0
+	vcpkg-0.2.11
+	vec_map-0.8.2
+	version_check-0.9.2
+	wasi-0.9.0+wasi-snapshot-preview1
+	wasi-0.10.0+wasi-snapshot-preview1
+	winapi-0.3.9
+	winapi-i686-pc-windows-gnu-0.4.0
+	winapi-util-0.1.5
+	winapi-x86_64-pc-windows-gnu-0.4.0
+	zstd-0.5.3+zstd.1.4.5
+	zstd-safe-2.0.5+zstd.1.4.5
+	zstd-sys-1.4.17+zstd.1.4.5
+"
+
+inherit bash-completion-r1 cargo elisp-common distutils-r1 flag-o-matic multiprocessing
+
+DESCRIPTION="Scalable distributed SCM"
+HOMEPAGE="https://www.mercurial-scm.org/"
+SRC_URI="https://www.mercurial-scm.org/release/${P}.tar.gz
+	rust? ( $(cargo_crate_uris ${CRATES}) )"
+
+LICENSE="GPL-2+
+	rust? ( BSD Apache-2.0 Apache-2.0-with-LLVM-exceptions BSD-2 ISC MIT PSF-2 Unlicense )"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="+chg emacs gpg test tk rust"
+
+BDEPEND="rust? ( ${RUST_DEPEND} )"
+RDEPEND="
+	app-misc/ca-certificates
+	gpg? ( app-crypt/gnupg )
+	tk? ( dev-lang/tk )"
+
+DEPEND="emacs? ( >=app-editors/emacs-23.1:* )
+	test? (
+		app-arch/unzip
+		dev-python/pygments[${PYTHON_USEDEP}]
+		)"
+
+SITEFILE="70${PN}-gentoo.el"
+
+RESTRICT="!test? ( test )"
+
+src_unpack() {
+	default_src_unpack
+	if use rust; then
+		local S="${S}/rust/hg-cpython"
+		cargo_src_unpack
+	fi
+}
+
+python_prepare_all() {
+	# fix up logic that won't work in Gentoo Prefix (also won't outside in
+	# certain cases), bug #362891
+	sed -i -e 's:xcodebuild:nocodebuild:' setup.py || die
+	sed -i -e 's/__APPLE__/__NO_APPLE__/g' mercurial/cext/osutil.c || die
+
+	distutils-r1_python_prepare_all
+}
+
+src_compile() {
+	if use rust; then
+		pushd rust/hg-cpython || die
+		cargo_src_compile --no-default-features --features python3 --jobs $(makeopts_jobs)
+		popd
+	fi
+	distutils-r1_src_compile
+}
+
+python_compile() {
+	filter-flags -ftracer -ftree-vectorize
+	if use rust; then
+		local -x HGWITHRUSTEXT="cpython"
+	fi
+	distutils-r1_python_compile build_ext
+}
+
+python_compile_all() {
+	rm -r contrib/win32 || die
+	if use chg; then
+		emake -C contrib/chg
+	fi
+	if use emacs; then
+		cd contrib || die
+		elisp-compile mercurial.el || die "elisp-compile failed!"
+	fi
+}
+
+src_install() {
+	distutils-r1_src_install
+}
+
+python_install() {
+	if use rust; then
+		local -x HGWITHRUSTEXT="cpython"
+	fi
+	distutils-r1_python_install build_ext
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+
+	newbashcomp contrib/bash_completion hg
+
+	insinto /usr/share/zsh/site-functions
+	newins contrib/zsh_completion _hg
+
+	dobin hgeditor
+	if use tk; then
+		dobin contrib/hgk
+	fi
+	python_foreach_impl python_doscript contrib/hg-ssh
+
+	if use emacs; then
+		elisp-install ${PN} contrib/mercurial.el* || die "elisp-install failed!"
+		elisp-site-file-install "${FILESDIR}"/${SITEFILE}
+	fi
+
+	local RM_CONTRIB=( hgk hg-ssh bash_completion zsh_completion plan9 *.el )
+
+	if use chg; then
+		dobin contrib/chg/chg
+		doman contrib/chg/chg.1
+		RM_CONTRIB+=( chg )
+	fi
+
+	for f in ${RM_CONTRIB[@]}; do
+		rm -rf contrib/${f} || die
+	done
+
+	dodoc -r contrib
+	docompress -x /usr/share/doc/${PF}/contrib
+	doman doc/*.?
+	dodoc CONTRIBUTORS hgweb.cgi
+
+	insinto /etc/mercurial/hgrc.d
+	doins "${FILESDIR}/cacerts.rc"
+}
+
+src_test() {
+	pushd tests &>/dev/null || die
+	rm -rf *svn*			# Subversion tests fail with 1.5
+	rm -f test-archive*		# Fails due to verbose tar output changes
+	rm -f test-convert-baz*		# GNU Arch baz
+	rm -f test-convert-cvs*		# CVS
+	rm -f test-convert-darcs*	# Darcs
+	rm -f test-convert-git*		# git
+	rm -f test-convert-mtn*		# monotone
+	rm -f test-convert-tla*		# GNU Arch tla
+	rm -f test-largefiles*		# tends to time out
+	rm -f test-https*			# requires to support tls1.0
+	rm -rf test-removeemptydirs*	# requires access to access parent directories
+	if [[ ${EUID} -eq 0 ]]; then
+		einfo "Removing tests which require user privileges to succeed"
+		rm -f test-convert*
+		rm -f test-lock-badness*
+		rm -f test-permissions*
+		rm -f test-pull-permission*
+		rm -f test-journal-exists*
+		rm -f test-repair-strip*
+	fi
+
+	popd &>/dev/null || die
+	distutils-r1_src_test
+}
+
+python_test() {
+	local TEST_DIR
+
+	distutils_install_for_testing
+	cd tests || die
+	"${PYTHON}" run-tests.py \
+		--jobs $(makeopts_jobs) \
+		--timeout 0 \
+		|| die "Tests fail with ${EPYTHON}"
+}
+
+pkg_postinst() {
+	use emacs && elisp-site-regen
+
+	elog "If you want to convert repositories from other tools using convert"
+	elog "extension please install correct tool:"
+	elog "  dev-vcs/cvs"
+	elog "  dev-vcs/darcs"
+	elog "  dev-vcs/git"
+	elog "  dev-vcs/monotone"
+	elog "  dev-vcs/subversion"
+}
+
+pkg_postrm() {
+	use emacs && elisp-site-regen
+}
diff --git a/dev-vcs/mercurial/mercurial-9999.ebuild b/dev-vcs/mercurial/mercurial-9999.ebuild
index 1fa18749e4a6..5d9e3029059d 100644
--- a/dev-vcs/mercurial/mercurial-9999.ebuild
+++ b/dev-vcs/mercurial/mercurial-9999.ebuild
@@ -148,6 +148,7 @@ src_test() {
 	rm -f test-convert-tla*		# GNU Arch tla
 	rm -f test-largefiles*		# tends to time out
 	rm -f test-https*			# requires to support tls1.0
+	rm -rf test-removeemptydirs*	# requires access to access parent directories
 	if [[ ${EUID} -eq 0 ]]; then
 		einfo "Removing tests which require user privileges to succeed"
 		rm -f test-convert*