gentoo resync : 08.07.2021

61 files changed, 465 insertions, 134 deletions

diff --git a/sys-apps/Manifest.gz b/sys-apps/Manifest.gz
index b7efc3b12906..9334e06cb726 100644
--- a/sys-apps/Manifest.gz
+++ b/sys-apps/Manifest.gz
diff --git a/sys-apps/bat/Manifest b/sys-apps/bat/Manifest
index 99a501e9fa9c..fb472b1a155b 100644
--- a/sys-apps/bat/Manifest
+++ b/sys-apps/bat/Manifest
@@ -1,41 +1,60 @@
 DIST adler-0.2.3.crate 12168 BLAKE2B c7743569d700d7ec3185e0459a18181148f8cd7579f4da1fab30eb2e3c3cabbe5a7467f7760f0cba4b2fdeb62f8d988ee1f24637685d76db7acb56f679cfc996 SHA512 565849eba122eb94d240a0cba875035537058cc168f137a8a3b99392d753815d56fa0e1a1e851062632700b0e3d12caf67f5f768b9f727956a2e5b599029e9dc
+DIST adler-1.0.2.crate 12778 BLAKE2B a1dc17786adae945ac09d3525e609ed944e6465690787bbb831a1b9d53793cba1989793d0a5606d5d23ee20d36457923d451b1b3530c9ec7072a487aa3e55bbd SHA512 7ab190d31890fc05b0b55d8e2c6527a505e06793d5496be0b3831e0513412f9ba97f8148f6f68ed0770fa9cd980a5092d885e058becf1d5506b7c74b82674aa1
 DIST aho-corasick-0.7.13.crate 111381 BLAKE2B 08efdd762a12cbafabfb6c1c6f8b87465b337ea006d48e612c5275f796e4d62aa0a595bcda783f7a58b1e2655b9b35333033806215518f097b6671888d152e0f SHA512 9bd3c12559d6bdb1ce798a62c59a202771b48125afb6e1b5be76cad13d750d9bedd7acd77d69557e34a698b17ed7da6832a7813d48ee2627f4a2abd5e04263e6
+DIST aho-corasick-0.7.18.crate 112923 BLAKE2B 4f6947d1aacf89ccfab0592cdc55fa61ef09cea38231d3f758765dbce328a810c0b588be4ba96e81d64955379ee005722d22a7aec39caea6e72342245d7ca34f SHA512 7a23b16231a90d23ee60ad4c81bc225410599a4560d33d3a203138fc540c39cf1000100fed3aed40dcc371c3635656a3792545dca5dd1aefbde00d8774eebd00
 DIST ansi_colours-1.0.1.crate 9937 BLAKE2B 04d86fb964138cadeab0cb708e99d198189efe6ad871b9cea43967f610922234f371befe7b25c8ef824f94daef5b6c52e47a5d86f7966b82ff100ae5a4e38281 SHA512 16d9470385c55eb28be0fd3ea0bf5d8832676282636edb71f670c629a77884f590bf4ea13f2bf1002031a5a014cf1bfb32bb7a09da27af3c1d85e4a0f524af23
+DIST ansi_colours-1.0.2.crate 10512 BLAKE2B b4acd4c2fb61e68711a5abfdbe04fc3a2778df29c4665637dc8413fb364842e8703054cfc119cf9e431a56ba4fd7d3a7d7c3dee6d7db648458e9bb26dddd650a SHA512 3f28117e804f82f194024ea502ca9a86cc458b55f705f643a8ab2a90a189ec21501708df5fca1f3ef204b57861b7cca3c21f7ca9537eaf4208086b0ec7652976
 DIST ansi_term-0.11.0.crate 17087 BLAKE2B 9bd35c045a01ce4c6c4a5db1b4f15e9412bb97426eec19d4421dffbec633de8d13452c13c1dc1b30998690b78d7ed38311aca700087f13a81f66bd1d5d7300c4 SHA512 a637466a380748f939b3af090b8c0333f35581925bc03f4dda9b3f95d338836403cf5487ae3af9ff68f8245a837f8ab061aabe57a126a6a2c20f2e972c77d1fa
 DIST ansi_term-0.12.1.crate 24838 BLAKE2B f636772c34e2d68cda7b8d3b2b86abda074585a62bd2654812ce92384244655a9197fa66e6939e19a674c0148ca605313d83de262bb18c2339a8a4eb4438a791 SHA512 b840e28b3e7700689a69a39659b1e066560078dd4a58326b91a028915819e7af883399ee53e920db68fd974c58d35bb1ddf8d427af5937d5f696f57c4376b671
 DIST arrayref-0.3.6.crate 10035 BLAKE2B 88292fa4b3ad4fccd03772c2f0eca04cc13373fe094358bac57d7523c256d89f3087603e5bcb2a0b15d8b2ecd48e904a822b2cb800276a9c47ad6c6b660d9d34 SHA512 368341d00706c1250ff081b0d99c36c9af694a62ff4f4d8c837234340295771ca49c5439b24b6e1a4f2c3c5821764e98881dcb22d793f83de632fd5cb457671f
 DIST arrayvec-0.5.1.crate 26816 BLAKE2B 172dab8f0129134dfc89c6032c5fc15e2f86a5cd1e5be18b87fe2108d18a1bdb0f597a6ed4cd214dc663fbfb27b05c66846fba4543b5e068b5c75d075bdc5bff SHA512 53db2fafea1f60ac1af9ecc0bc9b69010e9f8573048481d55969ecdc9f3d19832fe05824acf10a0186b0464f0fbfe898d73500fba39ed63650c64dac2c2e8043
 DIST assert_cmd-1.0.1.crate 24575 BLAKE2B e204b79da44a27b9c70be8dbf53356714ac994b4e5daced1b4f570c9e6c4a422572e825a54387df25292bd27e9ae11fa57d803bcfe4643382a2f739859dd42fd SHA512 969e1f6ba28edc0d4d25a10390f8e94578562602d303e9a9e402f29655cb9d67edc1040b283e1bc9fb4a88a5817814d88e85b77944204288aabcfb6da69bbdbf
+DIST assert_cmd-1.0.3.crate 26323 BLAKE2B 97fa287db425901474b2e9c4e0b9c500209e6ae23de73d079458ef21e8d1f6a49837683c543ce05ed79b0a07a4e1075d02630789760b52956f16e2f629e3d439 SHA512 3205f9eac594113996287dab2a641115e5fdb4e92734fa34e12d99b3808597e13371658857896c76449ab1fdca4cf4e675d812ea120602e16024409483b60bf2
 DIST atty-0.2.14.crate 5470 BLAKE2B 2db856a9e898a430258f059aeaf7c844a153293e8856d90ac81f7d91a888c89198768ad5cb09303c23241fe85c560a55148fa56a303651a82b0edb895616bfab SHA512 d7b6c4b9a0f898d91ddbc41a5ee45bbf45d1d269508c8cc87ee3e3990500e41e0ec387afb1f3bc7db55bedac396dd86c6509f4bf9e5148d809c3802edcc5e1d9
 DIST autocfg-1.0.1.crate 12908 BLAKE2B 40c53cab298e4f26634c3acff3ece6a3371188d91dbf377ed664eabedcde20536edaa93daf406618f37edde019f049a6e7b9a47f627344587dbd126bee2b5e3a SHA512 630b348acb98b012e97804e6325d03c89abc22f2157762c59144c04e6c733daf550bdc7f0fe0b9f3b50e15dae8c1c3c4bdfce3d805b02f0fc987311f5332419b
 DIST base64-0.12.3.crate 57545 BLAKE2B 5ff7e888f6b750ddfe302438d52766f5d6281b8c8ce73827a9ad1d64641704414649e6c1e02bce6abbb2858b9f859fce54a0e0e793549a474c4b49a724c8663f SHA512 ec6ad7cbd4980a12189690e9e24ec1db3c3def9e93672a415808904f68db2b5d8c5740e44207b2c629db5dd5d6ba6bd9dd342dd82367da6198e0313d86e54f02
+DIST base64-0.13.0.crate 62070 BLAKE2B b957f65cdb1e28baeca0cefc92fa98be797409b7dabd15e0e88db6cdfb89779b662cba9f2270fbf3b7b66948fdc46c118b8040a78ab72049c48a928fa802bee0 SHA512 991a72999839daa232f508c5b24e7d3225e8a26db8d1d0e747881b115af9e408b92374e163b31e0b0d324c1c2e57e8e38d66861b61eb0a1dba87bb5871940151
 DIST bat-0.17.1.tar.gz 1302347 BLAKE2B b46fdbf088d9033ae3e34155a774d3436ab0753ccfb5a8128aee2e6d5859a38cca27f5a01fa4146a0e8a17ecd66274a352ccdfb9111b4d169cb48edf5e62f732 SHA512 22222bb19cfa0804165d599e491fe2b1ad9220c5ea79c0cccd3292edca024963d6dc435c576bac19214849a1ffcc2b826488c6995758c4773af64ef945c2e460
+DIST bat-0.18.1.tar.gz 1367858 BLAKE2B f2a233e31f41b2143168d50c49c439f2842ff70e8f3c084b903011587fa62c23f08004312a9e0e04e79eeb54aaa1a536da00c26e2bc100981c59462c0d11debe SHA512 39369e456fe27b4b78b41dc754127a21e5a692ac90857c6c23486255f8d2a62bc399f2a52a4f94a6004ea37e5842c47a2b436013e2590d9e0089993aff9701bc
 DIST bincode-1.3.1.crate 26121 BLAKE2B 7bccc02071a11944e787fdb4c86b082827834df31f3fb751ed32720d4c44e4a26977838e311580ed330d9f6bc5ad76632e0af5530a3f8781ee739d9dc1ff218b SHA512 75e62caef54a58ea5d24acbdef70b55893b11706400ad423919084a4723f5ea60e337447221171c4cd86d764db1f9f767c303b4cf5cd8f27318519db77fb82b4
+DIST bincode-1.3.3.crate 28958 BLAKE2B ea01d2efd8149ecba5e240ed989268b683d542a5f369902d316a4fd1ae4b8edd94e2d4a8cbff0e96646eb29facb04a84b249d74f0781dc3d29c8797ac975aa9f SHA512 49e39d71214dbb623a18e3852f6f2f2a5c3f951b64107d66c8adaa95a442a3283fba978bca41b126c9879b12833b945f478d2c77d35482b3577fc1a894e8e5f3
 DIST bit-set-0.5.2.crate 14093 BLAKE2B 06d41a217438d9a00f8e57e592d12364b671d082f21a4d174673bc820dde28ef5ce02e782002d03c9311f71b0130eeeca7cfacbc4c1b27475069479163643ef3 SHA512 9709f35c7e69b84eed61f73da99ffe0693d1d0fa5fb94d13759cfbbb9dd4b0bb27628c3200e4b29ef29cdb0aede5fd3d7ddf663012b2c5946975bc169efbac34
 DIST bit-vec-0.6.2.crate 19630 BLAKE2B 84580a6f99393e507f3fd76b543fd357fc018745e029ebb6b3e71ac3b91b6f760a0474b4d90506e36581ec432ad336be6dc67c07be206917ba2af2322e15b867 SHA512 27cafa198a55853585d76c89490878c43bccdb0fe7dd68b0b4809497be2d497056e7ca6fbef321d71dfbe18272a2571b33d79e2a1458891a420eb7a1910ff383
+DIST bit-vec-0.6.3.crate 19927 BLAKE2B f5bd3bb9c87fdf3b206739b74df20cab50a1a45af3a58b2642a5a061c26207884be58ef8369a3cd06dfd3615bff0ce15915fdd4b6b6f03facc4a0f86c0b7e910 SHA512 b4b4a82c80d0ff13527ae4fff449ac9c1c7bc519c013af6ea3428348e0e5b9306b725c0a13a42d7d9dcf0f895a9eee0c63695a2503eb7fd2200083c9ea3a9aa8
 DIST bitflags-1.2.1.crate 16745 BLAKE2B 0fa6d3ce44aad7616d5cd02aad8c1d0b0fed4022650eb43067c4a72e6fc88da05442674fa51826e4858a47c9de233e1ba2229820af094197cd11bb416ceffb2b SHA512 ad89b3798845e23737a620bba581c2ff1ff3e15bac12555c765e201d2c0b90ecea0cdbc5b5b1a3fa9858c385e8e041f8226f5acfae5bbbe9925643fff2bf3f0b
 DIST blake2b_simd-0.5.10.crate 34093 BLAKE2B 6e725c9399714d1e199277e3f9882d636c1737af5b0b290f853573575005d053d2ab3a34843461747914a0c25d370f0d5a5cbb46765fe99308c1fd7666d471c7 SHA512 7471e0347267a4b88e9eea932b3001c420da0a472b2ea0f20dff974789955d6d95e19d51e3a8a312516c7fc4c83b6af17cc59ea2b8fcd4ef879ebac22534307a
 DIST block-buffer-0.7.3.crate 7179 BLAKE2B 549e8532358f9a77fdfbd5ef7a06d60f20f034fcf69072757811cb4a95f5cee5589bebd40fe87af36127254ec42ef3240cc7542828085f590fb774faab8f0e21 SHA512 74c8b89777a006bd72511b32df94f8bd78e2b53c30d85d39ea3c52acf199c357140fb6181f7f7ab5e30dd80d37181582cad740c95b89328a7a4b0f84f77ad6bf
 DIST block-padding-0.1.5.crate 7342 BLAKE2B 876421fa89251d011a455163baa49e0931e0692ed928fad71357fc93b87493eeab4cfcf8fc4aa94638a90a8dce8ec1ad95e9ba91da9557008e5fc19c1f618ab4 SHA512 acf5369cdae38b6b1a5c1561a9df18b8a39c8fd434fa50c49a8f73d2654a835269b7b22876354c903514c49c77aa860c68cd84d3c1efcb36bdfa8b01af300a9a
 DIST bstr-0.2.13.crate 345445 BLAKE2B 9a17fa04d55e5d053b115aef2a075b58cab0fb84c574df61eec7c3ab6f06e17d156991b1c070ad357599de5455af78982eecb8632336d53792958800ecafe839 SHA512 f1f778262269dfea6ba1cf953a5177107c2e1e838248a67588283ee11efa81adfa30498c7cfb20422e0955544a07d2a8f86c4eefc78e9f407a92be9591e26fe5
+DIST bstr-0.2.16.crate 330346 BLAKE2B 75a345f3a5d428ec7278cd10fa676f5bb72685c65c4fe68163943cf3142b43ac45d458bce9323447b201ffcc91aa82cd8c762cb1954c055e34b1a5cebc686ee8 SHA512 33e82e5637efdc2f404ab9405331ae135df12586785491c3e61e70ea8406c67e2109e550cc70a4ab8e95d054e8519c48257fd3b55ef0b67b2530914a9a0b0fac
+DIST bugreport-0.4.0.crate 13237 BLAKE2B 3de42f43252427cfb8a295611a0924ada6dad7121b0989bdaf1f9fdf253c23ffaeb4a418137a97f8a5a259fba566588db7f296058b7dbd6330d396521d1b71d1 SHA512 e46bbdfff4567b1916a99149d1062aa2e658686eb3d0252d206310a5e87f18cd068ad615bc05e832d518f11a54b1f2e1a6308ab2c3459414ca0422ab3c644627
 DIST byte-tools-0.3.1.crate 5526 BLAKE2B e87163b1f2abde9c6ad5002c37b21308a98a879dc7af14059839be7b5a019d2487ef03867f3f5cd436b7081cb78a930abce79b5cce23eb95cc60e05067e1b1df SHA512 18e0f248a1e9780706e3a184d63558f03f30002646abc6d46ef49db9d5f6768af3d24d210b688aa4ad33d41248429e4df46bc3926f27851f90c92d260e5c4baa
 DIST byteorder-1.3.4.crate 21943 BLAKE2B 278b24e036e920f84683f883991a967d997883bc80edefc5b69f52551794a37e5051786a1ac1b7a30bf2f5cad7318d781f189a7b2e496e2743df01262d5c33d6 SHA512 0618ce2cd6f3f6c586201d9aee8c8aaa08f99c9f9f215cf448b3cb6af1ac741845f5279953544caaec7fcf0beec1474bb991bee1ad0c0dac0c3f1d3ddd99e2d9
+DIST byteorder-1.4.3.crate 22512 BLAKE2B d39c546ba7346df315297fc53da4bfc77ecb1f38567ddb788549ee31cae2719a8bc0b7d1f1705abb3cff033aa57af004987d90748f5a31765273b3223a011c0d SHA512 8c8000eb8ecf40351c9ce36a3a8acd7a02f81786d1b11aab85adfeffa0f2267ed74df29b2ca5d1d38128484d1d3cad2b673aa0d0441dcd0620dfd3934bb888fa
 DIST cc-1.0.60.crate 53351 BLAKE2B 95fec29226818496e56c132d45eaf728df17f3ab1b939842dc228febe7bdfabc9b0b407fab65a6a7d308a1e57a40702a2810516882f712319de119ca7cad4b52 SHA512 3aaeb5f6b0fed31dd65f8c884252d8a6f8f79cd801edf7626aebf4f2843a414cf45ec72b4d6f88f9e9fdd959e0547b9ee5da817b7c34235196113cdbe915b888
+DIST cc-1.0.67.crate 53486 BLAKE2B 42fd02a5886df50857075c909819c8afcf091cee6b7bc517848786f287f4559e70a07f0a0f42a742baa2665465dfdb2139ecac7e93f1a41b16eab30556eb0259 SHA512 f1ad4abdaad2667b190d1f8df8515f603107be1f69bdbdc02b5159764a6ed18b3f672d6b06af50c7f2fd3e6e3dad5df0fcd0dda762d909ba0922c769f1efbe05
 DIST cfg-if-0.1.10.crate 7933 BLAKE2B 063a96ed176f34f788666b40adc483d147fc011dee941ab60569ddd0e57502b5dd06ed71090f4e14ce005d06e240500a286f74652615e9d068fba649610d8cf8 SHA512 9d22616bfb4a75770a828a0a3cddac6787297a5fdc53eb17e25811cc94de717f2de8bd66d53c5d65ba1c83d8892aefee5ae758cf56a1ef0a0c3120f70b244339
+DIST cfg-if-1.0.0.crate 7934 BLAKE2B e99a5589c11d79d77a4537b34ce0a45d37b981c123b79b807cea836c89fc3926d693458893baca2882448d3d44e3f64e06141f6d916b748daa10b8cc1ae16d1b SHA512 0fb16a8882fd30e86b62c5143b1cb18ab564e84e75bd1f28fd12f24ffdc4a42e0d2e012a99abb606c12efe3c11061ff5bf8e24ab053e550ae083f7d90f6576ff
 DIST chrono-0.4.19.crate 155663 BLAKE2B c92c273fb6475bbb2546dfb75eaa23321bc8f9a5fa8a7c652f527649b96ff8718fa932f52b500b02a4acae7837df5bdb14f69cb821d4962be2790dbd1d023a54 SHA512 a119349bfc2243a249f1d18b1ae548a04b30fecb75913a56f26d1ff8c0eb53097a2674d9141e2094018191cbbc1620843fbddaf52999824e077c1157f0907980
 DIST clap-2.33.3.crate 201925 BLAKE2B bec9c866481c5b3fddeb314f68af9bce38fc421e42816182de3209e8ea3447b72cf033e6251eea27fe974eff8085b7d98cdd2911b5cc0ec6b4bf4c750deb8a25 SHA512 3eb0fd648e2e3f9e5ff69a5e6cf0d867304fe18523accd036f28a86de368e4774088a6936c108ccc045092c539fe7f7494ea96420ebf6b4bec16880cea84bedf
 DIST clircle-0.1.3.crate 8026 BLAKE2B 33c18a0f9ed204597fad1720b8e361ca4d1beb2dc2db82eb0fe6632ea7fd1213ca55d5fb88f84c099aacb8c14dd2468f07d9563512b8ef4e1c2fe38b6590bc86 SHA512 1a51fd8a35b4179748d654916e0713c31dde2a96627c08a82cadcc05dcf816f8266ccd4fe75af2532dcb92dcd0043942c2150c76264a39760cc2d4e8e5455836
+DIST clircle-0.3.0.crate 9837 BLAKE2B adeb2d11238c343363475f9e517d01c9b596fa61b7d520f9c92de038f0a106e48263d06045e7f9d0cb5538384d4b2cffc2c969e9a129045b8839bf04ab1bad75 SHA512 a4db35d05ea4ca03155c7308a79b529091dddd4d2d579d787fc3770d80cb7c22ca4a239bcfe7b6a2a85870249754991f8dc960846b80ee7a46b763edfb084b2b
 DIST console-0.13.0.crate 22451 BLAKE2B a02b87a53b5f6e3adc88b0369e9e5b786fb60741263d5441752c51164562704d93c8954ecabc2ddf7a999139aa236cfbb0e9b8baa27901837f731591636044a8 SHA512 b687031ebfec1ee705c47e147239b602ffc147eec021ce7c9a4f400db7e3e0b1cf124b4c1664f9ffd1f3719f13a5d65c67bb15146bf42dccc5733373bd10b20c
+DIST console-0.14.1.crate 22844 BLAKE2B 2e7a1480fc10ba92d4d5c601b87a0dac840b71c6c44679acf0a90667f37a40528ff2155130aa72be2ade1fdef4e6512dfb404b0eff181d77fbafb00c25dd6c5c SHA512 2c85d1938faca5163dd7eede2a8a07569e536c92fd0fbc7f6e6ed91c60fa7f947f0ae101817ed943b0668c4d98ddfd3149033c83614786b5d841b19a8b011c91
 DIST constant_time_eq-0.1.5.crate 4936 BLAKE2B 882dbf33f20954205fcc5b6e39863db8969d184b697fd51ef462f6890c1a754e3fae67bcc7db685d8cc26abe6e3871d3b80aa542489ba9551a0c95a49f7a6dc2 SHA512 a4e0155a7ad72babcfd418d832d362b3fca7333aaaf36c246b00e948983837c3c93378b86e37c5fa7626fe137e3b6d77276ccc61624a7f4ab914605905a88a01
 DIST content_inspector-0.2.4.crate 11386 BLAKE2B 2393cf83b2dd338ded7f5acd695e05a4a08fa639a52a8042dd0692be5e959cd1cc670472e25ca696a151d161c821eb899b2a950c74f4cb5b880bc42bc53d1d57 SHA512 1acb8b4f12ce3479f5a60b7b6a0c05b86548591e488e7be529c4a2f9aaa60a76ed07e7ce1e557664d31ddd9964e7f73415ad667cd14ada919f61511bf486ed6f
 DIST crc32fast-1.2.0.crate 39161 BLAKE2B f71c85801f945602d53f93ce251c978c91f63fcd92fecba5083fff0f06738697e99d92c17a824605d5d56b3224db224ff32e4b147b6f6af47ae714dcd511e7cd SHA512 2ee73e0642f83e28034c1baca65156e65d751214e83f2a4ce94b6add5ba11f74ffc80832a3348ece1c099367be2b11e820dfb349fae89fbced1b68bd6b0466f0
+DIST crc32fast-1.2.1.crate 38172 BLAKE2B 80801a345f4c5ed8a5fd335bbf672eac1733a1c2b333dc8a8e0254338148ce7b34402201a8d2d7434dd1b057f33d99d3a8f02610ea50b54115d80bb8da28b2b0 SHA512 4c04236bb15a5c63b712c62652777917e947823abb20a0d0b372c850ec1c8695faa414e8de73904f1f1a296d7b00a6206cde8da404cf4cdaa2e8408e64b62b5e
 DIST crossbeam-utils-0.7.2.crate 34338 BLAKE2B 3cb287c7741c4d5b0551331634a75b066f07fb4b55fa2b347370506467a05923254b1c4dca667de59ed91ff91f5496b37f40f13d3e9885a1b4f639f5b6748433 SHA512 e375f24c007bcf660d9e297527ed938f678a55696ca7b555b96fee7e0b94c31db2d3f4355675aa0baeadba68b9755ec92dc3a09a37b5db48e3723b926fd4a8f3
 DIST difference-2.0.0.crate 147616 BLAKE2B d720202ba8d73fb9b3cc6a982208e4fbe22eda4b3e296f4238a7b2d8ed0339827ca5a3d93a983396901614a9eabe36a0baf55ecc5f55075ebf7fa1e4c0699eb2 SHA512 cc9956757770ecf237d8f46abef25ce219193c877be6cf83163e87c494956cca3202951ac01bba0728e7202fcde2261009c1b4599f389cf979858f25936a5482
 DIST digest-0.8.1.crate 9449 BLAKE2B a610eb0144fdd49dbd846a86e88781b69ccb6a4f918b09fb4562ee9e3d535d12a1e499e36e5eb894d1d81f7a06ca00296b3aa35063f434fdcf22ff202890650c SHA512 186c3ddc01fefff6a134ea0be633a9fe8067b8db34f31e9991069e7a9b82ed595a1105283a87e3021af2337ad332faf1b85a6bb513a4482df7d24e3e7a5ba055
 DIST dirs-3.0.1.crate 12245 BLAKE2B e58f9383d0bb78f27219337c83879ce355aa60290df659b9dc656e3febcc2577b8fd5234792fa354f1c7f2b651e590fe490384f79b0a8a332eff44e3b459d9cc SHA512 fe5eed57f7f3af0ebc53098f7d7295702a5339d7644d271a81bf5a966ae5b3e688eeabbf2b122e6e7daa1080dd30e48d8cbad969f6820b6cdb1680c84f0b9623
+DIST dirs-next-2.0.0.crate 11689 BLAKE2B f5022bc51dd50bad4ad0fd05b159a4117aca47afbea66dc42c8306ca58f3a550165afbcf9f5f721ef5ad8d357eaff305c6f6e42789354a910d5f1d05d3b7b7c6 SHA512 6ccb732da8ccf7bf35952c22a3b0caa8238319feb0a6cd3b0957e6be12548a2ce507c69cb6d3cbd2adfb37e13e6521c6229da5999edb0e47a292a41c3ea1a766
 DIST dirs-sys-0.3.5.crate 10643 BLAKE2B 8df1e6ca2c8e8560913bfb74e7bea1b12e1b13b6d337f3c76f517716622586cae8ff9999044e3265504a44f161526a79baffff2d123d3ea6c5cfebefcf498010 SHA512 ff7eb48943b61773dd2aa8dc10372186d613c225a2b39caf48966a1a5af087dd0177b8db80b1353a504af8aa1c8b4a0a849edf6c7e4389f6b753bfa3b7376833
+DIST dirs-sys-next-0.1.2.crate 10681 BLAKE2B 71431533dbfd6016cc309c14a842ac8d43577abe768e69bd2caaf7d19d743f3ca95b9b0be1747077282089c64485f3d4e24bec8e56d4d883f25e494d328fbf3a SHA512 b3c40a8e93d4f9f4a890718076e14779aedd67a79da61b466788268c1eaea19aa493f043a7e410f5023a23d5509e639a6fc6681fbee30e252a601091cfffa2d5
 DIST doc-comment-0.3.3.crate 4123 BLAKE2B a82d1c1a7a90af6e111b5e684a1298d7eac5fd8e4bf7d5baf6c7403d26b609958716d57e51122fe7ad7626fe00a2d824dcfef3cc2fd7679fdb7b5099603de1cd SHA512 e98ff9646a3612bd41bb6f278e7b6e9a0c58747f8b82524da814cf51b7f06c76ad4d65b502ac5740e818744abb295f78f15f8262d0b50ced1523f6d1a26939ba
 DIST dtoa-0.4.6.crate 15979 BLAKE2B 7ad070d30f933f169ab442069dd078022bfdb2d6227380e88e286cbba8b908378fd8dadc9f6a86fef985380d925f12ec81f90daf9d1a7accbc03c01d0046258a SHA512 f9ea608b069469736533a60b3f4091712992ebdc99c08af06adce4aea4a9aa9fcb477c3ab169d1c61afddb1f434096cd2f795fe2489f5f0535cc0400b9896b45
+DIST dtoa-0.4.8.crate 16175 BLAKE2B 5fff15e66c2edeb9eb9da89c66389b3a9bbb891d75afc3bb7da4dcbe9cad9e50af318cc8cc01cc7e56730763e8ea8ceb33b9447d1a7fa52a8d0f0d2060a97522 SHA512 fe1701ba2c40988b92f5f4ef78a8c81718b140ff8ca2d04023b09a89440e6ddb53ef36d1ebd9dd3e948428b361ed6611bd24ec1a31b5010c220c555e1f0bf6b8
 DIST encode_unicode-0.3.6.crate 45741 BLAKE2B e1e3792bc2bf9db7df33a516d0d755eef5eff1249aa9b2fd7f0dfcb155786c566fb619c9b2d73425a8625c8593988b117e9676c341f65e8795ddc838bf9881c4 SHA512 64193d6ac75f66d58ed864169b5d6228ede36dcf100614395e086bc8e847a3ddd287734d88e8ed50f38c679a99c80ec68449175a67d8ee03b02ec1cfa9d55e77
 DIST encoding-0.2.33.crate 88798 BLAKE2B 4163e26e6f38f7fc1d7424f1135fec1dddd2af3d6dd5f5bc6a5edc3eb3fd56af56858cc0fa5ed6a241b55882807f72f2e5d2940c9a7e5c4c6700ef905727044a SHA512 10c186e0f6ffcffeacb11a66fa39960454955b4827dba03e13d9ab5294bf14e77faa8e64956d5c3756fbb7e930081b7b301db8ad6873a6e8d44a7f9d98566e4e
 DIST encoding-index-japanese-1.20141219.5.crate 91495 BLAKE2B 4deb91b0b2dd1b33bc4b43ac2ec31df0552344b1177c9e504481d62a706b1c187eb3f4e8dd78c62871aa58c86ab6e309494b1b7937843de6056f3d1a0120160c SHA512 879fa0b9a294f3a73a4b224318ce5e44bc1ad0496763a518cb9ee251a4cadeb08885df97eb72f27a1e331f36d46a96824f98b7d128d879c0639405a10e08b8e2
@@ -48,96 +67,167 @@ DIST error-chain-0.12.4.crate 29274 BLAKE2B d082bcbce47411477e8b597cfcb76985cc7d
 DIST fake-simd-0.1.2.crate 5398 BLAKE2B 40437b18ca7b77258577f518232dcf67e2bf09b64234dc3f02b9eba0c5c1fede8f8d1dc7cbc112ce80e4f0bf317387d1b8046d41a4f83a7c54981fd2b71fc8e2 SHA512 d57242c54ea3283185eaecbf8d96a4c9decbada3ae3aceb516a79710be9bf038a6e06a29b9ba4ebcd41b8f42943a3024a983ea23e36b17edc445a8c4980f2893
 DIST fancy-regex-0.3.5.crate 64304 BLAKE2B b0da0024bd7dba0a574109859984919102d02044ed7c389a3ba1f10aceaf5fc908094e865eee829a1ad65de6f0d9a6d8c1bf59091d35bf8637ef7c55f21bb593 SHA512 0edf91221f7088719607492accb71158d7ff445a2893eec90fef402df30ded30fdf388fe05f0d334577b642d5c5b724bc4a1724359dc4738c9bc34823dbe33f2
 DIST flate2-1.0.18.crate 74164 BLAKE2B 7defdf3f084f18c9e7776edda9bb3cea5692de0d9d2d006bcba0895ae3555f4ca006c76733175e4982932c67e6c65fd59b21275f19572e23dc2eed8f331eafbd SHA512 3695e7de578da3bc935988fdc67b22ded26f00bcae6818eaa6313c47628a19b66ad589b06e164ddc4c30c49eeec2011e41031287071a43460a8c5bf8e7cb5cef
+DIST flate2-1.0.20.crate 74036 BLAKE2B c5a1270debdb42f8612c0db9b684d339dfb668dfa3b06f6dcef94b43c115daee99c3558562d605da5ba1a554930030083baa8128036e9999d47907f29687ee0e SHA512 1415cba53183b7ae0f3396859186b92001060a78fbee10dd0dd4c8a93119aeb78bd8d782735c292badc1ae6d369badc6fa1a0105835614a6f70e82b080d8549b
 DIST float-cmp-0.8.0.crate 9640 BLAKE2B 5e4f7dfb115b558c517f704a7ed292801ec979b2d27c89d1a2a733c84317934fecb5cc9a92c25284f5d59ad8f284186f582e67285a67e99e67b05887fef334cb SHA512 6c98f5eb4fd748c8192cfeea1f2b9679ede01745ebfa01b08bf19d796c985c1b2779fdc77984f26ef9c9a06a979ae3f0b14676e0c8b28defb7717bf10119c718
 DIST fnv-1.0.7.crate 11266 BLAKE2B 81da85889c91b6567e0f555e37dd915f1bd919719d1ca10c31a6861d7aec29a49ae9c1e8bc500791bf9d6b8dbb318c096d04872c5872a4b1f7d45fbd8e12842d SHA512 2195a4b34a78e2dd9838caf0ee556bf87cbb4a8ef5505aac663b614eb59dcfc0c40f432463ede41ecca57bfe7711f72673d39a85fe03d426f1324097d5628334
+DIST form_urlencoded-1.0.1.crate 8773 BLAKE2B e2d2224dbd85d053343aea29ef1bd540fb8be12fd600289e9c048e3b74bfb009d0770f8296556309ef756086f22feec4713dfed1006e1101075c8897be5471cc SHA512 3ab371c223561a27ffbd35cf648ef4a9145d47bba9d71900a7c54cfc2f089175e9361f6352331a9a7fa018923b15e7a3553c8f9ff9fae80e1626e641a5faff68
 DIST fuchsia-cprng-0.1.1.crate 2950 BLAKE2B 8519407ab5d1f04d03cc946a07050db4dd7bc70e03894e35b9e66910a3be11224084a86ba45103fdec845e94b7ba4defbd7c5217b035a0796c0c4a94b9562cd7 SHA512 ea9f5beb0dfcb023c22cfc2b37ce52dfcf3a2cbbed0f79ffffc332878858386805c65dce8469a431002367562d857a6c064e075688540c27fcb4056a110059d2
 DIST generic-array-0.12.3.crate 18017 BLAKE2B 0d24e12365b31ba77cff37db6841428abf7f37f9722d629c168fd96a3a88390999a95e27adbb6aae697ca99bb9ecb4728af49d4166ea2bf89ad5ee09bf2c943d SHA512 75f3c19d3aa9db42909298b207564b2df40e7e8b8d54ad18972a833748942b5293a0edb881de894b58b5210c870ad546752c200710c5549144d11a4a0d7417d8
 DIST getrandom-0.1.15.crate 24786 BLAKE2B 868817d62ee44fa5bbf54f9af0bd71a29503f92bc93e190a834f4ebdb8eb73dd29e175c661f9964298987949c0b82a53e99080cbe4090fc9c5453daea4b05595 SHA512 b26d9558554058f8a54b03f56f488db5ebad2d5cc84f737e489f8f532f8464ef9038d104173eb30acca61caa1f99e1ce267bc493c01ba1611b829e0a090cc87f
+DIST getrandom-0.2.2.crate 26010 BLAKE2B f2df79db0fff4a4e57bb5c748932dd7a8d24f7072f9a81fa92159ea79de29a70e7b834af6ffc5178e898af456188f16476043e9be4dd25c6e7edde06d93cbb8a SHA512 f498fe00c9887748a0be88fbd698a6087ccb79874cfeb35a18f90994603be29cb2aacfbc65fb8ba967190ccbc41ff9ff56bfff1de40811e1bc99a08b0568f59b
+DIST git-version-0.3.4.crate 3237 BLAKE2B f324d21e90f09ad7d3a35e78223e96c9988f289da10e6b9f6de8377b471afd401e07e5f8cc7621d463b57527b6a1b58c06947a4f4b0f4dabdee8dc2549795dfc SHA512 5fdac1c1b2580e42cbf15b1caf5b077f48f921b21371d02d1954443843fc075bc1c218e112fee0878a41bdf6e528b2969c9cff76808a01996a56b3e046ec3dea
+DIST git-version-macro-0.3.4.crate 3608 BLAKE2B 251bfa7999664cccdcfff709825d7a27c3cc66b1e785b5009076a84d46ffe7e13029919d35fa2dd2cc4ace12ef859b83dc7755e2659bb4977d828c78cb1910e3 SHA512 8e73a084b7929e3b3f6b608f442b15bd0eb76c35ec04b3e254310c7cfa8f09ad3477ac4445ba38e571b530155a0e79274feb39d0e6ed943fe210b9146911ebb2
 DIST git2-0.13.12.crate 175580 BLAKE2B 18321da8e89b18dbec31bbee75cd779994363ff6e9f2dd15e6d85b301e495d769fd66ba4dc4ee5edd9c806d8acad94336e403899f2da147430c89cc984ab03c1 SHA512 aab4564c385e378d5df34b8b8aab12107bc9e4b3b1cec1b5206e32fe72fbd0a7a2fd4c40d0ce75deed6ee9a51edb0383f26af2a53e59a5384c74dac4162f312b
+DIST git2-0.13.19.crate 190136 BLAKE2B 82d95c8bcc41b5c7b95c7d9d6cc1870cfd0a9f230ea07d8ca85bb343bcbbc9f70e1a97d59a316014f262045bb4d67c993cdefb74bb5773d80275da95b79df3fe SHA512 b313a7cbd8c9427149bdb50232b1022d278c493f61be131d73daaa983ff6df4bca635f7f8eb97c8b1bc179184f6b741941a3b4304d53fad0747a2244a85177a1
 DIST glob-0.3.0.crate 18724 BLAKE2B 1f1dd380e7d668a0c2cff9134279ebda958b4bccdd4a65ff01f9665b45ec4cce8ffbd47eb46e52cf516c5fd5803561e6bcb60cdee21ddfbb8601a95d45500620 SHA512 87098ffdbc518442995c422120cef71f83069c8f88a1970ecec5105b0f284ddd92bcee929f5c230d5b90ae1ead7e1214c3eea26f4a8b26715a00c1ab8b09bc46
 DIST globset-0.4.6.crate 22893 BLAKE2B d47dce5ddb342b5c544f50c01160df66e81e80ca8a0abbf90a74ba67aa9c585843c051ea98ceb7249d4a56e5c1b985b00df734ec0fd19439274a8c1f998dbe75 SHA512 aac2b1b0f47103a0e8b404f4c97bcaa8561d51683fe741a85d745b3f30b56f0523c2fa21f21a680d9e883c697eb4232180f042dca290e954ac55429ae251fcbc
 DIST hashbrown-0.9.1.crate 77734 BLAKE2B d59002253112cf92173c3c1b305fd03fb7318ef187d7e033433baf6a354db046d1f3fe0387b3cf500fbcc0f83d2b2076527ba7cda2695f7627eca0bc3e3487c1 SHA512 dfa4742111f6fe757b7fa97f04c7b4a78ce9708c87e8e09ecf3c28f2566e48af9885fda380ed918cec37b5c696110fbdd30273aba6e7d2221c9e65f72af064fd
 DIST hermit-abi-0.1.16.crate 9889 BLAKE2B 1d1681d484019adb9c27336ef87fe9680c18a57de71ca9bb3022878411ce8f933bcb0f5d03f190425039a53a427ecbe75f8eea654661340ebbc165fbb61322b8 SHA512 b9aa336e195fdbb3c1a1fc7167f3efd284c2c3ab0613ec47f07b5cf5865b56cac3aa0da4936f6a336f036993344126b3d872875c362c516e0ca538d8e36195f9
+DIST hermit-abi-0.1.18.crate 9936 BLAKE2B a5a1d1c9bdf83fdca8edc392f8fa7d9b9b248ac8d716e009300220befa5d8d80601643e768037be89bbbe6e21adbe6349c94c595cee3837c4b92b5f98ba838ad SHA512 54f060c6c1c80d41f40cec7102345147efb535aff9fa5cc0ed4ccd7f010bfdb6daaf40626fd5069af60ceb42058452803b59d4bbcfbed4c5546c79b57ae0f914
 DIST idna-0.2.0.crate 257203 BLAKE2B d26117124891f90b5e36af291c9038e2f4d46402c41380a6a89758459fd73839137e6faa401502be12dd81292cd9e12ec82fc611c0ff7a150510d19010767558 SHA512 375d6d73537a5c9cebfc850a2b561d57e748d80059ca27fe5e35c058cc12a5938cfbb39a76cfe57fbe589f7e36f89ccd91ccdb8899458c322e277c299293bc7d
+DIST idna-0.2.3.crate 271023 BLAKE2B 157ece18825fd3f8055581ccbd14191a6923da4c806ce51b3d6376682878db000a1b873f744c8e9e1966e4c1f8393643bcb603deae299ed0bd87847b0bd2c591 SHA512 1278bd561ce329e1dc7a6f24a10f83d9a068af5d15a088414f3921c6728b0d54f4d60d6f4d0d5a786596ad226263e1e50c3842f192d5758aa4665ba4ed5c269f
 DIST indexmap-1.6.0.crate 47565 BLAKE2B 4b2c50788be5c5416973133c10caf092468444af6c101eceb5d2f53ec3502d73c034205186974efb335a1d8aa9a797b191a871fcfd573251c95ad1d13c0c47cc SHA512 f91c0d3588da037a2dc728c9cd823b4acf7edfbe7d59b28dbe1f5802294f2677eacf0ccea41235daa30b3d8187a97938653a040d8c9d2d38513440b2e82fd85e
+DIST indexmap-1.6.2.crate 50225 BLAKE2B 38f40c5aae0c5dc5da515e610007983b2d581994293f2eac747a3fd78c9cefb9faff64555e0c6dda146e9d1332d59f23c353c6758e63f99b6c4676123723ec67 SHA512 1509b6aa6b3b84fa15b98026052f6d5f0f1aedd065b02b24e31b799f8db68d5770e9a8302ef10e1ad16817256dbc03c55593928a48eddb252d25de7e0b7e6406
+DIST instant-0.1.9.crate 5213 BLAKE2B fe208faa09852079c603930e88b7d0392a89a55d3b934ad45ffb0c9e44df5ef7e8189ba2fa12452f1c8a6416d6f7c0655365ba959bedf2b78228613944be8278 SHA512 3915f67c3629ec93296d56c4cda0cf97b29b1a70930a9d546abb9518139d4c2f35062563a5094e84841ddb1f00b0f3df9dc00801d96c01994765221edf03ef7c
 DIST itoa-0.4.6.crate 12167 BLAKE2B a0ab539cfdaca0a61fc55afdb74ef3231d300452fabbc747cac16a51ec74b4ad5c877e2b2a35f3087693c7eb55b5c389b5bc037b960733ab2afa36ff781591c2 SHA512 9085ad30313a2904fc60a85afed99c7388a345ed50c988f4e7307b23b5f38b14bc9ff64edf02b85fda6c363e035ac314241d5dba4a6e2dcfef3d2648cadb9692
+DIST itoa-0.4.7.crate 12099 BLAKE2B 0e4ffbaad504565056f74c3ef560a87eff321a0da6d7a2c8fa35813c207713c22d77080c3b830fefbb21370dd29cfbc6a2807044485b38ac1e0c9c1de3ccebc5 SHA512 c61eb50aa00591af28698b45c528c36bd92088f7cd2f453cf686a1824f4656292638bebc468cf67f903473a5045f22777af623cc0515ef3bf25146b89a7c454f
 DIST jobserver-0.1.21.crate 21228 BLAKE2B ab1a6496d609e19235f022e920495e708571116e90f8c036edb5f7ba270c2ac938f7571e89f3fb714043c87623d4cbf1d404067ccac6a8b41e4a6768039cf02b SHA512 944249819e1e3dd09495ead941330e9abe439647c1e66ab7e2140c0c9e100b63f4f792fe06aa3c86f509f057df297ee2d35df0ccdfd4bd6a115b6a44076237ad
+DIST jobserver-0.1.22.crate 21175 BLAKE2B dc0f20541fd14aa5c8b161cf36829a36e550ef414215417e25516ef1cf67cc1c7100cbe4ebcf8d2530e3245f8793a3ff11f407a0ec5d96385ecb6618e2de7a20 SHA512 ad3d180bb49fbaf51c9a2f40de0e2082947a0cb5bef95001bcc664e4c98f75a4c32a6c53f5eba90595e415b600aacae54d92c2f613dbeb8af94fa08b6d770d8b
 DIST lazy_static-1.4.0.crate 10443 BLAKE2B 25b2e61bbac48f0dcbc79c81d7bf01f2403d8269ecb6be3ea6147bd00f7a588df15a91f44dfc18ada19b21faa71de4637c7d493a8628cbecd0e547d74e616a23 SHA512 e124c0521ec7c950f3c4a066821918da7a9c6e711115d98009ae7c351928fdddead852e7596fea5937a9c30e4e4ce8eee7099b20248b5d6e3b2494b6a6d88cb8
 DIST lazycell-1.3.0.crate 12502 BLAKE2B dca2d3f46823a52dcf87b7d6103fc4f1f83bc5247ce361946ac2d9df239fb43ce4b418104503698dff0242480cd014996e77da4ae0a88f3cedbce4eb9d3c9ef8 SHA512 f9d627afc28b61e9687a3f72260eb013401fd64057647641ff2e763770d7380ab1d2d8cbb4a3c8818d53d504c618a3b46aaf701f72f4d7b25d226042824c2f8d
 DIST libc-0.2.78.crate 508428 BLAKE2B 0bb5545c24cc14f8831edd69785e43f169afdbe0343d480a76d4784b1784a68ab26e7d049418cb09643af61cac47a6d19f7658227e5e23c195389bb915e3651e SHA512 91cb2cd8541082822480e248c373f3320bca99483174aef295b373e6d051190bc5b100350cf680e1d48bda442b3e450741314dd9cf4f8536adbd2c6d7e869cd4
+DIST libc-0.2.94.crate 511713 BLAKE2B 6ad3fe9aa5ea5fb06a7b2beeb68fa245e5ed7d19aa7e4b21c9e2ab73da11a9249913e604f0f87fbcc82676cceee16f14403cd2f27ae462730e1682c539666283 SHA512 316717d2e46b57c200d67d0ebb4fb162cb1f0b688895b9eb6075924cda3be8ba7fae85319692682178b6fc5cb2764e8b3a9d3e7ce234fd8a21a0a9c453ca174c
 DIST libgit2-sys-0.12.14+1.1.0.crate 1603930 BLAKE2B 8fd9366e09a8d6ab9f3df865aea3d9ecd43e4c2a339597c939a09cc36c28146e6ca6cd94656a9d17519b008fe65bbf6901ed639308b857a68977de4695f477e5 SHA512 d0fe6243b07c0d0711e832f4efdd69701c27fafb7df82d6010f24f79393c80bff3fc5639707863f2a8073c57bbc9fdfa0eab32c64eb053799c1c1e08de5c9854
+DIST libgit2-sys-0.12.20+1.1.0.crate 1443453 BLAKE2B ea35adedcb54d21fffa4ed357e2eb2d642904a1b1975f7415a82e06905d8a47adca50bb03e2b61eae6291039b0bd9197d5d5b9ac1cb339d1a8fe67811ea7db17 SHA512 03f8493ce60fa2d6553605c52642917f8c69b9e8cf962880218eb63459e24b02b041339927fde1c9b3fcb27d97e3c9e99dda66f8e7124dc72720e91948ff2676
 DIST libz-sys-1.1.2.crate 1339299 BLAKE2B c055fdcdeaff5d44cc95f6cef190094317644e4881f356e46b0c0347221ffb867afcd29ecd4d995bf397f714b705ce84cf34ab87010770e00b3aed1956fa46a0 SHA512 2342c738230ac570c61b466920e2ceafc0194381643540f094f6541917639a4f5b11d46d575bb03c7623ce109d376bafc3076a9d172233313e38cb6f49ed16db
+DIST libz-sys-1.1.3.crate 1341394 BLAKE2B 24df26f2102fb05231bf1c866ae4bb33aaaa0db7e963f452d29091b870d3cdb80736b8013bd39c028ec84b97d265f005dbd650515f503d04655bf7054ee537b2 SHA512 9ad3ac88cb3c436ba046a55123b7a3c96c56a8ae2a1b85a3eb39339e84441b16c82d35630e9aad1d51db83943f2d08cf0bd45e212b7284c224de451a0f0c30bb
 DIST line-wrap-0.1.1.crate 10010 BLAKE2B 8f64561931efdb39ef256b90ad12573df76449afadc11f38b5431c1fff73da3ef1dcf9ad8ba0c30cd1ef1b0a8d894a7b34327e4a5eccfea08051ae5abedb483e SHA512 31976e14355317bab470e6716542d3cfd59083a1808bb199dc2eddd51d05fab122ab054783d0996c1feb53bdb316e6fa24b34cae9ed8e8cdb2702bc43fd805eb
 DIST linked-hash-map-0.5.3.crate 16130 BLAKE2B 20ca73044271533d2da6bb6ca863a192b61231760fddb82ac373a34fe63d92efe5b841fa401b9aa509cc1e05b86cf672eae3f26ab5c07c7b0c25e764e128344e SHA512 90ec22fcd830ccfdefd1f7c480c5cebd5e95c822e0c28fff9ccf00bfbdda080c17a722697fdc991ee04a4a32e974309440a91284bc13c9ee70284e4e247d33b1
+DIST linked-hash-map-0.5.4.crate 16166 BLAKE2B d6bfa091265355ae124885f76212c968f2a87af80f3d306c13223ab7fa1d6a449ffda8d042bdb887501d2ffd8adbc638f18cdfeefc16c39a1eb9f57b7c658bf0 SHA512 2938883357ec0e7d9c9fc5746063ae419c97250ddceeb8de3480c89e97e0a29d175cc9199bdb3ddf81cd5d6a2a1e319ee1644a7309eea96058221074cf87c0b6
+DIST lock_api-0.4.4.crate 20356 BLAKE2B 1b4a648467eba49232df5c595d7c5a0444018269a67db1768c7711d9d1a903a1dd00f99d8654c30186a470c035abdcec9994c8b1a347fc559c684b1792ec7f49 SHA512 655c8a1503b6e7f833b4c62109e1c5005727054847bff81e17d4159f91c02ac97512da0673ab227d17bc9ed0342fe3476247daf74cbc9a0b470e68c648ba706e
 DIST log-0.4.11.crate 36276 BLAKE2B 728647c829e96cb4fc795682facceebec887508e1ca14f13c0e7984db8ac39b3045885d1daa2f335de3e8f25c5cf1b519a1e7c8c6f4160a716bb8e39d085009f SHA512 e216fcb3c9635d8c4b67b05c1ada1e5de4e99dce89ab4c8f8033ddce6ac488605d8af09f93c42d25ebf8844feea22c93b71682e77a368ee01c686a15133fdeec
+DIST log-0.4.14.crate 34582 BLAKE2B ddfba35947ae1f5905cd9ecb9eb862a78af6f00ee8b8fe6258b369b140928fe677a02b1b3ca5bdec36ff2b16abd85a9f49688fd5f3d1ba2b2905e7f96b8a84c1 SHA512 796100167663d85a7bc4244cd305e9b3f0a1b1520764b63464698eb136318d0928c40c16f5d19d9f602a5bf769851275bbd48d66b088b0c37be7a6fb62def7cc
 DIST maplit-1.0.2.crate 8871 BLAKE2B 3cf975d35de2d2fbd50227a6d2c5e72227e99197b620c8f29be97bd3666ec162deeef0d9e6bd327a063f175201beeb73c4ed27272449b1df0b78238b2d36ca22 SHA512 917b5cf665e12b687035c895b60b2ae05622963f495f5693515fd24d56f49e95a06ffced68606d061bd20822c655100035930673fd4b0d4790168763b6961a9f
 DIST matches-0.1.8.crate 2216 BLAKE2B f18176110921b1cf6e58d52d12f1d1a3455ce2dc04421fbf1b392f66cdd81a88e924571fa27e307a06301d83b04f3b8a0ca3ae40d2da6f2decb8aac4e2801fbb SHA512 98b58f6a2694b03a7dd1be69ebf7e3ad14483fc8e4cb6e6c26a4937e4e660e843efb4dd04a7312dd9659ca02acd3775678f73b8faac44a76ffafaf873c22f590
 DIST memchr-2.3.3.crate 22566 BLAKE2B f952070b98ef30f0d2780a6efbeb36d295710734f678517d913a8002cafebbd3cfc38975fc4546d306efc11bc815764d14320af3b7a2360bd46fc2ab3db9efa5 SHA512 922e05da920d0d94226857788878ee5e31518cd80d95ae57e1d7ecd233942c37d01565525db2f1dfdfd5b3b1f81b2c73eee058cbfd745cb4e1519518318df248
+DIST memchr-2.4.0.crate 63392 BLAKE2B a3f30546c3b58ff4eba534bd7046446e96ad793718edfd3379bd125c47eb270728c4aed4aed1c6afa27032f74078b2b2ddddd5cc6044e117e2b956bb13f902a6 SHA512 b142e308a5aef8e45910411789031e194349ee540c4ced0e2384d864dc1913299fb63a161ceb5228256e97d0949661b7f83a169ef9d4b78afbd9004cb7b8a2fb
 DIST miniz_oxide-0.4.2.crate 46206 BLAKE2B 0da9fd14549b88dafd5d53e997034cdad99a424bb19bb78061527f4dbf27d1dc258d618955f894564a1676adc75a49d5bc9d562f26ace4e61634693e7db6b8ff SHA512 e33c81926e7a78ad68014f3e89471755c20bb594b11c94f214094bdb65000b5ec71369a537f12e7956f55cbcae1d7752bf954aac527e41b9878503dd6ad3e95c
+DIST miniz_oxide-0.4.4.crate 49938 BLAKE2B 3403416bf9d10b67ef976eb23be64216027c67c56225efd08c87f8269017cb5174ae64f35d18acb66c7a1b831347791cee5af565f3ddfb31ae4210221604b0c4 SHA512 2c6e484a8a53c6b1fb84e2bf9518919e6e5ba84e7716c0bb8e33b53dc0d3432c35f28f19c18368e27c94f6df66b7674f514ef889cf1b19f546bedfb6e6ebaf6f
 DIST nix-0.19.0.crate 212652 BLAKE2B a9d3f87fac9591111e1977b9d8cc38d57b560ddd3cf27ce06342c97e10113c8a8e548096d537577267152467883e9ae82618b24b02b2ee355a8689f7147335aa SHA512 db31253c4520448156be3b3e8eb234236a33012b2933710d772f19a14ee83c856f5426057e2f8b87e19fb52d18302d1f8345036ed5dcb7f10e6e961d8e6cf238
+DIST nix-0.20.0.crate 216983 BLAKE2B cb7dc3a6b61abb66645613f16a22b5f127fef38bff5ad40fa99ef50019bc40da7f40457af9dac08af5dd67644c2a102ee6ca99425077ac7e2024c89387587752 SHA512 4efb0a6147870aca6b5612428216f36cd826320b75f4f12fb0c75140d47561834695db7745908a23d08ac7114d69848cdafcf87830718da1f03aa6f2c664c5d5
 DIST normalize-line-endings-0.3.0.crate 5737 BLAKE2B 935b2d20ccd37ca7469641a37aa0ae9b6872715d6ee88d568d0ee16fb76416cb1a0c585cff861825de8cef11d864b1dc1b350911c28d64e071d8fb444bbdf740 SHA512 f8e2a6e333b0e8972febe8b9cf058c8d899c384fd177e0b6ef1c5f94e0fa18192963970cb1a2ba80e3135a8cca66cdae6796e4d84ac6b325bb369575bdfc6eea
 DIST num-integer-0.1.43.crate 21966 BLAKE2B 9e88ee3413965cc05fdfcfcbc7e10225ec52de4f22b7078b9974eaddcd26869d72a9c68f7f19b8e95cd6e3edea8c0066fcde80742cbd3873ad8a0c19c80b399a SHA512 e0b1efbde64ce150a20fb937efdb89cc702b90d71448227f0212bda06ff88dd6beaa02d3c973ae5430d20fcb5a2e4b611d4b2b225f5d9936a803e5e67ad96fd2
+DIST num-integer-0.1.44.crate 22216 BLAKE2B e1c08427e006cde6f2084adadb6086e87e6d6f8bb8dfa757a8228aa671e862a366e4bd8ca5e0500008c18bab128aead9bd5b1e53568a4f40afadcaf3882ee98f SHA512 d07e27ede02a1d007373935fd91e57a26e0e84ae14bbe24be66763baae6850788bd64ad2598d2bde4f4fad6c8a4675c40bfe0927164b16b9b69de5e9a83d9771
 DIST num-traits-0.2.12.crate 43807 BLAKE2B 3913a6c73a928ccae330ae4592cbaf502bf3e6e43f1ba847a02d317003074a07d0d4334eac6e31a5a9220186c44e9ce80111d59203b78e50d4abfc6da4daeddc SHA512 98fe81a3747d619861c3b2789253465eed68c371d74f719885a4b5f09af1abdeb0a147baa52fe335dd4f471f82463aee65fdc9e44432dd67248d5f43e4b85377
+DIST num-traits-0.2.14.crate 45476 BLAKE2B ae310d9d5640acc3e45e1e5d1d2f519539795922c0058ee940c94c94b6654b39358b7c18dd23a276f2c1b16a30dd4de4cbc8575bcda6a5c11e70665d670e6439 SHA512 c3028eca9f7b718de0db3a36cf3e462bdba43562d52c9b809ed4cc0aa6af403aea542d6d4da743cd1dd541397815a3c5a84cef4d6e40122994e4be6a62319b2e
 DIST onig-6.1.0.crate 30287 BLAKE2B 1b8b4539432ddf128381212fe9fb705fc2e9ca366b09bc7e2d109486a95e3f51e29c81c879fd45f3986b05a73dee42d8e9cc86f732de0ce73371f123722b8f65 SHA512 8f08ddbb48ea0e75a8dd8d788dfcc6f88773c5cb44a93f42df8b32bcef8279e6d8280314a096950aa5cfeef17c881b509d5136de69fd805604a0ebce69921475
+DIST onig-6.1.1.crate 30790 BLAKE2B ee5b49def2318cdc1fa7123484eef48551faba5be52659403e7c037e84a9d2c786afdadd44812b1a478762ae582fe24f46425f9d70f1adecc870020bdcb58b29 SHA512 4d754f05a3612486f6730f850956a041f1fb8ff723fd512acd0a8a0a4a2c8be2b98cd6f7b6a882947d3b368bdb5822241e55a87eef331de80c375433d326a864
 DIST onig_sys-69.5.1.crate 615126 BLAKE2B 964ddfffb677a8dd384a0ba5cf2096fb931eb73f48fd1f1ed6767402dd186343a83d68c06f834bd279e929121ead39a8860644dcffda08c52cf627e84c2682b6 SHA512 d85005612206a383af1a00ea508d076d27e31109659a9741e55deaa8423aa649a90af6cdaead67143943f3f9e1db212d5a88597b600a116067f7a5d855a9a379
+DIST onig_sys-69.6.0.crate 620817 BLAKE2B 294bc78ba0aa31743ec12c1cd2c29c3566fc960f64788681cfc3b333e942efc367c1721efdad06bba218a48b3eb1893b28daac163f76cb28a3f872e940ccdf02 SHA512 79903461da8cdacf3f50c7f4d7a1babb200a883a3fa6515119a6d2a82c15eb64b7f758932a2a8c46f89acd052d8f2ab84cf87bf16a3ec9c570667232f54418f5
 DIST opaque-debug-0.2.3.crate 5643 BLAKE2B fc0cf1ca373f2eef8a37f6d7eb02acc7cbe4d71f7844e01453c036c7595121272c207023f43ae5287b343756ca0a8bddc53c5e0186e95c75c019268a5f716087 SHA512 7aa44aedd3fa5a6ed3d60239c23dce4cb7b27693e110140e6b332579bf1c1b773244f12271ced975e53caf68f3f381a7edaada573efb982d2e13d638a3a6dd40
+DIST parking_lot-0.11.1.crate 39854 BLAKE2B 5a097d7016811de4ca7d21e8a811a96b2e857b5224b176cf7a3bc160c0a0678c9100423e3c096c5056e2df3a4dcba17a590cc64eb1d648355c153c5cdf9db228 SHA512 17e394ac8b62656177a12fcfd246d9bb59be468a5ac174e4d6d8b4ffd0411497d3ce943ca5deab184cebf5c1bbca97b4273f79bf210c78d7f4b6f5e9d68026a2
+DIST parking_lot_core-0.8.3.crate 32147 BLAKE2B 5218cfbff706c4388fef31c885c7a5d53566005775a3c440c6a2890efb189a4edfe8e99f6499cac36038846628a915ac988c15e1ebab1b3a3ffb53a64631dc19 SHA512 1dba5a7e68ee007918fb210ff308f7382ed1c54d2fe6db36a8246453434246b71e6795db107c83ca39c2bddf5e4a27da7978a464b53d41e150e744d81e75b341
 DIST path_abs-0.5.0.crate 31108 BLAKE2B 5c6d52f445ffa2f1e87e5ee078b79bcc9dc709fa97a4246759ae1ca476842d87943610ea441b504212bbd9d5f23dcf9482d747294722df7dbdcd93ee187fba75 SHA512 978a3a4d769ebf870ac619f10615cc2375f740b6d329f89bf9af26dcf3e361b4779e95483b4ae11d3ab4440dd6392f7cf9fd5a94dcfd434f9a77a8cb880bf2e1
+DIST path_abs-0.5.1.crate 31072 BLAKE2B 5f7041fc98db906183a42523ff6ed3ae23c1a8119c61860f71dc3b496845a9a0cd172151ba21c2cbb9933b0e2fa3e08ddf467700f4d2aef934d101e090b50fb9 SHA512 fd382fb0233b4029b9c6208b0b574c619cba8c3e6b6ffe39f63ff9e1cfd55240acd061d1aa82180987d72c8499802171f074eb35b9b0c60bc11cb48e248ee0ca
 DIST percent-encoding-2.1.0.crate 9748 BLAKE2B f3ff35ac683724b15e40c85e0fb8ececb07b61beeea82b7020f02d27df05a8a3535f157b3cd688533e414d6541de7de8640ef4756706d8061af0fec94ba04ab3 SHA512 98af4dfa7c6a3cf0d5aa929c436f9eb1ba1b576a944513f1284e6df2ad06be7cab9eba145d888d50af88f8c970bacc702b323041bec6d4fa1dc34095186c628a
 DIST pest-2.1.3.crate 77986 BLAKE2B 210638cdc2cc5e389d2248fbc06b8163dd5ddd77974a04d32f674e7f959acb3c5efc7f26100b6ceb7c346ee06a39db0e11ad5b793a1bc09dba679e6a5a4aa2f1 SHA512 08a36d4571cc0e912ae87e1f2116424b3d4139b653dd9a446fec8ff39cd9a691e8305c86cf75d227b5349197ada4ce79912ac25f0726b98a0642981ac4673c83
 DIST pest_derive-2.1.0.crate 14049 BLAKE2B b85c5a625579e9bddf22ceda1ff808e33989d259f07ddfacaf833ee313029e1a8a01f824da915cfd3d57de57394608a9b506589d642be30e8d5e6a3afcac6a9e SHA512 4d554921b35b6c2491f56b859d389e93459552807df6ff989f9913a9314171e5b6eba93cf7e03528973d6025b663cde7b841d38fabd8197c33beddafaf83fbba
 DIST pest_generator-2.1.3.crate 14227 BLAKE2B 2fba3732d71e6036a911e6455d12ec7f4a1a14331b50f762fda1d6dd244269106130b72025d21e684bdadc0b5971c4b19ccf1f113067c26aa5f1ac71c78def8d SHA512 8be05ef3fd59dc4ccb7871388f8e3cb24cbc2f64eacf7a32fb887f1d8911b528ec545fe78bdd7beb03e2c04eb7fc0ad98ac9fce8579f95ea71cc280912f07c3b
 DIST pest_meta-2.1.3.crate 27818 BLAKE2B bd96b36d47e39d6f8cc6f07ab373d1bf8b8f9907afb8b3774f62677c800914f40a0b44531f50b065ae9d11ec77a940da865b5a574d0cb0d2dc51059f718fa826 SHA512 f31492b452b58c632c0c5c3e357ba2b41ae2b5816d0ec432c1a281dfc681c5b5c2ab4f194c1049938e671ac232d85667aab91323e986df4edf6093a4e2d47ac3
 DIST pkg-config-0.3.18.crate 14674 BLAKE2B a03292e97a195f8eef0cb74f2f640193b2045846b7d79a898927d6b6849b65a7e6bbd45fcd4103d3152e64c6f9c0316f2abf1c86a8a24c0467564894e1d45b54 SHA512 b4cae39a11bb80f6df96262ed77844270c0a02793ace5dd255820e9ce52a5f3a43b36bd6296ab9428253e96f9b991bb6a7090d7b749db1ecb0b03aa721813d8a
+DIST pkg-config-0.3.19.crate 15451 BLAKE2B dc23b5ef12719b4b3d2fc5c93c087399ba954a5e127be91b26619466d5d7422e71684d02905304dca65273d69b66338d94c0642e3810a14df845ef507ddc0bfb SHA512 42bc13c4e39c8f71690db527d815884acdfd2ccf5fbfea700c6ed60257e852cdcb1c443e7774409e51da53612b0ff0aa165554b99fd0cba973f94a8df52982d9
 DIST plist-1.0.0.crate 39489 BLAKE2B b7a968fdf07cab728f64f60a002b1cbf14946431e42f39af4e851469834c58b20b6555d80b51325552368cdacbba27d62c34f7c02da599eb1d06153e52b22de9 SHA512 e8d5e70fe882ce0c471f6a13ea0db897e10594ca28c8113814d7c38a3ed92c90f734ea45646ea12bd6f59c17e060d2269229d191ba9fc3d514e0fa7ce2bfb855
+DIST plist-1.1.0.crate 40173 BLAKE2B dc689529f09dc5370e4e98129bed5580a7d8dcc8b588d4acd66aea9c13d49ec67f449c26dbeb300016585f707267c03fbcb1310b033f423d3a03ea93026bb8f5 SHA512 11617001327b310978bfc114cb4549586af2f25d03563adcaba062d78f34ef2ccf72b4779877f206a06d0a7aed62253fa853c4544285542b6ee88331845c28c9
+DIST ppv-lite86-0.2.10.crate 20915 BLAKE2B 83a075381c24b2b89f5266929f5672ce051c3781c1a199252738dadbf471618c8b87452ce84e1cd87a9eac11b44107002894f544091210cc7e77bf52c045288e SHA512 c9941052e504b9b310024064026e4b1d540dd877705ef450a833d9ff6dee70ba874cdad68c46381a71d5b54482cd80b3dbb8e0c225758fd339069031a55195f1
 DIST predicates-1.0.5.crate 26097 BLAKE2B 4adc79981c706796bef11e75e4a87cdfc5ff7f5066869f8d26f5ba0f3699c292edd6e5dd1be8854ff9e8b2604bf24904f1242056719e1d863951ca6f5ad042ae SHA512 696890cb9ed83b6ebd1b46e42bde95b148fe067174b0057e4ae83d9b3a4d2043dcedf0cc58b78e88b36a460402cd6359580356018986b4a136cba9e1afde55b6
+DIST predicates-1.0.8.crate 26996 BLAKE2B 0e45f2de536395c001475654c5ec2327c66151999ac00fba34abe637c4a2cd10e380597745de0e0bd85b3b088d09d171ec21d40664d878e100cc5d73f3eb5c6b SHA512 a6d8278c331223c24a7189e9dfeddd11a20e7e9010e647a8fbc554f4847b72a13aba2ad22d4e0fedfb2ed4490fd11b05fb2d0e7fda373794b7c0a70094998a6a
 DIST predicates-core-1.0.0.crate 8066 BLAKE2B 71e70aec3adfae302287a1cd3d7d19eff8a697659d61ced33b89caa8a2a3359ab7251db012d973dd574abecec82acc010c5169d0670096af06e325761363c34d SHA512 024f997976ae618e3b82d59613f8b6c41b3c0b3b595b6cf38d10d2d27a11388e9511ca38c06d46b52a12fc19d3cec36a69ca14e1e21f316a719539e41c86d6f4
+DIST predicates-core-1.0.2.crate 8185 BLAKE2B f2525cf9d1444c0b6cfd981fb9f8555e4e797fe2a28edcbd75e719121d55eca593249d32a708e920c83549a2240dd04f154b19e59faf740ada773c3e59d52483 SHA512 bfeee297e7bb81c1cc63908ab47f10e21e53b9f690d9aaf08855bc1824e0c87cf05c92e5a8dbc57eace7490c0ce58bbe2e178ac33ad0553ad2772593d89f8aab
 DIST predicates-tree-1.0.0.crate 6251 BLAKE2B 00da28f7de9a7abb386c6a4425d8a2285d1ef22032476b0ac1bab4b8d34d2af69948f80d8f0498e2356caea3fe92ce352b58539413a8f0f052e9dbc26c96cc12 SHA512 29e1818b7cbcb7195dedc78e6a1436e8e8c88b61d43469952c4bba5bef7dbfd5b7f0dfbd9fd31f71e71cefe7c7b8c44ef361bff1a86f40c945caf48cbd87cf05
+DIST predicates-tree-1.0.2.crate 6341 BLAKE2B 6a701096226f37076d5fb0e62e37609b86f08ec32ff76191ff2717341979f946642d173fd9911929ab89562572817d377889c3a78af4cebad5e362c1675c6813 SHA512 d11b2b7d44ba5a00ed189d4455216f0c991c0f272776166a528136e26436e3f0cbbbdd001bf9a2b9aceaaf221fb9218fb497116e7957bf6bd9761616428c7ed2
+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 proc-macro2-1.0.26.crate 38233 BLAKE2B e44a5d98fbf75130c0eeb8fad6d025ce66fe41cc5ef882f418bd8c9e5d228d712020e309dad68e2f862e5f9216a1103fd6e69953e17c213166467b335f604802 SHA512 e6d39cc0d5ec644e3fb424347bde0a82a8ce8549745a1a827bf4dc21f6248471935b5499c3b6d1b7a129f0ddc560754254c528ac39fb1fce2ec3bd9520afc3e2
 DIST quote-1.0.7.crate 25170 BLAKE2B 9597c94ac365bb6e9d632738a88ece2da7818cb9f3fa0e755324e693eb513c76347032737025375a486319caad13c22ae13bcb257703eacdf2fdc755cbac0de2 SHA512 b7cb576c07419854f71072a88e4216f50d78196703d3d8a1068dfd0f2ccb1e417c3a865ec3be613b46e74e46654f64378f527800701f74d50352cb766a885953
+DIST quote-1.0.9.crate 25042 BLAKE2B 26ef31e89fd2f0cc21ff65f8072f30c7977ac634d2536cf9845a0894d6659f62a96cd0a6ee48f7706036c2c1b898ef8c9167bd62714ad0c9cba4fb02f30922af SHA512 dd6cdaea183b85400531ef01e56657edbec0d8f7c27898c1e591b72dff755fa5875b33ca320bd65be0e9aecfc6a61ec119a4bd1291e9f2057fca642ab5b198c8
 DIST rand-0.4.6.crate 76401 BLAKE2B 5593ad2d7fb8214d917e2eb734f5eee548f48fd699c9fccc0de9c0c6ee49803a426492a25fda2ffcf844169e2bca00709d4dcd9ceede72a4667ec431f5502fda SHA512 a91c6da7188b426bf9cb832892ee2af87c4cd65fad505c34e9c63343da71efe8c0c67b75c405dca5345317b7940d1d0fc0b20be85afd6b3089203e5698d86f0a
+DIST rand-0.8.3.crate 84493 BLAKE2B 5db817304b94424cdc77b60c9a3aa451abfbe315d97e311776ff9cf968585ca98f24994df3fa708e3896d36ba66d5f8dc795a652d2c568edc6be355baa7b4d69 SHA512 fd61348a8c3187881473c8764238d2388da3419e82174f2877cda51a7cd136106b2c7f0dea6b914f120b929c1db323529fa161465156661ffd19eef9b2737e4d
+DIST rand_chacha-0.3.0.crate 13920 BLAKE2B 9e329831b46c4d6cf2bc6755024588df907f87145adf35e156bc1c2b7068b583b652f90ba35094a1bba26e0449d32d2877fa52cea012ab50429ee526264caf7c SHA512 631f32a5b0bb42ca87ee8381795402f8c5a80202700b786655537f981c0e210e41eaa42ad4247a25bce1260c29caa8ba3b03f92e520ac331403fd8e76fbbfe93
 DIST rand_core-0.3.1.crate 15483 BLAKE2B 2e09b3b3306514c29bd7588498e79be7353de656d8cdeeb4dfc6a1ad092f15a861c2ac20591ff71f7f60d986de9a09c860de4a9f06799f04e736b31bc70a5fbe SHA512 5a7ae601124502bede760fd3179c2b28059ebc3b5983bfcb6b8fa62fb58df95cedc1aeb2734e792d894dfa4620801c13c29702f9cbee64243121575d4b6b9114
 DIST rand_core-0.4.2.crate 20243 BLAKE2B 22fee5e44127eee047ad8abcd9dd828befd0feee77ee9a0bcd4dd42174b1e650f2a19f1f3b39fde937e58c17afaabf7231e2aabf214c2eb22edf3f85b73f6eec SHA512 f7ae3b690e2cc1fbf2707ee04b752bc5472433f737ab581f9872f7c5660966bc6be45f0c5d2cd8771105df6d4a9d206c55f5cc6ffc1693b46e1ae03a2883b028
+DIST rand_core-0.6.2.crate 21708 BLAKE2B 745aab7160c4d9b52e7d0ab0fab257bcead4dfca1242d820d760bade713822b7b8e283852a2e337a6d33b40ddbd95f86c36bfc4c418ef0ded86f59ae4a4df56a SHA512 f1f21dd6306d6f4b5666d1ef4994d0d68f10a7a94fe628a5aa8ba28ae0376cb34b7c091f82e2db8f2555eec4f35088f6c4df42ed84de7467d5780e284b397115
+DIST rand_hc-0.3.0.crate 11780 BLAKE2B 7600829591c3631aed73598d4837b0e3be55aa0594e0562ab7914013b19c4f88648e0103765ddf32643e771e0961ff2f726b9c8b323798d36ef9b994c1d03ffc SHA512 c78372332aa0bed3352d58e07be3e97f01e69410051be2d3cba569b05037df7379e896a84638b4e9f4e477b9851e4bdef0accba2c53d118bf4667a3e1bbe95bf
 DIST rdrand-0.4.0.crate 6456 BLAKE2B 330ee64d998a0358f95a3dce50b3e1bbda531a3b613db7e5ba4038a1cf7191b60be3a0f33416e05380c41040704ce52727928915e9d2f4565d39984d1c86fcd6 SHA512 6476275d124bee28747191471e8d8f321a3b1c148c1f2a7ece4175f5244a7de90afe5f99d2eba5244d886b92e38232398864bf90e6d434b09494533942c8d894
 DIST redox_syscall-0.1.57.crate 17087 BLAKE2B 88e3ffcfd752e757f8fadfd4edca367f9185f09e609c329bb36f179183cf103dc182aae701c14afb717d2b4c3d72ba307b49fc671cc97aa7c9d03df1a7a1835f SHA512 c6e187087060084b7173ed0d9d0e982e4259d4f76522112268c02ff20751382e3bc8e119da6153170f5c54bd5b9cb028910f2f85c1c842099205dccd44659184
+DIST redox_syscall-0.2.8.crate 23697 BLAKE2B 5a084a48e06ab0dc69f64b05058b78d994040da6c42f04c8b615b1977fa3e813cd5a531ab33402402914362301670709679aaaa321e8904424c38d35c284b7ec SHA512 250556a7683254c9daf22887b39abb010eb9d4fe08b944e52bc6595ef6d8acfed76e5f43931fe20c84bdb3743772fb62a0be154ecfb6e66c2facb4c73546eacf
 DIST redox_users-0.3.5.crate 12644 BLAKE2B 093141c98164163dc66378f2ccb48a5f478c5b40b69ad4ecb89fe8967e4a309974088ea5f7a2b184b625fc03348f2e75b0809d3683696e9b74d5c4a5ac6a4e8d SHA512 d90f1816205a4f2eca59397f6866e5cd965af652940f56930f8bfbe2b50eda75cf78b09200bb69416a35cbeead3cbd4de354805568be2feef1ae4d691b9a6a3c
+DIST redox_users-0.4.0.crate 13023 BLAKE2B 66d0d1169f98a27a00930c86365f289c38659c0d7b248a6870d1c144dfe63c9752429b2912006527d42aa321f9605892ffa85257eeff1ae148254bf370dafd02 SHA512 4058ffb2fd57631eb6346c8839262653af3f2e670a69bb5739d64adeef7347849b18e191c594303da1f5e29b4a3cb000161fc1b3ea4b7f94585977597a2574b9
 DIST regex-1.3.9.crate 236683 BLAKE2B 29bd39b138a8168015bb7a6b36bb5f7f9918b7c00bca28a720f3dffd5b805d3374a6648a04792585e85922e099faf547e5d02aeb23008b7802424351633ea23a SHA512 425713d3eeb4132d4056e6c1a08bc2fa5032b9971987c531b5707a9b5670ae15f037bd68921f1545580801957d1ea283eff87e533477364c7f76823800202f74
+DIST regex-1.5.4.crate 236581 BLAKE2B 6efaf69d1a99dc3a2e04b2d1a96b036f631e9a0ad0d3aa57263febd47f7ec12765526f06f9c52a5497bf0d9b455f1d1b39e011adc4c28530c44b65c8a453efc0 SHA512 1a9208358c4ab87c19ec91bcf5c1e35dede46f3a0c0097061b7b53fa77a1e5ad38090d243aab274956f09c491e5fbe3b3b35a91db079b82a2dde2fd9fbad4c19
+DIST regex-automata-0.1.9.crate 114560 BLAKE2B 2bbaeaaa896479c817b7bac2f51108f8f74fda72178068c3b5e599b466899692fba8ff3ce8cd30f1f978a944a0df98f466f3d4bd340bf595d6f7048ba6f648a8 SHA512 53323733dc2f8c47ec33b5b3aefacac3a0042cff80c59c3a05ee02b581671dd9a6ebf6b0b5eeddf9cd249662731cabf5a684553daeff440bf8d1d4d296afbeb0
 DIST regex-syntax-0.6.18.crate 294440 BLAKE2B 355d6a2704e1267064719927269facce1f1c8897566d41e54741183969cde5e56c38d0c0b610b99dea3635de20fa00ebfb8748ceea331af6984198d927a93b73 SHA512 9cd999837890a87d0cc6bc351029a422bd52e5c621763e5c11ae9dcf1ba5edebabcd9e6d70db0b1656072a6109d439101412b3aab0d6ad357ae02ee7039a010e
+DIST regex-syntax-0.6.25.crate 293293 BLAKE2B d5ca0dbc26b03c6a1818026f9a69cd226ec934e7c64094d0ebe843052b648617ffae7aa3a074f8da46d03c46996d8b547d8916576342000bd9711089b3e57d73 SHA512 a3d31f82aadc6be1796f76c03152ff24f37fe42d6ce27fb98e2f55ab102f86502bc37ccd563f6e0eba61aab20d002184c618517b678b3b93cb8f0497cc046ca5
 DIST remove_dir_all-0.5.3.crate 9184 BLAKE2B ab7ef94e0230ddc9b363f038254a180881bbc20eb04a254f97e6f71ed491c99ba1c88f5e85632d450243882a4a0df63f3b8b183bc1fbca9caf30ec23d577b1d7 SHA512 50417d6d8a33912193a1ed37eb72b47431b12ae65d2780cdb7080c3d141e63819da13751c3fb737685cea322f70b36d413389c3dc01aa12b4dce615aefed0e2c
 DIST rust-argon2-0.8.2.crate 28291 BLAKE2B 65b9727c348e1593bea85bdcd65b21ff0e667d87d1ff88692165d49948fb7b9294a4a4a20dbb824a68a2cdd59ce1c1483d6dfdc31d8f7800c7e34cae78297a0b SHA512 9ea8088ee1caba0cac453cc54f7e7327471282d0a8a65944b1c911f809bdeaad7e9379a399d215533e3c05538c9b5b7fe1f9845b01c580d76ada61ac8a24327b
 DIST ryu-1.0.5.crate 49570 BLAKE2B 3bfba4a5f290a429de7ac3b86823b2a973f40eb6f48c15329173d95964d31ada36f2618be4b36774a03f97f2ce61364900c6a3ad5465a294e2df311a1f4104ed SHA512 d1708ffa3112a684edf2956b6730ead040401d38f1457cde074eaaa59c249007dc8b925629e7f6df89f7ea757e9d0826649d685cc8ede0a04d50296048bf476c
 DIST safemem-0.3.3.crate 7778 BLAKE2B 6ebc0e234054919687e8a369bc30ca6b007d0e4f8147157ba1a90c290b7f0b490e5c21a6d4406671e26ac073f9e4e06a2bc9b1f21eb152b05c4022a3a4ef3793 SHA512 2e4852ca91160f9f1e764b75145d794726a5f6c162cc99ecbf9cae20474a06cb3a0dfc245b895c51342240f6875423010b33e36d038b8b419a37e4820a9caf72
 DIST same-file-1.0.6.crate 10183 BLAKE2B a320c8343e0b38078ba81c4f0159d886bf47764c74efe0d7cd2b3218426e8341b51e523c00a9e5fbc2ee1057618296bd70b576c68751bd55d6ddb352defaca15 SHA512 3ba35309742c8db63210d9ea78bff4ecd80471d69e6238eb96c7bf0673814f221e2d838fe6311bfc5a0e71b4a7ccba33e07859c0b9cff2171969ff08a4214a7c
+DIST scopeguard-1.1.0.crate 11470 BLAKE2B f774eb90b7d3ffb2efba47518e9d1dead4017ab4b38a4bd74914daa84a5af4bf9eb63da0496e3924499d79cd0439c37447aeda4a21226f95645bddcd6becfabe SHA512 368fa5726df8f42b599993681579a9ffd0196480ee3cd0f9f671e8493f3bedd1e1779bdf2beb329e77e0005fa09b816e3385f309490c0f2781568db275d4d17d
 DIST semver-0.11.0.crate 20826 BLAKE2B 9006a801dab95e7a28605f623984b467221c3207b64af251bce3fb4fa74f731c4a3b9f95081bac59f754fab215782856edd98dd763b66563010498b97e8f35d9 SHA512 bdbd8eba37071ec1d24d372cc34ac4d82b6d914e7396ed51276e80d4d299864507a9d837ef381f6c4868981b7ca35514050ab8d7a621d43697a9c4b4bd5d8573
 DIST semver-parser-0.10.0.crate 20247 BLAKE2B 0352445eefc48dc9b34ce51a89e98215b48135e594db28d72c7729789b738c109b462e8ccf915c098a9b00c4cb3ef2182c1f3e8c4e8b64d85af042b752b607b2 SHA512 5477b586de589fe7e908291a30208c0e1d68f2d19fc932f81903233616a5e21fffaa5e6560f329ba07e4007182997ed90e1c9d34fae310aa6ccf47ee42e49b6f
+DIST semver-parser-0.10.2.crate 23176 BLAKE2B a946a635d207f14a59f3b5db3d0a6dd8ea283bfade3fc15f07bd9f19087bc12203591a17d697692ca12abf3618481d53f4e7492b80e7233a519bfefa49b95da0 SHA512 154a6905eb5fb854450a0bd00381f93ededd6f1a992103a53464429195102eb266c7e8681e89cf952223a51427fa17c0a36e3b7c2eb6d375b309e5fd3d721f1a
 DIST serde-1.0.117.crate 74505 BLAKE2B 59c5243dc10c00762659ef6352dbec857966540810117990f49eb1d19de435284151f8f0211000c264e7f7c6d3d4ada45c695384d397b31daae32d95efa13048 SHA512 77001954c9f1f7eb11c7a6293454dc0c581e536f4a07368dfcf62b744f42b620a6de8c67ca89138291b964d17f198274e2372fb72a9905dbbafe56276c5a9d5b
+DIST serde-1.0.126.crate 75138 BLAKE2B 51f37473483da8a05670a213f02e119173e4c97a49313cf855ff3e547bb0969fcd84ccb7d1554e7c1761b388ac5cd917cd7e680e3ac23d2504412f75401c0937 SHA512 f22ec92b2eaed0819610ae2c4471eb12aa3a4209f5fbfe829c2329010813837d11ffc02d7809335df6a978cf7944095fae79c7593324dfd49becc7633dd626ed
 DIST serde_derive-1.0.117.crate 50712 BLAKE2B 59bf7592d80ab2085899e256e325e0e43c69ba2134ff423e0612f31cdc1629e9d519be538538546f21067ccc460d07619a3fb2312bb31263a63ec4f624fad788 SHA512 072c761421d10c1b25d545991c0ba9ef6dfaa1a6fa8797abd4a2a194b121588d25942ce662df9b4c5de2fea229d6c06c7963224ed80e3fa11fac07f6dee3f72d
+DIST serde_derive-1.0.126.crate 54189 BLAKE2B fa3ca8ef2e7d9bd29e682ac7df066bab05301c2b92dc8f12d254a7e8b29e8d8a83d5405def3050db00f7e396fdd14f18cfac7918a5218d4b6822463c7c0f5c5d SHA512 e3c430b82def037d2f1dcc96ff7dc075636c81ab8f12e07ba09d232bc8224204c7b0cddc994c1ec98400e50340e03d6bad0dfa624b4d869e5f29d72b293d30bf
 DIST serde_json-1.0.58.crate 114933 BLAKE2B eda53fe830e539b760ad968191077aab05512f33d613796856cd3df7cd7ce21e9b704f30a6748e9622bd47e9c0c69310edc12bbb1dbe90547eb3b7b97b93a475 SHA512 377a067b1aad851fe7056c080b7a3d07cf6d2c75122766f25b2bf30d6023e70a6f7b5211200019983bfb1f0ac9cf09da4a8c74aef45c819a785818a6ce33ca0a
+DIST serde_json-1.0.64.crate 115138 BLAKE2B c61a404db9800cfb4e2ac29d4e287a7c8f388b62407d5e25e07514e2840fdf9c127476db35cb556b56143755c64c26be1c6b1facc7529067b06946ac8f54a573 SHA512 55a45dd4c60fd93d2d9331f6a8eac39fdfece9ddc1aae45ea27e3dfa81352f08c71bf03906ba99d0feb5df8d847b68547ecaa8eb5a2c76011ebbe8d4cd5bfc2d
 DIST serde_yaml-0.8.14.crate 37928 BLAKE2B 58b5fe3678e022667696811fb0979081e50727f6efb288f97510eecacf86ad0ad1c6ae98a3916df574cfa73c9825414623f0a75e623e149048adf94369560c08 SHA512 de4b18f1e9bda434b93b32c8b3c8135ec3163ebf6f734920dc88c8736e40c05dd75f314d730c5c0c92eb259b85c5fa9263f5d0f3e78a7e214a9258e28c5ec06a
+DIST serde_yaml-0.8.17.crate 40805 BLAKE2B 8f70ed3efa5afa1f8f45b2c107463799269d745705ac2b90e8ce69c090f4f52721d49723dc48967bdbab30efe853c661631063fe16bc3ceaed4d0158f90ffbcb SHA512 3e7a4baa156ca1d9655a76fbaccd2d87b6929165972f6390316c9d4d55fc9815827e3c4bbb8a1c594f048dcc9c3fd6f4c55370df27f6257dbc28e2066274a7c1
+DIST serial_test-0.5.1.crate 2993 BLAKE2B c72cfcfe441d1d23128d442a3d24e83858e598dd95bccef0a462c675793db0aa1ad2cd03daa73441e84c8389b8dcef9b4698cb8eba8bb5dfbf69e524331950d7 SHA512 e1a0f7a24981698eaa6bcce8f951863f76e8a2750aff3191104d092a06021c39d4eb2e9b74e6690b0dba0d674a216ea170efe0a5367d22bdef72c2006f644a4e
+DIST serial_test_derive-0.5.1.crate 3609 BLAKE2B 54e408dc15f15c26e116157046ac609356b6d92d3e5bd27e08c31da537ec526eef8e6e52df1f06521b98c6c0695197b0b2ed654f0e46a45cf15156db82688d08 SHA512 e3f4b3c2eed1b284dbff7447c2f912343f9b95cbd88f3387c0136ca42698b38a607c752277ee4590ded9f73f475325d2652ba67ba029ddd54711d9070ac5f43e
 DIST sha-1-0.8.2.crate 12338 BLAKE2B 90702eff48c15b49195b547d797976837b0fc9028f76da626e094b80d5d630bedee637053dc57274c27d68b8b6f3c443f1aef37c06b7aad895630bd9d73039b2 SHA512 65ddb7bd8f0157d134e70f7c6d6abf7aea198cb97da17b418a265642c5930b8cbd9c8e0b97b557102787cc842cddc93213d669345c2aaac6a1e7146765b2d5cd
+DIST shell-escape-0.1.5.crate 6847 BLAKE2B ccd71a73b217b375843d3f0a762b3f5317bc0fdc8e43380a17f25e1ffdc391de0af7b0e4472be23241a6654f5b6ab799a51bbed8da35295322002c54ad84e9a5 SHA512 848f8d47d802b82e83f113fb07f44fe962628379481d1bef9d15f2e5821a382c9928c32175652361aae9fe4c8fa5c1dc1c89350db6ef5e68691bae4a3742df93
 DIST shell-words-1.0.0.crate 9798 BLAKE2B b2511d6a956842346f672edc9a3a3554af6d424c3ccad4244c190a7edb5c6d9f18166d91a90ce2c4e86239b858cb04f36f3cb2ac0f1e64926bbc8377f3745d57 SHA512 f1de4606bb249fca7dea437464ef560aa49839382716b9c940738547a5def28337501d9ba77d96a63ecb956d3c49867d6f4742f14946448a2c9d0b1ecea9ebc9
+DIST smallvec-1.6.1.crate 26444 BLAKE2B ca6c50a63acdd93a2131654d99e50545a6e2d08eb3e2bd57d4a8ee073d90c08195ee442745a8d62a68179ce7bb8e229b7ff8c6fcf46372a9844bc9280b7c85cb SHA512 9e6061c8211a4485ab54eb541adf40748e1fc3fdfab0849e38e5fd34fc6cc69ae78bd065b788692385a6b8157b031c2fe373900e13d3e56e94fc08d574edaaad
 DIST std_prelude-0.2.12.crate 5066 BLAKE2B 06e592e98a78e7d4f0d40075d5c77041019264cbfb50ff2f5ac2a22655787d3f70e4b270aadaa5508e965c9a8615b98b7f3307ddc42e62de708406f2fce14980 SHA512 c929e6eed305c337c4eb52caee63c5c016394ccaf2cb36268a289bf0bc74b0a20d3e739b3b7ca87e30eb45eab503203e04399c04d48f2d69a94da75cfd5804ae
 DIST strsim-0.8.0.crate 9309 BLAKE2B 40a8be506c43ee1ffe006ddc7dee98c3d418bdd205d57b78f5d1e4c9312feb57e1eaf952e02d92d4e0932db240c6fba45beb06ea8c4fc6de1cf1faa8b6a3a939 SHA512 1d55a8d946cd55f5f37d06aea536549ded95739fa58c0f2da285a0041154c181f663682bdcac643aa198b3e762d694a04f058db985c62ebe22b5c16327ba6d34
 DIST syn-1.0.42.crate 225244 BLAKE2B 814e7f8fcef54ffb87710fb271bf711b7d463d75e10cd0a686097d73d49767fbfdf3d84a09bc64b520d243db1b0be367ceb5900812a987fba48abec597ac629d SHA512 c758c4175fc9e48418224a02142f045eb0fcbb9ca6732a9ac36c55f075ec70268cc729f6b8002238d6c79a8ac4c3a9ef8c3ff69f78db9434fc9866152a2932eb
+DIST syn-1.0.72.crate 232500 BLAKE2B 8f71f7fb66426f78eec3439688b0468fbef582c8ca912781f19607acd9e8371f2230b305a96f613c16f7299e66fdb2395dc037e1093d3897864bd2bf50ab3d7e SHA512 f01e2ef74fc3f84a753c1c379c24e3c63f3c575d72ab865f8e7d51f4dee4293ac8197b4e123ebaa942e9199bf0a0d8194e57a5aa6314bee6951d3d458dfc3da9
 DIST syntect-4.4.0.crate 751314 BLAKE2B 4d70ea137ba28e733e2bf505f547e1caa8a38dec33497e092d5efa77e321bc468ef955a0957ec949a0c68df31684e33234838f177f201e77d5e70aec8337829b SHA512 018fc26a99cad799446dfda0e406af87fb63e35cc5684fe2928f42f1b0a1199606a25b9ee4f1bd138abebc40f365c26407716856376f1ed6d3352c879a1689f4
+DIST syntect-4.5.0.crate 752883 BLAKE2B 9c9ff2cc63ea421c0b8928a0578b278883d0a86be7f7c256820120a858f8c02b1d292e2474e5f2b63486e45cf5387e1a8ba4db2a5c9e7a2b0cf4eb687b42ffad SHA512 17653ae9baa4da049c899820f6033b3e7d71b96ab70b9c12e57a1ab305d155b12acec470167be2a0a37ea9c89ec4d19850f72d456e6857a7cf4dee65fc288273
+DIST sys-info-0.9.0.crate 20287 BLAKE2B 1a6ce4ac9d57d41160c145f7c5ecd671d306ecd56be6b0de49fb6e6de72c01288b863c71c64fdcda5bf828dbbcf288fb11a7289686de0154e81151cf808a06bd SHA512 847556f3e25f2e0a97c76b2b00f350230cb234be0f93bc5506d0e3a7ff3365deb439c7aea4f0722ab3d2f53ad76e7d05aab2167a5be44cad1e85ebdcb39d7842
 DIST tempdir-0.3.7.crate 11468 BLAKE2B 65850a69a07c5c7e5c25d77bfc9881c994b1fe8466b1712b904d9758b234f8d12db6e1b740d461a48b13667bdeca8178e75c956fd6eaa0c0d5aca5aa1ac7523b SHA512 e5b02f7d260ff594fc2dbbd441eb8adfa36ede937f32c8c812b458167c0e49f5cf493c6ebf83ce8007a0aeb97016169fda7f5d2996fecc72f9409d6f463d9bbe
+DIST tempfile-3.2.0.crate 25892 BLAKE2B ea6870c642c5712c7c96072a5d3dc04d75c19cf1413081e3bf53c1ae6c75e05ab537446071cadb5460b34f7fb7715a03005a1335a64139458db938c3415f7c0d SHA512 56d1c5af7cb6863f9eac990354126979534aae7bf298bc8b1c918c7317ce2ba31f53089aaa1ecf8baa4a39d4111d74f4450be82b509b3c2aa0428880029e663a
 DIST term_size-0.3.2.crate 10917 BLAKE2B 2302faf4cc03e0e40e4b4b0ca79cea5e70caed8087a16f2b985673476041d19ee6908bb17931b453e63a89e33158f7e01875716879964664487fb26395ff7f49 SHA512 7e820ca667f841719e82cf97e90bd2546cdd7ecd4834c68f8eeadd2e530bb13ced1d058ea7beda5db77eabacfaef64b8c3699c482bd912ff570f6ab78149dc88
 DIST terminal_size-0.1.13.crate 8094 BLAKE2B b46de1f0dfdd6f4dd44c21a5cd7936cd9fef67d96be44775c29f3850e39b94f200c719bd0c0c31727725f1741ee9640a83c1f3083a45ed665db7f03e50793826 SHA512 75efac1092c6919efc7d427e3cf7d4c36a4d12b3d5c38ee35f94ddf2fb0efcc16fb92e608382905475d5de3078e9c64a29ec77816572797fdfb53a6708eaf266
+DIST terminal_size-0.1.16.crate 8755 BLAKE2B 33cfd9a62bdb77bd096563330ee5f07465d69c16659294a9e6ebeccf3d49e17473185fb84c2a4b50d29b084da0633b2ac4bf41801b0bd17f5c927d9bf68fdce7 SHA512 afefb529a80249ec398b444f593b6010b2a85e65e29557373cec72ee18bac5a5359aa2da3cda28d494f34c8eaddfc8a82029fb936d49726261ae0c5557bd5c17
 DIST textwrap-0.11.0.crate 17322 BLAKE2B 257428908342774593bbd3528fcdae710712ff54e8a711393a24356d8ba0e16e466a4b20c05f942c48ca76b3b5b5aaa90ec202f782cad892caa8b71ccf124da6 SHA512 f5c0fe4f28ff1a3a0931e8e235b5157a45f67967985bcc752418c5ec3481fca44a8ae4800088889b37e8cd0533f53d3c456d5ffd19b767b3f83a87b49a2e209a
 DIST thread_local-1.0.1.crate 12609 BLAKE2B 34206b5232262cda9cc0fb970e20f154d43ff1c4477a5ad5ff9200e6d874a6c7b2bcd99a2dae75a984b54574281e049ad35307ace0dd188f44c9a95fa93139cf SHA512 f2bfca4eee32a8fc88a01ff5bf24518c12142228d95916d13aae35ed6addd0b7da2235359f15220049ef197555344ac31a8833775e7a5bd49144db9c54b3165b
 DIST tinyvec-0.3.4.crate 17586 BLAKE2B 2173653c5433ba8fda3afb7e88e9065e2b5cbae6b25753eb306423e8b0ac694074d678bc50a53b2ccc228a8e8b4d06de2ddeb63f0adf057feaff8a998820eb5b SHA512 91613078d89456fa233ee2fa3309f6b2b8d490771b62fdcc027336bfb20ee5fa3d8d3dec446ab397b5974127567d4f62186c6eea45bd9c767719bb770101ab2c
+DIST tinyvec-1.2.0.crate 41625 BLAKE2B d7ffe63aa2f076ecf57a2c8af3269abc7c811b7e19c3bb6ce4830f9d12a9942620a43786f4f578000d01883a9cc33105619e4357b29d64babb9d6313ad99bbd1 SHA512 eae5ef44a90995a3e7186e52c1d90447f677b9b6db2f4e120e5c32f2077f324f000a16474e347eae702b7fa2a487f3e5ff06baa2082f3904ecf404c27ceae74e
+DIST tinyvec_macros-0.1.0.crate 1817 BLAKE2B a3d1966bf57c11afcd026269135a6189f149f905bb70b47537c0a7bcaef0bfc6c89bdcbdb0f6cb8e5255632855134631c683fc90606a254ec8ba818fd5ef0794 SHA512 d6afc83a3c70cde916a6ff599e2772588e4bbfa7a5b1c7e5c8aa0f4a8a5c9426182497a644e4a88194ece986d38fa64b6c8eda9eb1630441c8e65a8741a45873
 DIST treeline-0.1.0.crate 3855 BLAKE2B 3347bee24c686a6b6890f85b60429d36b14f2738e6a5e5adcd493d099b097a8087f7c61f4c155fd8b3af3982a97da31740353b4d036ae451ed8944a9b0feaf75 SHA512 37a7c7e95855fdf0fafe5b529eed6c6cfc641da799bc6738a5649a9a0c3db2ef3e63d692862a987bc19263f33b6df2e8ae71b49fe30160d6d470cbb804511824
 DIST typenum-1.12.0.crate 36037 BLAKE2B b5aa97daf856e4c0ecf6f543ce75c1203ea2a27b493e4e62b1a0a22fbccf79217382061833e518a5de296a00a4a5f3c0c1cc736a7fa40a947712fcddf0735ea7 SHA512 b88dac076d4102f2b1d74501cc2bedd4eb923458e060ab77b826093e3146bc48005ad7d3471921c4f5e8765f3f93f8f7c48e0eb00e2623ad439bd60bcf64d6ea
 DIST ucd-trie-0.1.3.crate 44615 BLAKE2B 491f604d63446dbccf5176333edd159ac56261a9aa76efecf57e9a11ae017a6cba975658a4ffdd310561704fb0831686fb7770b1142b4ac495f01e26de51b099 SHA512 54d43b3824669aa20b725c7747f4fb65bd24e620670c968c1bb0094a0503773acda921b50a0b200c1ea0f84e1e059883c1704bfa5a856d2e2ccda116fb8c3e2b
 DIST unicode-bidi-0.3.4.crate 32228 BLAKE2B 853a85b29d1ac2025b7a28af64ead9387e3b4b1e790ad719d4374e349c1853ddbb5959a2890d9d6c94a5c28e4523fc3324deb6b1ed1aeb5e917f21b0e2516f6c SHA512 170ce083fa82bed13ecc62d85cb882fdd6491ae721e1633d3c1a5d3cee69422153afcf6695765c0e8fc7035440d0370d34afac9e978cb27f7506c07cba300e1e
+DIST unicode-bidi-0.3.5.crate 33423 BLAKE2B 26434df7646ca6fc3b655ac2482c2be70700bd84fdd31d016f49b5276b23308d1f9258d40ff97a4090e3dd603d3a19f8fe45c13c5dcde6b00816dcee1695c7d3 SHA512 4541d84db17eef16da6ea59f1ff7103549ff338d6ffabef21e75fbfcfdb1a3fd0f8e8fe18abab7b6117e997cefeaa5e87fb01fed8fedbcd0657fc913743de8ad
 DIST unicode-normalization-0.1.13.crate 91691 BLAKE2B fa4ae7ce7f8e5dd43ab8e60dd48938340485de3537ad14c1dc1e7404a89d2b3022c4304cd85a4c649b8a27fa9c79e4a059d3e5d5c2011d920290d8719c74bc77 SHA512 710e002da7f59e933cbd09fee328193a1e19cce7b12426007ea32fc81ef2adefa5c4f2ad360ad684a937ab18d4be404a0a28c3de375628168fabd21ce1a6ba20
+DIST unicode-normalization-0.1.17.crate 100345 BLAKE2B 2579748ab87f6d74ab8e845d88c1990e4ef32e46e38f9a1841e3381d257d973f2f8a9da359c8e3f11790a888acf81f548ed3b749a67bb3e95acf3b744dd063f3 SHA512 727b4844a4eb103375dff7d88d620e1fb581cbdf2523f07a5c1673ff333d772d48ffae7658bfe4816a5bb42de5f68a96e15be9341c540a0f746c2990eeccb3d6
 DIST unicode-width-0.1.8.crate 16732 BLAKE2B 5aa7b87eef1322e4151a3fcf981ade311b8fa030527d7561815950e58d3f15156163dfe34da6a708c37dccc3f7652bf7fc2cd899fe8bb0118b67c4113ff3a2d2 SHA512 0abba6da6981a2451e01d93bbd47652c46eb6fb07cc0214f33259fb29945bfd5ee2b302e883ddca8f68e921635f222701b7310e7da2a5e225f854980d1e474b0
 DIST unicode-xid-0.2.1.crate 14392 BLAKE2B 7f8f91b9c4df55f2137b754208d4f2997a290acfc9393ee2dcda8195eda25cb342e56ad123f56bb298d93db5248a749c18a982423c9a0e85ce93f7a1eb55d289 SHA512 91e862137e837baea82829431cfed36634fdb05339f00c756eb5a4b429ef0bb871f5133d11adf9a023fa22168c8a0cf194ff3669779f04f219d48fc4fac339d2
+DIST unicode-xid-0.2.2.crate 14955 BLAKE2B 6c6da49ac08dbd8b3248272224d6bff96b9cd1f36029b1937a58a0b929c3a48326053305ed49e73edd70f572f5abbc4817cedc899c69e3457805ad056669f6af SHA512 92ffd0dd34e3ca235ecf110b38c447d3ec1faa23d76c112457f28d432f92fa6b5f428bc5e1bfd278f361f55426dd96e19ecb0d3eff6cf250892f069c52bd89a8
 DIST url-2.1.1.crate 70383 BLAKE2B c4096cb1bd50e9ca97fcdae0ee8b58957e21507607eafa8d84ff71c3df1ba52c68299609776f7baa45c93b971f8b61162fd8afd4174a5c7b66f36dc673707fa0 SHA512 a16c3a625fa85be9305f8150d5711c3e3aaa1f33753e7ecb8368b176cf3ea96f51fde74598c8ea3a5db2effc338589fd2834b297a1fba4bed967fa39e670fabb
+DIST url-2.2.2.crate 68555 BLAKE2B f8e59f784b6c2e16bacfba36ad68670a6af17c16ea3b0866b5aa98e5bf4686cf1b1aac9b1f0a0ea3b89a01e044a2ca37830416f42d147158ea8e88f23fd28ac2 SHA512 f9b6ad99d69ff303283b3fd9e98945fbd6cb411a3d141badcbb3a0566723a451375e6dd5d5357e3eb7a1b5b1ee5756a2347c43817db2de6fe35b9004b090e077
 DIST vcpkg-0.2.10.crate 11504 BLAKE2B ab7e64091fd2c12292282a0311716468bcf584dd3764cd0c4803d40702104a57ace0a138b06cb1429a166a61e069788b2c45c3286d3f4c5bbf6ac30e816add14 SHA512 4c790344fd3510eaaca5e1539cd676c60124b2ef157e85f89322f294ab6831c2acf6efed1529de4bb23d9abfd0b5f962eaf8d3221c827b0718834d152b28c141
+DIST vcpkg-0.2.12.crate 15530 BLAKE2B 23ee1a34064f19b67232c417a11093f01624b1ddb6aa572ac67ec125dd3f784036e68b58078607e028028e7c7e787c40a158d99cf120b8b80fd8d18c18a07a74 SHA512 33076b42cc83fa614fde2cbcfe1bc5426c99fe3707c129e6c2b7aa16afe3bbf6ada027ac35cc70bc432df25e6a4f6086d251effceae373b6efc23c6a6fb2ff46
 DIST vec_map-0.8.2.crate 14466 BLAKE2B 8f109fbff19604b82ea2aa61c952e2ce9b5597ccc8e1ef4e847648e2de08dece8c4debe92889edeccb8d393645fd0b62436b49d236ded7ad181c4a51239a9539 SHA512 4f1ef59bc2c437e79f1f84fe021bce5aa8ccd581f500f3d5776913d5f17d45b03ccee64f5bd03d47656318cfc9344a1f4311079d471fa409a8e4e94c143973f9
 DIST version_check-0.9.2.crate 11979 BLAKE2B 6568f8d4652fb470162bb2251be2260a6bf83e107a4f957ed91117938d5da48c42bedfb5e6622bcd6c37950805666b78984577bd8dae687dbb39e452078bd97c SHA512 b88a9d545ef103fe6d0eebe7ddcf328fc21fcb02c60828b347cfc35afd957669e652a94d880ef992450c167df3505838bc649e0d83896542fa13a149875acf26
+DIST version_check-0.9.3.crate 12547 BLAKE2B 85761c300a8d755e0b376191ef0604728ae641261fdb10682a3134a828eadc4a33216426d286bcdbd8d0c5fcfe6ca8ba20ed078c4f53066b959739a0e73daec0 SHA512 4b3b428214a0322af536a18e6f050438398766af6589389f20a804121a6721962ba411e2dcfded60aaa74313128fb0e831bea31378e2695c29b29bdc24d7cbfd
 DIST wait-timeout-0.2.0.crate 12441 BLAKE2B a99d3f57bc6e784ac06167f98b2dc2841f730dfab4fb9772b15e67707f756d6ba7daeb3e992d32291bed3daa85eaa8a8ddde64db5e1acf1cc4031fc9bdc82212 SHA512 db3b7aa2acfd44e64451042b8ba98eecab77a82aa5c58ed08dadb119ab36dee4e26d62baad7978ed56d5ad03019c96be5021455362290f56043981137bac8066
 DIST walkdir-2.3.1.crate 23413 BLAKE2B fc9601f4a28cec383297dbd87d422e56db1e989e4273900750f05d1f4a92e114a5b1a5a54368e290c5f4b47159ed51f52d85ce66f003cd2f52ffc737ead20f8b SHA512 ba807ff0d098aabdcd37e23204632beea1dbb7a6adfd16cb1009cae9e7b6957cfeab705cc454bf8f2b62a08743214ab995e43bf46fc510012c938f9e2a434951
+DIST walkdir-2.3.2.crate 23516 BLAKE2B 473f2b51aafd6ac17e5c3da8d545d179b31486b3a65ab39fbd8bd7fbb2ebcc24bebf01781200a26a68f0b1cb464f5763a919aead3b03eba5a7e1be6efec5500b SHA512 6c44071354faf37720ec4117ded34c8d530489542ee107ac26a7a56ef4a882b9003e22e84f1d61f6078643521343e35aa1f7b57c838779e78e5937a667bf82da
+DIST wasi-0.10.2+wasi-snapshot-preview1.crate 27505 BLAKE2B 4eb8644b945633d6e856ad80dd74990be19eb6af99823b147163384f61d471e2d9ec054d78a7064072344be53783e57073e8fffc6d5555c149b4834a9bf31dba SHA512 06977a294d76369a3867c45abdd8a87ea5c84e5a3681075ba0d14af1aee3114ff24495c7e7f7fe1e6e42230e65fba0e062898e69bc89e0209af62c2d14094ec7
 DIST wasi-0.9.0+wasi-snapshot-preview1.crate 31521 BLAKE2B 716bdd2ec46d0bc9911c5e5e29fc783840559931b2563d8619675fc11da9527ddbe653a0f1ce0b782ee0c5f7a3131aba2b0867d415f003aa9c2389357569e7dc SHA512 dbe641f796ee3a5daafcaafc911ecc6dff170340f477c2df7a61fb4858a85aefc2637c9e61973ecce66a987aa8e08a736273a4aad3ef47eaf61ed4268dbf9c47
 DIST wild-2.0.4.crate 7068 BLAKE2B 4f2846b44c5cb34de67688afb74af36b5f435e314b4a5312fe33eaa8378a218354bde2355f6ef53ef1444abcfeaafc150f76f155aa97850d09fff469e3bd1fc5 SHA512 a0c7d27891064d7455c3abf8aaecbd744e7fdd3b4e11bd8e7becb8917585410828fe45f2077e90d81608d230d8a31eaaf2ac818d4ad3225e1f9d3ffd27495453
 DIST winapi-0.3.9.crate 1200382 BLAKE2B cb5799749ccd935ea2d7068d953cecf19f543d9db7dc16ad4584bb7005373ada34937a3ced7225544d8bc765da599911c7a3190efefb3a25b7c1bb7123b4f673 SHA512 ff8b7b78065f3d8999ec03c725a0460ebc059771bf071c7a3df3f0ecd733edf3b0a2450024d4e24e1aedddaecd9038ce1376c0d8bbf45132068cf45cf4a53a97
@@ -146,5 +236,7 @@ DIST winapi-util-0.1.5.crate 10164 BLAKE2B fc800aceae5249a858c806c3e969ef2545766
 DIST winapi-x86_64-pc-windows-gnu-0.4.0.crate 2947998 BLAKE2B 2ad1ea8b5fa07d544e910ccba043ae925269b76b26c9da356305b34b86741dd8b9aff0b9ffe3d562db4fcd7d7c46a11ce9e3168b782b1d89ae6881742b7ede82 SHA512 4a654af6a5d649dc87e00497245096b35a2894ae66f155cb62389902c3b93ddcc5cf7d0d8b9dd97b291d2d80bc686af2298e80abef6ac69883f4a54e79712513
 DIST xml-rs-0.8.3.crate 52547 BLAKE2B cffdece0269b9c04c763481af3a3a25df53d7593552c0956a0efa30669aae497e7c4865c92bcf267f4d7684d0ab957fab3d62b76a241fbfd6497eae25bd9154f SHA512 e44048aa2a010c6242d79c8590bceb300d7056cfd1397c4e4e4411089a3c3686b49603fc2336ea69596b6775b729f1197ab6d9d7d8f83a758e2d962c07aec033
 DIST yaml-rust-0.4.4.crate 48359 BLAKE2B 3c504a593663eff6ccdc96b949f2bf5ff9e9030b2cb08dd4bdb6ab2d0409513d4454ae99af4afe69a1dea1d7560454f2eed434cc6ded2c0cbaf9bedea2f3be85 SHA512 63cb5518101a8c841700efa556a14199d136ab390da3b79c9d11a54789e497d0ca0f420bfa31fa75257864beac619d1b28182714c99a8c92f44e333b299d1d6a
+DIST yaml-rust-0.4.5.crate 47783 BLAKE2B 3e888c5cc7afb43eaf3aaab2b6f47b86df164a66eb54d4e166b965cc84b1e06cd17bd992a0d6ee175d9a73a76e2b44a13167246383ed054afcf3cc1710b309cb SHA512 7621dc8dfd5e7d4a7a8805b2a7e8319b63b852367655f2359d4e3e8fec6c4fad52d75c46ce1161e4c674eac0780b757ce9d34e664e304d8d2beec7afa0363ea0
 EBUILD bat-0.17.1-r1.ebuild 3825 BLAKE2B 0e3129e4e0a406384f96b0669836708e20c655b782bc8cdf31772c3adb487018c89f794a319092901b3497e85625260db3680a5b7dd813b7461fd58c3d20ed63 SHA512 3d4d476f9c020c583c681752c0d039fc7abbc31c9ecfe5ef4fef04786e3b77a27ae619f2231c4fb54de4c60bc79d2b74668bca5fd45d5111f916f5e18df6d4dc
+EBUILD bat-0.18.1.ebuild 4216 BLAKE2B 7242e6acaba30ecd35dcc0ed855c362016804e14e6dbd1eed62c3a038a9034b1a37c231cef490a99a114a7f4bb0da5631ce2b1bcea3e9814b5a730fe73891fa1 SHA512 5a4442df4a899821261324a486b38882ede10b8d88b5c3846d0600f545de53df0f9ae8fd66f94012eee47cbb480b29a01f50df53a78d4d0e4a1c1ae9c7343f2c
 MISC metadata.xml 848 BLAKE2B 35d6b7cb58f7d60d0eabad8a89903ede1284020715b5cd4afe741ca1e1c380c66e206cfb585a83ece10cf50d654098808bcb192d8a83fac142c90ed24e91d8b7 SHA512 181456aed79f1ecaa7d68cebf7763509ab1aee0decd73d976316720dd75b8a416ffbd42375f7c63309bb84a21aac8fa1c4ea4d0d2257b3edac847e681df7afeb
diff --git a/sys-apps/bat/bat-0.18.1.ebuild b/sys-apps/bat/bat-0.18.1.ebuild
new file mode 100644
index 000000000000..ca85a16743f6
--- /dev/null
+++ b/sys-apps/bat/bat-0.18.1.ebuild
@@ -0,0 +1,201 @@
+# Copyright 2017-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+CRATES="
+	adler-1.0.2
+	aho-corasick-0.7.18
+	ansi_colours-1.0.2
+	ansi_term-0.11.0
+	ansi_term-0.12.1
+	assert_cmd-1.0.3
+	atty-0.2.14
+	autocfg-1.0.1
+	base64-0.13.0
+	bincode-1.3.3
+	bit-set-0.5.2
+	bit-vec-0.6.3
+	bitflags-1.2.1
+	bstr-0.2.16
+	bugreport-0.4.0
+	byteorder-1.4.3
+	cc-1.0.67
+	cfg-if-1.0.0
+	chrono-0.4.19
+	clap-2.33.3
+	clircle-0.3.0
+	console-0.14.1
+	content_inspector-0.2.4
+	crc32fast-1.2.1
+	difference-2.0.0
+	dirs-next-2.0.0
+	dirs-sys-next-0.1.2
+	doc-comment-0.3.3
+	dtoa-0.4.8
+	encode_unicode-0.3.6
+	encoding-0.2.33
+	encoding-index-japanese-1.20141219.5
+	encoding-index-korean-1.20141219.5
+	encoding-index-simpchinese-1.20141219.5
+	encoding-index-singlebyte-1.20141219.5
+	encoding-index-tradchinese-1.20141219.5
+	encoding_index_tests-0.1.4
+	error-chain-0.12.4
+	fancy-regex-0.3.5
+	flate2-1.0.20
+	float-cmp-0.8.0
+	fnv-1.0.7
+	form_urlencoded-1.0.1
+	getrandom-0.2.2
+	git-version-0.3.4
+	git-version-macro-0.3.4
+	git2-0.13.19
+	glob-0.3.0
+	globset-0.4.6
+	hashbrown-0.9.1
+	hermit-abi-0.1.18
+	idna-0.2.3
+	indexmap-1.6.2
+	instant-0.1.9
+	itoa-0.4.7
+	jobserver-0.1.22
+	lazy_static-1.4.0
+	lazycell-1.3.0
+	libc-0.2.94
+	libgit2-sys-0.12.20+1.1.0
+	libz-sys-1.1.3
+	line-wrap-0.1.1
+	linked-hash-map-0.5.4
+	lock_api-0.4.4
+	log-0.4.14
+	matches-0.1.8
+	memchr-2.4.0
+	miniz_oxide-0.4.4
+	nix-0.20.0
+	normalize-line-endings-0.3.0
+	num-integer-0.1.44
+	num-traits-0.2.14
+	onig-6.1.1
+	onig_sys-69.6.0
+	parking_lot-0.11.1
+	parking_lot_core-0.8.3
+	path_abs-0.5.1
+	percent-encoding-2.1.0
+	pest-2.1.3
+	pkg-config-0.3.19
+	plist-1.1.0
+	ppv-lite86-0.2.10
+	predicates-1.0.8
+	predicates-core-1.0.2
+	predicates-tree-1.0.2
+	proc-macro-hack-0.5.19
+	proc-macro2-1.0.26
+	quote-1.0.9
+	rand-0.8.3
+	rand_chacha-0.3.0
+	rand_core-0.6.2
+	rand_hc-0.3.0
+	redox_syscall-0.2.8
+	redox_users-0.4.0
+	regex-1.5.4
+	regex-automata-0.1.9
+	regex-syntax-0.6.25
+	remove_dir_all-0.5.3
+	ryu-1.0.5
+	safemem-0.3.3
+	same-file-1.0.6
+	scopeguard-1.1.0
+	semver-0.11.0
+	semver-parser-0.10.2
+	serde-1.0.126
+	serde_derive-1.0.126
+	serde_json-1.0.64
+	serde_yaml-0.8.17
+	serial_test-0.5.1
+	serial_test_derive-0.5.1
+	shell-escape-0.1.5
+	shell-words-1.0.0
+	smallvec-1.6.1
+	std_prelude-0.2.12
+	strsim-0.8.0
+	syn-1.0.72
+	syntect-4.5.0
+	sys-info-0.9.0
+	tempfile-3.2.0
+	term_size-0.3.2
+	terminal_size-0.1.16
+	textwrap-0.11.0
+	tinyvec-1.2.0
+	tinyvec_macros-0.1.0
+	treeline-0.1.0
+	ucd-trie-0.1.3
+	unicode-bidi-0.3.5
+	unicode-normalization-0.1.17
+	unicode-width-0.1.8
+	unicode-xid-0.2.2
+	url-2.2.2
+	vcpkg-0.2.12
+	vec_map-0.8.2
+	version_check-0.9.3
+	wait-timeout-0.2.0
+	walkdir-2.3.2
+	wasi-0.10.2+wasi-snapshot-preview1
+	wild-2.0.4
+	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
+	xml-rs-0.8.3
+	yaml-rust-0.4.5
+"
+
+inherit cargo
+
+DESCRIPTION="cat(1) clone with syntax highlighting and Git integration"
+# Double check the homepage as the cargo_metadata crate
+# does not provide this value so instead repository is used
+HOMEPAGE="https://github.com/sharkdp/bat"
+SRC_URI="https://github.com/sharkdp/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+SRC_URI+=" $(cargo_crate_uris ${CRATES})"
+
+LICENSE="Apache-2.0 Boost-1.0 BSD BSD-2 CC0-1.0 ISC LGPL-3+ MIT Apache-2.0 Unlicense ZLIB"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+
+BDEPEND="virtual/pkgconfig"
+DEPEND="
+	>=dev-libs/libgit2-1.1.0:=[threads]
+	dev-libs/oniguruma:=
+"
+# >app-backup/bacula-9.2[qt5] has file collisions, #686118
+RDEPEND="${DEPEND}
+	!>app-backup/bacula-9.2[qt5]
+"
+
+DOCS=( README.md doc/alternatives.md )
+
+QA_FLAGS_IGNORED="/usr/bin/bat"
+
+src_configure() {
+	export RUSTONIG_SYSTEM_LIBONIG=1
+	export LIBGIT2_SYS_USE_PKG_CONFIG=1
+	export PKG_CONFIG_ALLOW_CROSS=1
+}
+
+src_install() {
+	cargo_src_install
+
+	einstalldocs
+
+	doman target/release/build/bat-*/out/assets/manual/bat.1
+
+	insinto /usr/share/fish/vendor_completions.d/
+	doins target/release/build/bat-*/out/assets/completions/bat.fish
+
+	# Hack to find/install generated zsh completions files as it can be present in
+	# multiple directories
+	local BUILD_DIR="$(dirname $(find target/release -name bat.zsh -print -quit || die) || die)"
+	insinto /usr/share/zsh/site-functions/
+	newins "${BUILD_DIR}"/bat.zsh _${PN}
+}
diff --git a/sys-apps/bolt/Manifest b/sys-apps/bolt/Manifest
index 6851a06adf6d..4cbd56681e02 100644
--- a/sys-apps/bolt/Manifest
+++ b/sys-apps/bolt/Manifest
@@ -2,7 +2,6 @@ AUX bolt.openrc 362 BLAKE2B 1cefc0db24bcd6dca7483a582f89a68800e13651330d8873c2b9
 AUX bolt.openrc-r1 374 BLAKE2B 91dcbfb842166837d4a89c12e7c8b39db9810ba1ffd18eb1ee61798f3634952440b1bb79118d1486819c34916b266a8c47b4398df42ba8f0c3411d482e2e4874 SHA512 3731459efce91c89e5a601b649acc7ed4faee4d08d2a52a5784dc53b914a15113003516e8fed64e532dc703e019ed53b37ec9a4414b770165c1e46813392f9d3
 DIST bolt-0.9.1.tar.gz 250978 BLAKE2B a3b1ea51704e2b54abb0135013019b9cad6ed9c0acfdb56797e19c9b5a1abe9f921446cfcc5b664f73bbbff857cf8d420f588517d4c633d1b3776a35c37fc882 SHA512 c925c290de75d3fa2dfb9e86b2f14ea39279b3f2ab6bebeced72a7853c901d44de02157d684534af2b54edd3a2e0b2ba61e889579ab1b192f99e98a2d73685d9
 DIST bolt-0.9.tar.gz 238596 BLAKE2B 8032ecb83d39d6c3550c000eed400ee0451e5ed94f7c898ffe9c8fcf512af387cfd759bd94241a47623b5aac63615bcda40ddb3e9ae3ec4060da20e46d7e9b7d SHA512 427e9ad95a8d018dd22326cc4b458fc9149b001d3aa6e4bb8e4047eaf6c3cf04a4dc3be9396049734dc0bd54f990b3bce31b6eef4031e3b671a6202a588cfe78
-EBUILD bolt-0.9-r2.ebuild 1344 BLAKE2B 7742674b1eff6b2ed07b90a9ae76b94b4050b585b172609bd74597ee64b1bac3a9822fd7d9ff5a80966e5e931780bdbb2ccc86a703882c3d0a281285926edbbe SHA512 c1b0353b4d69d022fc570a5e38a01c56e72f3f48adab3e876ca9fadcf9eee9e35bde22db118418f2a6141b070614346a0c74a10ec30862260219fb65b14c656f
 EBUILD bolt-0.9-r3.ebuild 1347 BLAKE2B 28a3a9aadf5c1ce03b2ee4132e603de2f3e68051e2361bd984e3cb41aa62d1a4659bdc4c59002861c6ce51e5a8f8c68d39d37d35a7a8eb37e41eec9887533159 SHA512 e51fff67782fe10d9048d0feaefca084d481ccd3aee72a098d215750272e064bc3ea3059cf1adaaac917adcb3e664bd13bc95795948442258fe1d7d3b080722c
-EBUILD bolt-0.9.1.ebuild 1349 BLAKE2B 06096ee9038a236782116306126ec7838827788173da85f59debc72ff70cc1ff71ee3f48f0a5b293990609fca2d0770ec3a6e68eb6f3225b3fd06873f2c6d3e2 SHA512 1c207d5b6d983700e1d6bbf04c5e8339203a6ad1da70ec74644f67c6df0f8b0562b99af905ea744c14244917c74081c67bb0ada05a2c4d128ac68ef651ca037d
+EBUILD bolt-0.9.1.ebuild 1347 BLAKE2B 28a3a9aadf5c1ce03b2ee4132e603de2f3e68051e2361bd984e3cb41aa62d1a4659bdc4c59002861c6ce51e5a8f8c68d39d37d35a7a8eb37e41eec9887533159 SHA512 e51fff67782fe10d9048d0feaefca084d481ccd3aee72a098d215750272e064bc3ea3059cf1adaaac917adcb3e664bd13bc95795948442258fe1d7d3b080722c
 MISC metadata.xml 254 BLAKE2B 731c7015b1415180253ab851fc24ad031153050aa0feff41781a5c16ced70787ca132b4fe53adaa8a189de944dda987c65081162895f1f03d68dc77405308fa7 SHA512 49faa8aa0aef31db638fe291aa55ff114f96fd9f9b2c733f88b326b44f3e9dbf627e825de7c41d45f208b2b7e5e6cd5c03e6fee3fa6013625ce7ce158bbc9a31
diff --git a/sys-apps/bolt/bolt-0.9-r2.ebuild b/sys-apps/bolt/bolt-0.9-r2.ebuild
deleted file mode 100644
index 778cd7da043b..000000000000
--- a/sys-apps/bolt/bolt-0.9-r2.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit linux-info meson systemd
-
-DESCRIPTION="Userspace system daemon to enable security levels for Thunderbolt 3"
-HOMEPAGE="https://gitlab.freedesktop.org/bolt/bolt"
-SRC_URI="https://gitlab.freedesktop.org/${PN}/${PN}/-/archive/${PV}/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="doc systemd"
-
-DEPEND="
-	>=dev-libs/glib-2.56.0:2
-	dev-util/glib-utils
-	virtual/libudev
-	virtual/udev
-	dev-util/umockdev
-	sys-auth/polkit[introspection]
-	systemd? ( sys-apps/systemd )
-	doc? ( app-text/asciidoc )"
-RDEPEND="${DEPEND}"
-
-pkg_pretend() {
-	if use kernel_linux && kernel_is lt 5 6; then
-		CONFIG_CHECK="~THUNDERBOLT"
-		ERROR_THUNDERBOLT="This package requires the thunderbolt kernel driver."
-	else
-		CONFIG_CHECK="~USB4"
-		ERROR_USB4="This package requires the USB4 kernel driver for Thunderbolt support."
-	fi
-	check_extra_config
-
-	CONFIG_CHECK="~HOTPLUG_PCI"
-	ERROR_HOTPLUG_PCI="Thunderbolt requires PCI hotplug support."
-	check_extra_config
-}
-
-src_configure() {
-	local emesonargs=(
-		-Dman=$(usex doc true false)
-		--sysconfdir=/etc
-		--localstatedir=/var
-		--sharedstatedir=/var/lib
-	)
-	meson_src_configure
-}
-
-src_install() {
-	meson_src_install
-	newinitd "${FILESDIR}"/${PN}.openrc boltd
-	keepdir /var/lib/boltd
-}
diff --git a/sys-apps/bolt/bolt-0.9.1.ebuild b/sys-apps/bolt/bolt-0.9.1.ebuild
index 34cd766665ec..d0f8d019bc70 100644
--- a/sys-apps/bolt/bolt-0.9.1.ebuild
+++ b/sys-apps/bolt/bolt-0.9.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://gitlab.freedesktop.org/${PN}/${PN}/-/archive/${PV}/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="doc systemd"
 
 DEPEND="
diff --git a/sys-apps/checkpolicy/Manifest b/sys-apps/checkpolicy/Manifest
index 8503cf736b9a..9adf7ad290a5 100644
--- a/sys-apps/checkpolicy/Manifest
+++ b/sys-apps/checkpolicy/Manifest
@@ -1,6 +1,6 @@
 DIST checkpolicy-3.1.tar.gz 69072 BLAKE2B 31cb5ef52533b0a62f954e770278fc5766a961d87fb86260b04abe562bcd90d0025b33931c6ad54096c64ab54150c7562c112eac80eb2f60dbcdda57f4cacfe2 SHA512 2276a5a0919286049d2ceba386ef5f6de523745b588bb81cb4fed5eced5fd0b8070249b7a3ae5a85e2abb9369a86318f727d4073aad14ab75c43750a46069168
 DIST checkpolicy-3.2.tar.gz 69035 BLAKE2B 263c582c8ed3c38822513899f3591edfc5d0132977451503a8b45d2074b5a1c5ce03973353b3ceaad44da913b4e35546cfef1988b68bd517618efdb942f994ec SHA512 133639595c2acc66c02b5a637c5e0c60d80ce2bae04f4a709d9fafabd31f9497d1a6e3334904b985c2a1bd94a7a7e3df782c2af2ae41d1fd79b69156a835edeb
 EBUILD checkpolicy-3.1.ebuild 1149 BLAKE2B beac3751ebcfc7969e662a3cc1b25a266b144db2155a8f469170781d1e6aa515a759d40adecec768e066f6424291e6fd7ed5c3e87f56eb39a309e0e56de45676 SHA512 68682e8384cd6ff456343fdfa611be2bce2e15edb732dc377e8839cd3b1fcf510d914d02c8b2433d34ee6e53fe5cfba46ad0712cdb25f91bff3532b5cf80c035
-EBUILD checkpolicy-3.2.ebuild 1021 BLAKE2B 6abe22c0fc3c4985f29f566335121a42227b70f7704adb1a732f2ed2591ccd35bbea6a81c3ce9b1b866dd87b9a43257153c0ce5d4e2bf34b910f6b9e3acb5bea SHA512 5c875d640ccfcde065e1ea2800a7e8759a4ca0a62f8df0d6b82aa732e80e29ba594c3dbe7b1aa0f7506f44a00b897322e6204e1b8c7d365ac75ac6935cb110a0
+EBUILD checkpolicy-3.2.ebuild 1020 BLAKE2B f2c102e37fb20e87d7409ff142211d7972979bb74fa97db360cafa6a24ad1e62793f6d2b4e353bf0dcd865a71178d09f3c94d21a8bffa53208e3057668d0e8f5 SHA512 7a4ca556b7d1214a9a1edf851e3c12113dce94f16256085380317ce1c059c488c07568516de4e75bc5b54fdc43284e15d9958b692c0ea4b4ed3f30b20c2943eb
 EBUILD checkpolicy-9999.ebuild 1014 BLAKE2B 08372b851c56f8392c54270335c7b4a7aac00f39523f4a1cabbe5a3c1855c3687fb580016589beba2d208f4199a428b72df93a093a1519c3a91a3e01199b0ffc SHA512 fe151a9a059ca7643dc0349dccad1c0eb80cb5c6455b02b85a2aaa747c8e13bdbb3f9cdc3d71313249f8f00ec1b8d5979a253eeea0d0a6b982f77183f798114b
 MISC metadata.xml 247 BLAKE2B 2f456d88db5f5260c9d48df1ca109786797daca09483619203d7090b80cbae3a540be6b480e4e6299c9f4641a09f160230382da8a1681a0cf92b4f341ce8fb9d SHA512 0569405c9e5d1afeb5dc24a02151256aba4ae83cc56d1293ebc73cd0c61d44ecbc5a8b9c4b34b9d35f6e78a896f9a87659536be5cca3545fa0253282ea22adb5
diff --git a/sys-apps/checkpolicy/checkpolicy-3.2.ebuild b/sys-apps/checkpolicy/checkpolicy-3.2.ebuild
index 377994434a35..799b7e95e9bc 100644
--- a/sys-apps/checkpolicy/checkpolicy-3.2.ebuild
+++ b/sys-apps/checkpolicy/checkpolicy-3.2.ebuild
@@ -14,7 +14,7 @@ if [[ ${PV} == 9999 ]] ; then
 	S="${WORKDIR}/${P}/${PN}"
 else
 	SRC_URI="https://github.com/SELinuxProject/selinux/releases/download/${PV}/${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~riscv ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~mips ~riscv ~x86"
 fi
 
 LICENSE="GPL-2"
diff --git a/sys-apps/cpuid/Manifest b/sys-apps/cpuid/Manifest
index 720cd265e70d..516d0c332e8e 100644
--- a/sys-apps/cpuid/Manifest
+++ b/sys-apps/cpuid/Manifest
@@ -1,4 +1,4 @@
 AUX cpuid-20200203-makefile.patch 1341 BLAKE2B 54d2d82710d88d4f095f712b19488bdc44376aeeeb9395e7d9061ea4f8b33e4a38818937e29dbcf4f48455aca568c3d362b2898fadbfd0ba9b11edfee78878c6 SHA512 ced9f8b91c67b0a9a7aeb7f581cd101a1161810a1de0d876b417e55a56f13c775005f3879c576fed318b2f4809a40db3347dc456d73d9e529d10ff8ab51e1e79
 DIST cpuid-20201006.src.tar.gz 118994 BLAKE2B 05c547858358a92b0c9270066dc33e08693922e4ba765edcba7aca201811c54074a0cd683edb3e9dedf2bb0fd23682b3cc5725e4067b27ec27e0fe979eb22f56 SHA512 f037c1707b49e92f1bd605ec87a0995ae36215d075bcbadfed1d11f5fefda43391b48f10d2517334574aa7e243f0b73d22f1fcbfe1fb133aaf5bad1046e8ba5e
-EBUILD cpuid-20201006.ebuild 602 BLAKE2B bd80e3581f4e15953ad1cfe1fdfb102729316fd9f085d06e38f82ac4f0aa3d97c7989ab2dc9a6d94269faff3b04b205a02b0f44d466e15b57e75ed95c7749d97 SHA512 c4bd77425b100a9f86b56c1c9f386df7eaab703ee44ea62d34f0ad19baac6f7d5a977ac07621615301a2d5aad2fc6b8ba9c0ea0bfef62e92d23bcff2e0c260c3
+EBUILD cpuid-20201006-r1.ebuild 597 BLAKE2B 3f7d8c98a6796dcfe78c80365f0d2238f1018cbc85a683ad9a28b3b70f936a99185427b4645073bb2d313821053e7c7d0d2c1c94a00b5330c8d66665690ea648 SHA512 5e3ac12a35b36d088e134b92f652723d8f466287a927cead8162ce321d974f53bb51bf964e9a6f66b42557413eaded47f47d18a6730bd6bb1874155cbd8564f0
 MISC metadata.xml 637 BLAKE2B ffd825f4b6e67bff67d861d85f26fe2c3054fe7e8d0433c82faa5f5e8a1c2b75b24284b33ff4cbb9ef4ca97061077f04ef968652ff08adbfa97fa479a0cd6105 SHA512 e7b082eb434cc930af77168e31cc83c1aedc1de4d8e5f431e84325aa7c52cdd180f60aec2487b11c3c31ea6596f9caab32a44a6eb60845a5b0fc64e71c1aa799
diff --git a/sys-apps/cpuid/cpuid-20201006.ebuild b/sys-apps/cpuid/cpuid-20201006-r1.ebuild
index df1d0117c3b7..6c29a01ce82b 100644
--- a/sys-apps/cpuid/cpuid-20201006.ebuild
+++ b/sys-apps/cpuid/cpuid-20201006-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -13,8 +13,10 @@ LICENSE="GPL-2+"
 SLOT="0"
 KEYWORDS="amd64 x86"
 
-BDEPEND="dev-lang/perl"
-DEPEND="app-arch/gzip"
+BDEPEND="
+	app-arch/gzip
+	dev-lang/perl
+"
 
 DOCS=( "ChangeLog" "FUTURE" )
 
diff --git a/sys-apps/file/Manifest b/sys-apps/file/Manifest
index d00deb819f44..f3cca92abb4f 100644
--- a/sys-apps/file/Manifest
+++ b/sys-apps/file/Manifest
@@ -5,6 +5,6 @@ AUX file-5.40-seccomp-fstatat64.patch 727 BLAKE2B 164574b98126ad8804c7a3ef51c805
 AUX file-5.40-xz_magic.patch 1277 BLAKE2B 3af2322360ab9d7b3340dd34a2190e249dac5d0dc91843efd07e9fdd92f48ebab0a67decae23e68d9dc6a5fae38880d56977dfa4b3a72d74e362c8f3aab42fee SHA512 4e9e64c1ac0e7e95a113577a32be0fe2f2c2d9acbbe323622c2409d2e1b9f9a6cb3e8572569bbef156ca06c6470ee7db38d2579582622f224919eb37243319e5
 DIST file-5.40.tar.gz 1004214 BLAKE2B 4e15a1ca62fe7c03c90b0e509dc899b87f4474f758ad3d08172b3d838dc3f7c2954ba1074eeeeb3da8c04b8df84eff2b8cdf3177da334a926914429df67f60bf SHA512 3b70df75fa4c9050d55b1ffdc28e5f3c8b8ef7d4efd1a06bf53f113b676d81114a85aae56e0897d32b53716662d64ad18ab251ca8c92c6405c69eb758bb99afb
 EBUILD file-5.40-r2.ebuild 3419 BLAKE2B 2d48c15c53d7e1fcf49d0a4fba5345ffdb60f70541cc7432461507974ede6846cb8608a81dd61865e895b4818a727a5b025fe12f31c45a256c1f5086b41b4102 SHA512 57d2bb5db419fe4708f502d3a33c13c934b148e47ccc6cee69c24229d02fd6200aeaefb1a8278f30f48eeb69bbd4cf831b5439a4585fa641d068aa0c05f95d65
-EBUILD file-5.40-r3.ebuild 3484 BLAKE2B 0e9953c405e53804314695ee959735f39dbad689dff151db7001c4430fc7c196954f216b594ba24f644e2c100792fd3b444dd5b34bd254b7cd3bdb816d62536b SHA512 5d7ae0c9b636eb46d1e0b98679a2a6a8dbb1651f6e7cb3e0988e0a09a13b31c2e3aa329a5e45e009646ffc61bf4e7b406d4bcffa99789874a234bceb9d49bf2d
+EBUILD file-5.40-r3.ebuild 3479 BLAKE2B a5593561698744713de9d2f0dcd5ae4e59180c30cb7e2582a46b3a6560c4db1456249a4396e53f6ac29729109db6dd402426f49f1bca266ae2bc89f184db82fa SHA512 534939e826c1d47c8223677d306028a8ae35b528e730c37827c690a25182589af86837ab930b077c4df80b13d6fd57e65cf9ae3c377f4b994b0d537bf565b071
 EBUILD file-9999.ebuild 3273 BLAKE2B 691dabede60ccb8f756ee3a03a5e2db17f58e556cc19f28493685996ac637e7343803a5667e591fc1b336611458b8550c222238983d797fa21e1fe66c60d1625 SHA512 20a7db1cd42cb5c47d5a0c7a607b3e547e1e76b6fe3effd8a456425929312981b47d940c4deee82f14b20e6be50416206aae4b32cbab80bbdf459cce76443347
 MISC metadata.xml 381 BLAKE2B 242f4a2403d0a4c69c7ff400fdbd447bb7fb8572dc57dc05f3edd0c875da68433217bec46d43467fa03c5e9ec69616e3450635ff2662ae3ed830a138521e23ab SHA512 f69d67890ecb0b574d414c432df12f6e8d31ceb7755055683941017563da8713d07728e49cd4a7277699a97cd3ba732c946ecf5435cee94778a0d5652e7d6857
diff --git a/sys-apps/file/file-5.40-r3.ebuild b/sys-apps/file/file-5.40-r3.ebuild
index 7fd5ac3b71b9..879174d8cc32 100644
--- a/sys-apps/file/file-5.40-r3.ebuild
+++ b/sys-apps/file/file-5.40-r3.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == "9999" ]] ; then
 	inherit autotools git-r3
 else
 	SRC_URI="ftp://ftp.astron.com/pub/file/${P}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~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 ~s390 sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 fi
 
 DESCRIPTION="identify a file's format by scanning binary data for patterns"
diff --git a/sys-apps/gptfdisk/Manifest b/sys-apps/gptfdisk/Manifest
index 60a56fd40e6c..8b5c2d6d5c12 100644
--- a/sys-apps/gptfdisk/Manifest
+++ b/sys-apps/gptfdisk/Manifest
@@ -1,8 +1,9 @@
 AUX gptfdisk-1.0.6.1-spurious_mbr_warnings.patch 2708 BLAKE2B 538ee3c542fc7d0cfbb8f5857afa19be417ac9f93cf3feb0c5800a813690e453266d560a934c7066ad2aae0a83b08554cfe59eeecfb60a6f64a5c8fed800311c SHA512 11d7d990d8068f1310ceefc3d59069d9e563125b02011b6b6d6833c2bbcb101c45163c9371d698ab8d489bac0621f5454030f27c70773d7f30daad7aabace682
+AUX gptfdisk-1.0.7-remove_byteswap.patch 1836 BLAKE2B 2c16a9eb14c4aef96db2b3b4e5a9b4493032845234cf01b326ad17a12e2ffd2a5e27b5a32b13416dbf11c8224cee1b4a10cf0b0dfd2f95adca7faa88f2d712e8 SHA512 d91ce5ec39ed42cb87ac8a986c12ae79c1fe46340965508edb586a8aaad8e72a4227d88ce8e53d73e17d796ecc547d1c41e626bc6f897ee70badb5d74223a940
 DIST gptfdisk-1.0.6.tar.gz 207017 BLAKE2B d00e0f00dc8dce3b6088250aa39e05f41c96bee2218eec1dca34a160e70129d1006abc4341031994c53e77068b5de510b923c69858903627ccf786f3cc848a86 SHA512 a3bf95c813f707d9d41513295c3419916301a0e88b4c6ade70ad7d9422a507d519e092e68a3868d53092428d159bdbb248817c4f40d8ac88b0175d5afbd79dbc
 DIST gptfdisk-1.0.7.tar.gz 207723 BLAKE2B cebb0375294b4ff8f8eb522a4ae23259714d07d670a7bfbf8664586c948c1c8bee2674649a181a7c5d22f9dfe177feb7a9648ca9936c388b419faf7b52e789d8 SHA512 8a2067523479e34c76392571692b36e6c9eadcd0aca979f1ba09904930ed92a709bfdcdfa3369230a5ab2b5a751682dc7fb4645fb5f7f1c361ee8d28e104214c
 DIST gptfdisk-1.0.8.tar.gz 208958 BLAKE2B 03c74c43fead13e90ff6cd42405e15db726f527801a9e3f1d5f6a83d3fa58f0f8e58b35edc1b12b0b2e6c7849b657ce4493ac67204d25309e6f63fe7f57f766b SHA512 0818a238e57cf6de893da7c161e8aaf2d30ad917a47750de09967ce1d83d1ab6666fa043465abaffdc293d058acc3fa87f8bc93a4b03c7c5d9a9ceb8f5b07331
 EBUILD gptfdisk-1.0.6-r1.ebuild 1317 BLAKE2B c9643518d97dc57249f180f465ec41f8fd72ff29e4f6afb0974847bf3ddfe3cbcab95cb74a3607ae840a50c7f5d2847ef4bbbe820d667df07227f8ec007c0b23 SHA512 c0df406581b8c115c60115f7be89445dc71618c68da11f33e04d2e9fe96bc02f60e90ed1e0b6ed10a42790670cd52d43e8a174e09d529de024b3b450c80519ed
-EBUILD gptfdisk-1.0.7.ebuild 1257 BLAKE2B 2694bcaf178d77161356930ea67497bc90c014fd5cb6696c3d3313f9d910113968ac3a1014e395fd83ff681933422cfd64ec487db3a7dbd4a12d7632b5618271 SHA512 03897c3553149aae5a61f6fdd4cee026ebbf5b4c12678df102cd48726a2aeb15cdaccff1142b5d3af3888610ecfc46cf8ddb8343f3da0ecd05b7053c388b0f06
+EBUILD gptfdisk-1.0.7.ebuild 1318 BLAKE2B fa659d24ef760b83ea639bdeffb42de1e555214e70e08dfda305a5a159b4240aa5ff9359e1e055f88048c16a8563bfaada97373fd8ff09311e69d9b84005bc73 SHA512 a725243e3592c49183db636311f991e7cf490b6b5545352851e0bd82b2a16881c7248d852a019034d08edee3c28e12027fb73858f76da892fc2c1793f771f649
 EBUILD gptfdisk-1.0.8.ebuild 1252 BLAKE2B 31480c49e299e1dc5b3f533998d6a473c930cf18652a62ced07c6a0b27cf82d571972b47ca42f1402d4c30ae9b8b044ef3385d59a828920dc0c24c9255612375 SHA512 8392f645d7fa03a51a243bcb8c42dbee4dc7832ac32fb84d3c61016f96825dffffb2d440f1765d70da89ab498de38e874d9eaf890b922ae93b9090653b90d79c
 MISC metadata.xml 339 BLAKE2B 3f08c8aa6a482a6d923388fcbf800cac3282c5c864b9fe27868491d10e7edb75ed04f8d7bc86f5295c90e338d99d59b275ae79813b4d549a04331992526c6979 SHA512 d8334a3e741adf97739f9fef66d7b38bfab9e2d189ac5fbc96ab27a7c1551938b6184ebb08b03ef8b6864f6e43d536836f373e03f3491cacc8f6ee3496f615b5
diff --git a/sys-apps/gptfdisk/files/gptfdisk-1.0.7-remove_byteswap.patch b/sys-apps/gptfdisk/files/gptfdisk-1.0.7-remove_byteswap.patch
new file mode 100644
index 000000000000..c1874d6edd7c
--- /dev/null
+++ b/sys-apps/gptfdisk/files/gptfdisk-1.0.7-remove_byteswap.patch
@@ -0,0 +1,50 @@
+From fded770b55fdb3a201ad515d785c17ac35705652 Mon Sep 17 00:00:00 2001
+From: Erik Larsson <catacombae@gmail.com>
+Date: Tue, 8 Jun 2021 16:11:21 +0300
+Subject: [PATCH] gptpart.cc: Remove byteswap commands in
+ GPTPart::SetName(const string&).
+
+The byteswapping done in GPTPart::SetName(const string&) was reversed
+later when GPTPart::ReversePartBytes() was called.
+
+The intended design seems to have been to keep the fields in native
+endianness until just before the partition is written to disk when all
+the GPTPart data is byteswapped all at once with a call to
+GPTPart::ReversePartBytes().
+However this was defeated by leaving the original byteswaps in there and
+effectively the name was swapped back to the native-endian form. For big
+endian systems this meant that a UTF-16BE string was written to disk,
+violating the specification and causing interoperability problems.
+
+Fixed by removing these inline byteswaps in GPTPart::SetName(const
+string&).
+---
+ gptpart.cc | 3 ---
+ 1 file changed, 3 deletions(-)
+
+diff --git a/gptpart.cc b/gptpart.cc
+index 81bbcf0..841140a 100644
+--- a/gptpart.cc
++++ b/gptpart.cc
+@@ -242,7 +242,6 @@ void GPTPart::SetName(const string & theName) {
+       // then to utf16le
+       if ( uni < 0x10000 ) {
+          name[ pos ] = (uint16_t) uni ;
+-         if ( ! IsLittleEndian() ) ReverseBytes( name + pos , 2 ) ;
+          pos ++ ;
+       } // if
+       else {
+@@ -252,10 +251,8 @@ void GPTPart::SetName(const string & theName) {
+          } // if
+          uni -= 0x10000 ;
+          name[ pos ] = (uint16_t)( uni >> 10 ) | 0xd800 ;
+-         if ( ! IsLittleEndian() ) ReverseBytes( name + pos , 2 ) ;
+          pos ++ ;
+          name[ pos ] = (uint16_t)( uni & 0x3ff ) | 0xdc00 ;
+-         if ( ! IsLittleEndian() ) ReverseBytes( name + pos , 2 ) ;
+          pos ++ ;
+       }
+    } // for
+-- 
+2.32.0
+
diff --git a/sys-apps/gptfdisk/gptfdisk-1.0.7.ebuild b/sys-apps/gptfdisk/gptfdisk-1.0.7.ebuild
index 9093cf2c58db..416ea4f72fae 100644
--- a/sys-apps/gptfdisk/gptfdisk-1.0.7.ebuild
+++ b/sys-apps/gptfdisk/gptfdisk-1.0.7.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
 IUSE="kernel_linux ncurses static"
 
 # libuuid from util-linux is required.
@@ -30,6 +30,10 @@ DEPEND="
 "
 BDEPEND="virtual/pkgconfig"
 
+PATCHES=(
+	"${FILESDIR}/${P}-remove_byteswap.patch" #797412
+)
+
 src_prepare() {
 	default
 
diff --git a/sys-apps/haveged/Manifest b/sys-apps/haveged/Manifest
index 50d1b3634d6e..02172bd37e67 100644
--- a/sys-apps/haveged/Manifest
+++ b/sys-apps/haveged/Manifest
@@ -5,6 +5,6 @@ AUX haveged.conf 147 BLAKE2B 7bdf29071f7a1a3b90266af308ab0a0a56c46f8c9ae8b6acc3b
 AUX service.gentoo 322 BLAKE2B 302a1506492e5122a03ea616de11dea493637d904cde1415abbbdeff3794251e911c6efee7d9331a4cb1e8dde1dbb579f46935cd52c58fbaeb77404b587985cb SHA512 7d7caaef45cbf268a1c1a813537a9e4ef6543addcfebe99fd178e37a8c516bbd5419fb8f47decf2370cee0562f066c72501b6c176307b1f5884b56f561386b88
 DIST haveged-1.9.14.tar.gz 496346 BLAKE2B 9df0b51dc5856b4b943a0c1c1c8f9b947dd3d22bdf45639920911e2619264fc771cba68ad70559b34523a6361cc5da588392bf0b24de1dbf824f1dfc7898a2bb SHA512 bdb6d9de667298d32b474bcbdd5f90c12b870b154b86f8817948de787d378b428bf823234f20129666bd1abced2f154643b5999e43975969f6bba87124650924
 DIST haveged-1.9.8c.tar.gz 494470 BLAKE2B 840aa0b985107feb38a7b5823f94de3473e79f75542565e571c4ec9b2640dddcabb09d598e101678defbdd2eb04fe2fc1fb1f8466157e53d7c41272131450dec SHA512 24167e8a9773d96b3c57cd3e57def7e291f3de86873e796cafc1a59d3f89818c6cb8d46d05e5ae4eb2683fc86b313b1acaed7f210724dadb7df3939e1b3900aa
-EBUILD haveged-1.9.14-r1.ebuild 1005 BLAKE2B 88aa8fc59fb863f794c6ea9e99f704742fe00a9d7979eda1d186e0522dd2d424dc88335608bde322d5874b84cc63afff266ee5b25e2c0572ff58b665c9996687 SHA512 55656a6df01feb321bc29d973449f4a513a9ad5a55f92d3181c02243a497c42be9ce933ba310935fd9233dd26e9bfb4821db122c808cfaf2e199c2329639fb2d
+EBUILD haveged-1.9.14-r1.ebuild 1004 BLAKE2B a0ae52cf0e384e9ddd660aea23b308bef5b8f360d6594766e5c23a155e3e602fed58f3dd022ab2a48af0524feeb66995792e03b8bc7c630b74b9ce3e949250d2 SHA512 e924ad6c4569680348e5edce2d3fafebe0cc338b8dc0614e51868ea46a29ffe317e4ff764a3ea4bd8602a18a4ae0bc4ee478470a9b6441deb03deda82b2c89bc
 EBUILD haveged-1.9.8c-r1.ebuild 1064 BLAKE2B 60289aa161de1a57286387bb5ad64e67287120e659763f3874bd10282cb32f42619d9e9c749b7a7cd2ac237208bf0ddb1ffa73550e46687d3f62f946c58a5e75 SHA512 7098595525b1d88bbf6d182332b843cb4e5c26baf450c9231a88c59d5da5b8ce9d0c045483a00213225b3b9d5fbd3bb17896183123a6e0c4321045e7f846637d
 MISC metadata.xml 371 BLAKE2B d44d1873136cfff8c9c1ae42ee0ded780af875987caecc98494afba60017c3da105423642f10f2475d344636d54c71885607649ceb4f285a477698b40449d2ef SHA512 640e188a0829d4408d9bc7ca0c7558222ed8148afef25a88a136c0ae5bb44531bc8352c9c1da1c13e395cb54d67c62a485fa4f6329ad7b76255def9d979b70d0
diff --git a/sys-apps/haveged/haveged-1.9.14-r1.ebuild b/sys-apps/haveged/haveged-1.9.14-r1.ebuild
index 44aabb781405..b4b74f5b8745 100644
--- a/sys-apps/haveged/haveged-1.9.14-r1.ebuild
+++ b/sys-apps/haveged/haveged-1.9.14-r1.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://github.com/jirka-h/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="amd64 arm ~arm64 ~hppa ~mips ~ppc ~ppc64 x86"
+KEYWORDS="amd64 arm ~arm64 ~hppa ~mips ~ppc ppc64 x86"
 IUSE="selinux static-libs threads"
 
 RDEPEND="
diff --git a/sys-apps/hwloc/Manifest b/sys-apps/hwloc/Manifest
index 48f0afa89172..bd7b5c705330 100644
--- a/sys-apps/hwloc/Manifest
+++ b/sys-apps/hwloc/Manifest
@@ -4,5 +4,5 @@ DIST hwloc-2.3.0.tar.bz2 6414781 BLAKE2B 60bc80ae73d0ae9ff9a438474efe682dfff2814
 DIST hwloc-2.5.0.tar.bz2 6688349 BLAKE2B 684367afa5fc056b9bf04b3a95bd8239ec70127d5e582948ca16a09323614ad0ef77278a120544af0a740b456f1ba24bffc861b9f132293fafb7da0597d0b688 SHA512 9e8b829868cb9f5fd2fe84d8515d0dc8725ddc84c788a61c1e9e918eb2b29659eb73cf22a4189e6b887f5bfa3255c206f4ba924bd7fe2c88c185f4308c0949cd
 EBUILD hwloc-1.11.13.ebuild 2168 BLAKE2B bcab74bebc629a2749bbb6577dc73c2acde8bad4a356456b731f0898df24b8698e0cea6d388495b27934995fd298875e23cd54a7bd103771579166faddeaf31f SHA512 e7d42be1f8d54b9149d4ee105fc6e4e9097a6b488d9dbb4a4d9f04b9f2d4f8e3452eea6aa7706b991900f26b2f4ae08a6419e8267661648e494850de7be39fab
 EBUILD hwloc-2.3.0.ebuild 2926 BLAKE2B 42a8053f8baa463ccc1805d3586698d7e99e57498d14ff2c633148b258133a6ddd6f0370a15e6dc3d0ea87827f4229e40b23e1f21e8aaa1d1a9a282fa2883bae SHA512 8f855c6dca0daf997c37f0dac6f295698b2c3037c270ba12a20978ac61d82f98485bb082c68407c0609fdc1c585dabf491d653bb188ea9d4f90d82a931d55bb0
-EBUILD hwloc-2.5.0.ebuild 2926 BLAKE2B 42a8053f8baa463ccc1805d3586698d7e99e57498d14ff2c633148b258133a6ddd6f0370a15e6dc3d0ea87827f4229e40b23e1f21e8aaa1d1a9a282fa2883bae SHA512 8f855c6dca0daf997c37f0dac6f295698b2c3037c270ba12a20978ac61d82f98485bb082c68407c0609fdc1c585dabf491d653bb188ea9d4f90d82a931d55bb0
+EBUILD hwloc-2.5.0.ebuild 2933 BLAKE2B 29056c11f00907327a283b9a42ca73824c90dd75de0bf6d12ee7101ab37ae98478b8d265ac7f316e1fffa79d3af42134f06dc0302644dc4730621ad3ca247101 SHA512 a8f6ea94b0026eb3260f152d3ee50b4985bcaf564f302df367e3e5fffacb1368c396e09933db8f37a17d5d6f27197ebc450da07305ffb6a666a7011a2061087a
 MISC metadata.xml 1703 BLAKE2B c5f42e16f680cf88bd41907ab37ce4df2da9ee08a52a26559688df97ad92773830f084cc6f358862096f24930f69982cfa7f2fb1baa0ea1373b7359f96565f4e SHA512 590d0cb5b6819359159152dab18bc12c65c5f70c0a75658a760d7f2bb97ef4e18045130a6167f5ecc41f08e92a179f6dd51abe34f35db3338e4539948913daf0
diff --git a/sys-apps/hwloc/hwloc-2.5.0.ebuild b/sys-apps/hwloc/hwloc-2.5.0.ebuild
index f98a08eb4cda..7142d8ae3ffa 100644
--- a/sys-apps/hwloc/hwloc-2.5.0.ebuild
+++ b/sys-apps/hwloc/hwloc-2.5.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://www.open-mpi.org/software/${PN}/${MY_PV}/downloads/${P}.tar.bz2
 
 LICENSE="BSD"
 SLOT="0/15"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
 IUSE="cairo +cpuid cuda debug gl netloc nvml +pci static-libs svg udev xml X"
 
 # opencl support dropped with x11-drivers/ati-drivers being removed (#582406).
diff --git a/sys-apps/ipmitool/Manifest b/sys-apps/ipmitool/Manifest
index b0525863bff3..348c17cf6113 100644
--- a/sys-apps/ipmitool/Manifest
+++ b/sys-apps/ipmitool/Manifest
@@ -8,7 +8,7 @@ AUX log_bmc-1.8.18.initd 570 BLAKE2B 7b21b7888f386953c001a635fa4d1fd3b79a1eb9920
 DIST enterprise-numbers.2020-10-21.xz 1426932 BLAKE2B bfe39ceea321ba47cd40eafa67862eb4dfd6dc29b192afb20ad0c908cd93a16b4103c5de64d042df012417c8cadc03000f2b2a00779bcc582a430603cad5f3cf SHA512 4a854a56e8ed51997c320cbfba041d43cb98b14743ef80b67e701942068d3729604abaedb617655a83ca21a7e20ea5a622ede4de317ca492cefd46da784d28f3
 DIST ipmitool-1.8.18_p20201004.tar.gz 638493 BLAKE2B 52f4ec8c82336b88640d1b91fc17af8f2fe0948a5c48c16067867dcad0852168d48bb21fdd99bde7ed957b66df888fd369c909079d1f81c861acd8c7f8dfa6f2 SHA512 8d72eef3584f4d2c86bfe43f70b5d687f3b7bbdf75b8979f7132c5c98b01baae22c336e540c197652187749fc9bb221a92e546b56e5cf2eb5650fad5094e9433
 DIST ipmitool_1.8.18-9.debian-ported-gentoo.tar.xz 3208 BLAKE2B b37a127eff361039b3b810e19dd97f0c395462b658803f56f10f2dd1abbbe92743dc409ce6b83560db15621b7fa7a3c0f989100077893993df18108a082e49d2 SHA512 0f7646a2307ac98425e99dece9d3e3b23026136a97524151efdecc910fb537af41a91702782989046e44163da98610fa05792878473e228b45c16351f6015a45
-EBUILD ipmitool-1.8.18_p20201004-r1.ebuild 4437 BLAKE2B ec30d9ba288a863dee4bff988d4b87df64f4cb394810eca9652ce756f1694ccdd92394f65f069df6d2dd493d32049263df2544c9dbe1e68b437ba80f89edb597 SHA512 54cdf7c659697b77bad07e0384bdbc751954fff6b51d466bfb9a2c2738ad9924f0aac4cd7edd139fdc8e1841664470d44ab1b06cac92b3fb24e2e09ae297499d
+EBUILD ipmitool-1.8.18_p20201004-r1.ebuild 4436 BLAKE2B de20f33696308e174ccd4a8b391ed630ad9f77fc2418fdd8561710b21b4f7b1095677ad102f4981c0e6117ae1619b3a932e0d83d6e73eafe7d92ba0fa5c52639 SHA512 12142187e7f9d0e755718c7f0e89775e9b4e5aec46ce55e80f7f64ecd24519c0e7bfad9ea989a079a3000861f3e193a8d4efccf782e8f1d62e0c91ec4e5100b0
 EBUILD ipmitool-1.8.18_p20201004-r2.ebuild 6164 BLAKE2B 51d6417bdaa6e5bb0ce21e6fafdae5e3a02bab2ab8445f277336cae43fd7770b0fc0429e78acb9a7df9d96042f01bf7c0a79955a17a48a7ed56c323a54778f4f SHA512 0ef3d4001062709526390afdd9247d23b2d1baabf93e57a54c40bc75b0425ab92ffa9347119158b6b5b7c71a9bc7b36293a8995d3889c848ff1a78c5f15641dd
 EBUILD ipmitool-1.8.18_p20201004-r3.ebuild 6256 BLAKE2B 43343972887efeee8278066fc5c84f4f0486b9822f56147c72780fe2a4d2d1c6735da360e844310b91201204682e4e34cdaa853b8d05b38b66f4c51c7e1d02bf SHA512 43e46bf09c84de695b4030fa699e5bebf833d6cbc597c2a29273d23ad76e01d9dbac5f8d88b294fb96c073f8d048abb64f9fcd8361afc88eff71b4a02ab0ae1e
 MISC metadata.xml 633 BLAKE2B e7fd815396d39f0d1c4aac50925382df6c245fbf3499f67b8d3a7448821aed48894725e468d6c2b724ad7a706ee12b4126f0b6f7c4c32388de6e34e05333b782 SHA512 53ffd0f2970d1d128e9d12247b5ed502bac4b9550029d57b221f2c2fd84d316831bbb8ddb890a1344b171612f890170847a3de02d52857d75c75f1a593cdebb8
diff --git a/sys-apps/ipmitool/ipmitool-1.8.18_p20201004-r1.ebuild b/sys-apps/ipmitool/ipmitool-1.8.18_p20201004-r1.ebuild
index 47992a4ef83b..93f7d10f73a5 100644
--- a/sys-apps/ipmitool/ipmitool-1.8.18_p20201004-r1.ebuild
+++ b/sys-apps/ipmitool/ipmitool-1.8.18_p20201004-r1.ebuild
@@ -29,7 +29,7 @@ SRC_URI+="
 #IUSE="freeipmi openipmi status"
 IUSE="openbmc openipmi static"
 SLOT="0"
-KEYWORDS="amd64 ~arm64 ~hppa ~ia64 ppc ~ppc64 x86"
+KEYWORDS="amd64 ~arm64 ~hppa ~ia64 ppc ppc64 x86"
 LICENSE="BSD"
 
 RDEPEND="
diff --git a/sys-apps/irqbalance/Manifest b/sys-apps/irqbalance/Manifest
index 1e475ccf5819..68575c374879 100644
--- a/sys-apps/irqbalance/Manifest
+++ b/sys-apps/irqbalance/Manifest
@@ -1,5 +1,5 @@
 AUX irqbalance.confd-1 577 BLAKE2B 2744f203cb1d20ec44bec2f4cd2adc92209575a4742c601f45780cc55ff44434248987c31faf6ae2205ae02b2ecfdbd914f271169cb345e403f41376e3bc48b8 SHA512 90e7ed187b4dccd6f6c4383ba54d6e1aed1645240e44aaf02db1b70b56594b1a828644d671e6db91212417981b1d5e53d1ecfd4b366496dbcb484d1064d7d24c
 AUX irqbalance.init.4 555 BLAKE2B a90aa453f6d59ec8da954d47a386cfcc2395e36b3b7f9b0cef74714e348e23b091aa00d8db586593e2e85a01f8fc2d97be7a8c754d44a6f5728f7e2e98393df1 SHA512 0252900f183a714f2c1c9f57bca7b26e2c2b3d12e6ca46085203b4b04aff41cc97c6a54b1f0e66b37d7f214f127633c0179cede8deee57dcc1f3635ec17c337c
 DIST irqbalance-1.8.0.tar.gz 55238 BLAKE2B 0181ee57c4ddbdb55e1529cfd7da4b875320eff65cb606f925f0b4f4243b51e1349d4aba38690a78d7deab6d3f55ae8d6c45af44a904f03d7127678202f288db SHA512 3d757198dbe680b010ed9233d73cbf3b4a150e6b07ef97d3e94f5fa0472a22b0b3800868634340fb413a18683ff95ff6a8f7fa51ace65d870651336479e32740
-EBUILD irqbalance-1.8.0.ebuild 1326 BLAKE2B b016fd1bd29bd101ba2f7d9fe779d7d2f89e2c6bab9ef24b9b6e8ee1cff5251d4d4bfe5e92e091beaaaf6d84a23ae3340710031a822bdb7a99639cde5a7621aa SHA512 27be7fc08b8a4f8a3d767b7caecdaded2e203bff3e427cc361ff7972e74c5e71aabfe4dbb5095506cd7f383f408dc0716d6f56c779939d682a82b5f2e4c80558
+EBUILD irqbalance-1.8.0.ebuild 1325 BLAKE2B 7c04c91640fdbc3d5c2ddf364b560e9e3f609ff40ec26090dd686b47409008882dd8a3455e906d70b462c52f3dc80b59066d30a61102435359eab92051c2611b SHA512 1eb504ef58ef7e606d5178542c09a5cbf7b1189c3bb44ce62233ac3e1b7095ffa4572e4692ef6ed4a572bca6a37464fc7a894965141eeaf231d25c1b67f106a5
 MISC metadata.xml 546 BLAKE2B 9c510c79c069672f2fdd1ccd7d2bd08917b692779904237650fbf8262bed2a6a40af805179d9f265534e761f074cb4d533fe89e46533880edae9c30f9a118a7f SHA512 6510fd0c07b1b59b79037b05a482554b3934c8d19acc8f4d54058ac5bc605c5adde426d3c12b7f618dd87381435467ecbab7baafcfb27166981f83cb56b72a04
diff --git a/sys-apps/irqbalance/irqbalance-1.8.0.ebuild b/sys-apps/irqbalance/irqbalance-1.8.0.ebuild
index f9d25c8b15c4..9a6e0b50e649 100644
--- a/sys-apps/irqbalance/irqbalance-1.8.0.ebuild
+++ b/sys-apps/irqbalance/irqbalance-1.8.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/Irqbalance/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.g
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 ppc ~ppc64 x86"
+KEYWORDS="amd64 arm arm64 ppc ppc64 x86"
 IUSE="caps +numa selinux tui"
 
 DEPEND="
diff --git a/sys-apps/lshw/Manifest b/sys-apps/lshw/Manifest
index 9a870ae72be0..4d1946ef13ef 100644
--- a/sys-apps/lshw/Manifest
+++ b/sys-apps/lshw/Manifest
@@ -1,5 +1,5 @@
 DIST lshw-02.19.2b_p20210121-B.02.19.2_p20210121.tar.gz 2469481 BLAKE2B b9a886c21d6abde00f234cc93fc25ae2b4cf734ffd3fdea7847283fa44eef80bfddd6d83ab428c126ef6518eb8da35f3ba15d88cfc5dbb304813a4d28c173351 SHA512 699ee270eb9a8dd6652d7bcab5d99187585159428bdceab2e17add51e29d73a929a4d34168d92308e775383b9920b07e3b02e0781f9f1b1f099aff3550e9b0c0
 DIST lshw-B.02.19.2.tar.gz 2467937 BLAKE2B 8317def382bcb189c164bddf2dd766c614c6a0a49449ceee81f516125ef14ba24f5933b1f08f13b5ae52a96304baa1cc7ac5171231911ecaa466522a7c0c4c6f SHA512 f3abc6241fe7912740f11b5b97a1f7778cb7cc69f5209b83063cbc1d3aa7b082dedb3aac4119ce100391547400ed6bb2d413ca47de50794e1066f31961be41a5
-EBUILD lshw-02.19.2b.ebuild 2170 BLAKE2B 0ae10f86dde575d9014b86468c5339736d1ce8be473071157b2d0c2af0d1fba68899a089a9e1ceb63a859aeda5425bd773cd800e293d402bbde10a302cf219e3 SHA512 384a75036367cc1f23e44254af491cfaadc8968b40f52130a441fdf801e12bda1a37559280cd040f466345ce3950dbb322d8a82b4ed0b7c98987eeab0a548d74
-EBUILD lshw-02.19.2b_p20210121.ebuild 2255 BLAKE2B d3a69c38801394d9f86a3dd83714a597bace62dab8bf5cab774cde51d9ce4e0afe27214fdf8ea80c27aadfb2c8cc45d8d0e422ae61df78c51870dd7934685920 SHA512 b88818fa704c19a7fb47ae0b5a97063b7ef51a8af4f3ebba14dcb4d4c79eae25ea81a03d14ab27f7ae9321d0c82e940b67e0b39c75d971c6b3c22db073cc2330
+EBUILD lshw-02.19.2b.ebuild 2170 BLAKE2B 53389e8191f2ce6d24642f4fb5044ef244b2e91853bf8d336867d8c0941d50b228ccbd80c70a0a0d796589a5183768d65ace2309e9bc3d858a0d2efbd50415c0 SHA512 8cb20b1db28313a113c1c00e2c405447babc76c5564cc176a55d4af13796530554b20ddc8f523d0365c93064529a3b09b60e0229f535a8683fa2d0fced468603
+EBUILD lshw-02.19.2b_p20210121.ebuild 2255 BLAKE2B 332f1b5d59a98901e28f3c39ee1a883f91a5c63a52c81f46f98e95a4baf7665d14a59ea9db80cb87c322d7cf0e2731e64f9734ca34de09d730bfb51ee90258e7 SHA512 d9c6a1a153a8325c0d0d5e361a8bf148ba174504127b6345997b693feb3be26876a8b8980683f1b19009f36800fc2a2cd3bffd7603d246b4d74873a19fd2c707
 MISC metadata.xml 461 BLAKE2B 85843f85ec415a571d44f8c7bd8b04baa11e58141cc6bc7c0a0561628e858f9c8881d5737314873f5d4ba6788b36d54a9bb434ccdba3d2f1c435957b3972acce SHA512 b824f0e4251e52f1bb5283faba663d74b93c35bc23963e84826be85eeaffb6481b66ffc2548736cc66227be24bfb230cbf77cfe9d72d7ac7053abb26f980c6b3
diff --git a/sys-apps/lshw/lshw-02.19.2b.ebuild b/sys-apps/lshw/lshw-02.19.2b.ebuild
index bb38bfa8e82d..1f5b1927f7aa 100644
--- a/sys-apps/lshw/lshw-02.19.2b.ebuild
+++ b/sys-apps/lshw/lshw-02.19.2b.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 
 PLOCALES='fr'
 
-inherit desktop flag-o-matic toolchain-funcs l10n
+inherit desktop flag-o-matic plocale toolchain-funcs
 
 MY_PV=$(ver_cut 3 PV/b/B).$(ver_cut 1-3)
 
@@ -34,9 +34,9 @@ DOCS=( COPYING README.md docs/{Changelog,TODO,IODC.txt,lshw.xsd,proc_usb_info.tx
 src_prepare() {
 	default
 
-	l10n_find_plocales_changes "src/po" "" ".po" || die
+	plocale_find_changes "src/po" "" ".po" || die
 	sed -i \
-		-e "/^LANGUAGES =/ s/=.*/= $(l10n_get_locales)/" \
+		-e "/^LANGUAGES =/ s/=.*/= $(plocale_get_locales)/" \
 		src/po/Makefile || die
 	sed -i \
 		-e 's:\<pkg-config\>:${PKG_CONFIG}:' \
diff --git a/sys-apps/lshw/lshw-02.19.2b_p20210121.ebuild b/sys-apps/lshw/lshw-02.19.2b_p20210121.ebuild
index 1a41f37f5bdf..a250b59d2873 100644
--- a/sys-apps/lshw/lshw-02.19.2b_p20210121.ebuild
+++ b/sys-apps/lshw/lshw-02.19.2b_p20210121.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 
 PLOCALES='fr'
 
-inherit desktop flag-o-matic toolchain-funcs l10n xdg
+inherit desktop flag-o-matic plocale toolchain-funcs xdg
 
 MY_COMMIT="fdab06ac0b190ea0aa02cd468f904ed69ce0d9f1"
 MY_PV=$(ver_cut 3 PV/b/B).$(ver_cut 1-3)_$(ver_cut 5-6)
@@ -35,9 +35,9 @@ DOCS=( COPYING README.md docs/{Changelog,TODO,IODC.txt,lshw.xsd,proc_usb_info.tx
 src_prepare() {
 	default
 
-	l10n_find_plocales_changes "src/po" "" ".po" || die
+	plocale_find_changes "src/po" "" ".po" || die
 	sed -i \
-		-e "/^LANGUAGES =/ s/=.*/= $(l10n_get_locales)/" \
+		-e "/^LANGUAGES =/ s/=.*/= $(plocale_get_locales)/" \
 		src/po/Makefile || die
 	sed -i \
 		-e 's:\<pkg-config\>:${PKG_CONFIG}:' \
diff --git a/sys-apps/lsvpd/Manifest b/sys-apps/lsvpd/Manifest
index 95d7dda0a210..9b7161301327 100644
--- a/sys-apps/lsvpd/Manifest
+++ b/sys-apps/lsvpd/Manifest
@@ -1,5 +1,5 @@
 DIST lsvpd-1.7.11.tar.gz 90366 BLAKE2B 2dfbbc92921106247580395ac663731bc4486d9380b052cfaa0867939a22b4c10d130adcb01260316e5c0fa5a093eb8c95c0d0b04a5ea17792e5891cb302a554 SHA512 68efdbee6bbfb4fd6673bc83d340aea6a121d48d1e75dcc4f9322521d8a3aa7b04fbe1acbb7e7343c5a7e2dd33f21ecf2e54a32ff5f6f2b9e1e5d6c34b8b25b5
 DIST lsvpd-1.7.12.tar.gz 90806 BLAKE2B 1b55c463602105c36654f7baaf5d7c8f27ec045f35a648e87327f5b0b1c19ec62f5701a48d51114435dc5edfc503b78c35eb109a7982d6e6c10df4dd0d20e4a1 SHA512 0a37a580432004c359080edd2b07ea44a68dcf81621e0ec3a89cf7c4ca0f64a29143cee154a8d39c1411f64bf229a8a19f10d9f2c95971374b97a4c05b1c1523
 EBUILD lsvpd-1.7.11-r1.ebuild 582 BLAKE2B 34afe81d81a3a2a012a8c3f54eeca008a2cf2b9dc14bf8aa0b2f43a65c9b068370bf57a25655a378e39e4c1878460c0fec4d8f21edbc698d1d0154d7ca24e230 SHA512 ae5640d4f8fca09cf00d23e7d1accb9bc80cf809cdff7febdd1185e99043273f206bdd6e75569153f1b680e45dca78d8e719aa2d80eb5c6d3d011f9916abc79e
-EBUILD lsvpd-1.7.12.ebuild 599 BLAKE2B 1ad60516626735e8d159892fdc8afdf1864d8ec468eb3c192a84d739d8cef983d853444a21c84b7b949bdad360bdb42b504e36d361ca26f7ac39f13abad5e6cb SHA512 01daa8ec44f644ae5dae5a4729a46858e72c55a2c79eb6ec91a0c5e92ae58b50d390cadba8ccde3d6624f9723a4a9f098763741cbaab83f25e0c543bb85312d7
+EBUILD lsvpd-1.7.12.ebuild 598 BLAKE2B 7693e27284afd64ec727f8ea620ac64164cda00c7df76ef390529b6838815e06b0faa985df66675a73c459464634c6e69a48d6c499fbfa5bbba3969d2c3fce4c SHA512 cf883c99713be270444d57c679a79fb88f1037a2b26d5434ad9aebc4055159776156ec7e0b415eabe4acb07f6f2431f0e61a96b78f8ba342439dbd8b2ac50bf4
 MISC metadata.xml 988 BLAKE2B 1029729819fe1c2f8b197e27a127de88fb0a72cd6671a27cb08effdb81108b2be892860bc97012f6cb903d509ca3eb9fe4bf0f59c0642f93b19e0f453e7f276f SHA512 f20dfdcc425ead51943d39d8a5dec0f38baa023cd204a446e63f0f50588d51519a83af3fb6004ede20aa0d0d63ef5d9523d491759fc849951fbceaf96bef254b
diff --git a/sys-apps/lsvpd/lsvpd-1.7.12.ebuild b/sys-apps/lsvpd/lsvpd-1.7.12.ebuild
index 915b79c32135..cc68314bdd30 100644
--- a/sys-apps/lsvpd/lsvpd-1.7.12.ebuild
+++ b/sys-apps/lsvpd/lsvpd-1.7.12.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/power-ras/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
 
 LICENSE="GPL-2+ LGPL-2.1+"
 SLOT="0"
-KEYWORDS="~ppc64"
+KEYWORDS="ppc64"
 IUSE=""
 
 RDEPEND="
diff --git a/sys-apps/man2html/Manifest b/sys-apps/man2html/Manifest
index 0483a99f46eb..159d0d76e4a5 100644
--- a/sys-apps/man2html/Manifest
+++ b/sys-apps/man2html/Manifest
@@ -2,5 +2,5 @@ AUX man-1.6-cross-compile.patch 1747 BLAKE2B 4fca1280617283151ddf037d12b97d65ac3
 AUX man-1.6f-man2html-compression-2.patch 1741 BLAKE2B 51baebadffcc5f58eb7b980c0eddac550ecc98a682ced9ca0ffae6318a806536e42ae5f13d1d061ddd2d41f6ef792f2eb6eac1c1a00e2a8f730de54a3b6589f5 SHA512 85dfdffaaddefff9bfb7b92ab274dcc2e88d880d11c67b0690ff4a92a2a6d3a3b65ad4d425f09bfd042b041b316ec9cb6d1ba6e0a4c13fdf71c9524c50ffe7d0
 AUX man-1.6g-compress.patch 347 BLAKE2B bae29d07f89e71fb2fbc04305f67b5c6bdb0c660a428236c7cf2019403c74c8b6603e61b09d4e9da1677cce46b6ab252651c4e71b48a44ed37116374aeca21e8 SHA512 2901e2d77509245880686ad1c2baab9648952bb0eef7bdd6b77ec20d054373464e237a100acec5ace95935708b1b226d18990c48d9a864f384cc6afe7ed6cf96
 DIST man-1.6g.tar.gz 256906 BLAKE2B f13e21400aecd41a5f001b37bf3c6f9fd8463ff627f761cfd0a6846c7b8dac48a6dc87ff2cf4786b55800a558141cffcc0d66420943e46f708292f5653b42d51 SHA512 c786fa2201aed92293e5590dc3ad5d550cf14e5059fa274ef7719af86ee4c892e747576495b6dc0a09286e73e2f0f0caf860216e0c8032d9ef13e5d26853048b
-EBUILD man2html-1.6g.ebuild 1163 BLAKE2B e461a818c1b7b0d619cbf6836ec8e53560186eaecea61130d8b5afeb0c6e71ac06f3cdf32c0befe124cbcda45184c8b3504a45a93dc696436a7380c99059d1f5 SHA512 cc829f792929cdfdc1dbd10ff733cbb457b726d02c8886a08810d6e8bc653e387051f5d248c6587a91f3c013ec1f280a1fffa0f7dedd8361a4634cee7ca600c6
+EBUILD man2html-1.6g.ebuild 1170 BLAKE2B b137e34dc121e7a7c311193fe6d9d85968d0b68ee0570858d5a12d07559fb8da7cc8f40bb3d8c871104acb59a5cd7ae0b2277922d667fee6192f798846aa8c3a SHA512 edebf865cefa08894f4f999db735833396e3052ea94e471cb9b8494693f832986682b3488188471519e1b55e3c23afe1d61158ec13ca100f6e6f8b1bbf769d41
 MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555
diff --git a/sys-apps/man2html/man2html-1.6g.ebuild b/sys-apps/man2html/man2html-1.6g.ebuild
index b84b64315a1e..b35afa12de16 100644
--- a/sys-apps/man2html/man2html-1.6g.ebuild
+++ b/sys-apps/man2html/man2html-1.6g.ebuild
@@ -14,7 +14,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 
 RDEPEND="!sys-apps/man"
 
diff --git a/sys-apps/mcstrans/Manifest b/sys-apps/mcstrans/Manifest
index ae7f48f1df3d..b2734f3d00ba 100644
--- a/sys-apps/mcstrans/Manifest
+++ b/sys-apps/mcstrans/Manifest
@@ -2,6 +2,6 @@ AUX mcstransd.init 656 BLAKE2B 782add77ee81b582151c35003c303b5e67b4ffc4e6f4af97e
 DIST mcstrans-3.1.tar.gz 44598 BLAKE2B 1755c2f56e3d40fa2ea95c349988fe5dd7b52a9f26bef0f42e42bda8f7b94993b9a47d2e333337f746cbabd9dd571118b0a8e1ffb7c22c604db58fc809bcc033 SHA512 21e9b7a8c9d98cbee61f2eb1c440a51d19ac111a5955c24d365a8784e1aa34fb47a22a108e550c8a4cde4f25ec5afc466126a68e9faedfc796bef83eada93b60
 DIST mcstrans-3.2.tar.gz 44596 BLAKE2B 6738acbcb7c25ec67b8d14cd166c601c7790d28332de8eb4caec32e43390b199aeea51750856aee7c4a2bcfc003af3ac01b00a4247578230d42de3956a88ebb2 SHA512 edc7d4c255056d823c67d69d0c0bb49e8da8cf1b69d94b65e1c2cb5f4944dcc0bd26ed795d76cbe310d9c98b98ca69a49eb7e39ed4cd7df3f6ed8bd1b68da6b1
 EBUILD mcstrans-3.1.ebuild 1076 BLAKE2B 95420d079ff83b4a3e4aa7655932d1ded963f53e01e4cefad6b49613f882458c3ac9ec4a9f0771f314e32d341cad58e5684aa56b669e191b0a353c217c2a3a2c SHA512 4c41ad6cb454f39743f3d822298743abb5cba0846a030e2666e7beae9fb245ec8acc60b32762c1ce66131f188cb0dfbe69f1fc933dabcc62d8ae9d2dc5884e78
-EBUILD mcstrans-3.2.ebuild 992 BLAKE2B e334940d81f7b75e79fc4556cc4e578dab2479bb54bb0b72452fde69808097df9e45106e864459363fef8db1d9e17f0539295d7c52c27758a199cf1bdec4224f SHA512 1ab31b01289d8b89fa6a7ab877c2f86971855b9edf26b623b3b213f1c501f1e070388bc2cc6f90308e7fdc146220e65b8fa4d525f8e7c69439d25f892dbb51ed
+EBUILD mcstrans-3.2.ebuild 991 BLAKE2B 9999de79f25055c6cd4a58af353eeacc0a64fa83a53cda27c36060fb6b9d01a6a838fbb3e533ce5d252f280c36a6bf2937fcd562a86acc67b02cf1e53dcf5750 SHA512 7923ab16702bde568d9bdc0a58304cd561766c64ed0d03a284cee85e562dd45c0873a809f92b4f3b70019af79d88cbca61058038657144fcfb4b556951eb5455
 EBUILD mcstrans-9999.ebuild 992 BLAKE2B e334940d81f7b75e79fc4556cc4e578dab2479bb54bb0b72452fde69808097df9e45106e864459363fef8db1d9e17f0539295d7c52c27758a199cf1bdec4224f SHA512 1ab31b01289d8b89fa6a7ab877c2f86971855b9edf26b623b3b213f1c501f1e070388bc2cc6f90308e7fdc146220e65b8fa4d525f8e7c69439d25f892dbb51ed
 MISC metadata.xml 334 BLAKE2B a76cd05e8b752345f7624b375455c1f25ca0417c60a16cc0f2a37d2a876ce237faa80b4c997d34de967e61f05c299a4b1fbe848799d93a5f16dcfebcfed5ebdf SHA512 3bee1c898adaf223c205ba41afe4adfc620ccdff69ea77abfd02b3e33d21a307b889945f2d674b1c88fb4f853c6ace7cca67143f7339315abc3d167f752a1cd5
diff --git a/sys-apps/mcstrans/mcstrans-3.2.ebuild b/sys-apps/mcstrans/mcstrans-3.2.ebuild
index 631d654a0a38..28ef70cad5bf 100644
--- a/sys-apps/mcstrans/mcstrans-3.2.ebuild
+++ b/sys-apps/mcstrans/mcstrans-3.2.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == *9999 ]] ; then
 	S="${WORKDIR}/${P}/${PN}"
 else
 	SRC_URI="https://github.com/SELinuxProject/selinux/releases/download/${PV}/${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~mips ~x86"
 fi
 
 DESCRIPTION="SELinux context translation to human readable names"
diff --git a/sys-apps/nvme-cli/Manifest b/sys-apps/nvme-cli/Manifest
index 217d305cc329..6e39fd16f2dc 100644
--- a/sys-apps/nvme-cli/Manifest
+++ b/sys-apps/nvme-cli/Manifest
@@ -1,7 +1,9 @@
 DIST nvme-cli-1.10.1.tar.gz 463826 BLAKE2B d92702e3cb7c761dbf12dbd56dee44248d49ebdb5b57636ff00a74728e14b44caa6f1500ed90e7fa63d4b1f2de28624a70f37e27a060dbc138f303e46e224dcf SHA512 92bef073205b357f4b14ba929b7f261d0c18b343e5e244cefc24521dfc581dec4b941a13dc00f9a3b4d938ccd026c847d58ccfd75f813cc3c4f484f8316269dc
 DIST nvme-cli-1.11.1.tar.gz 478664 BLAKE2B 74c1ffae32da7605afa02fbbf73878477e04669331c8971d4cc596088c42619abac65a1cfe54b62bd62f253328309f8bbd61c232a200816aa1090ebdf3f7ea76 SHA512 467e327f45500d80cebd6e5e55d4e6d3731a754423e71180efa9d4f5e98f0774f7a31393fefc2794250b487446005dad8e7002a27aff1f2b285983d55ec0d0b3
+DIST nvme-cli-1.14.tar.gz 579561 BLAKE2B e27dade228ee47d88ef5cbab4d9d6163e75af44fb3345ed2ae566e875b973355255a5aba1b1846e53006f9676922cf7901a5e6e4867fcf04c591bf372a119bca SHA512 b5e18708233fd37069d84ee34232d737ed6d6909b0ec523d82cc2c4940172f7ce769b9bbec0d8615ebee544a5174cb4d752ad6d96ea05cfaa1177efc760f0e9e
 DIST nvme-cli-1.9.tar.gz 440675 BLAKE2B 19d9f4982e6bf4d37bbced02aadd0f58e496901c1463c96596b289e23c4e5849bfed9a4129447588c9c8104d5b49fd0bf97ee6495907bf022487407f02d7c4ae SHA512 3565b33bc39bde4480bbde5d46d75ea6907c0921884e8f39029b746f8383d3630942e405c61bcc3654bac5646bc86479b4b790e1b823ec83650649621bab6dac
 EBUILD nvme-cli-1.10.1.ebuild 977 BLAKE2B e971e0666096f3508d8db3d899e592f630edd1c56a84675d49c4d9df897d86317bf481d885ce211cc081692b53bf1bf76cd806e041956ffbbe9bb901d2179e9b SHA512 0c5327273daa6fd181ac3b04ba197d47c5ba0e43182a84e37cc3f6133313dcd6b6d781e0d00761f23fcda9e627f0928b84282cfc5c4ddcfd4d3f7c68fff9648b
 EBUILD nvme-cli-1.11.1.ebuild 841 BLAKE2B d9b6316b4d9a1c5d9d11e77ef45562dff8277d71f8f1180f71ed0bfaea8335d6b9b009e712c84ad91ac8eccfc3eda7d9aa5a7fa46c2705bd00e999b85167ced8 SHA512 3b00b5d217da4325fc1627b695968de0c0c621208cb0a95c06dd04a1c1ca991bbc2fb8971b16da309b8ae8e5c19a8b1b3aae572fd1149238451fa6afbf4818b8
+EBUILD nvme-cli-1.14.ebuild 841 BLAKE2B 5aabb0b181f4ecfd1d0ef049879bbf5ef245cc55c4f92cd194fb14fcce98c918af87d9dad9cf276b8b1eddd6e93c6675a18a93d2797f0f70cf5c087f3176ff7f SHA512 5110fdaaf47f85768775a5c1589b4002989526ce857b75e4a0536d8012539ebfd032eed4cbff3a3e2baf2ef0395f94f150e464fc9f8bed834910386da197e6f7
 EBUILD nvme-cli-1.9-r3.ebuild 976 BLAKE2B b500757c242990e42c523da5d69675c0ee15fc5528923c6bd03d11b513cd3518986e866ac5a0e1503b55ffaa5748ebbef14ade322c731efcd6901ca1a55e084e SHA512 5868e20533d4b7c6c51bacc88c8ccf5a2ce37717e6e05ceb5a26de17192f548f72ede949002af9d86b03da91a45533809f188267925faae68e4b70afc9954d61
 MISC metadata.xml 369 BLAKE2B 67a0c73fe0e2de97927a7c827bf4d216c7460c2ec4383c07e028c0b2d10e71a45559482bab635a6b9374fbec557ab83327baf041eb47bbc06c5e624bb29f6925 SHA512 d9439fc99f1bc5051b670e7d287185af8e7db4ba9045fd9a9aeb4c0f04a33716650d3a01f0ad8640e8b62db048a0f536fbd6145d5a7d79bb7aa524d63112db61
diff --git a/sys-apps/nvme-cli/nvme-cli-1.14.ebuild b/sys-apps/nvme-cli/nvme-cli-1.14.ebuild
new file mode 100644
index 000000000000..da5f95ef1298
--- /dev/null
+++ b/sys-apps/nvme-cli/nvme-cli-1.14.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit systemd toolchain-funcs udev
+
+DESCRIPTION="NVM-Express user space tooling for Linux"
+HOMEPAGE="https://github.com/linux-nvme/nvme-cli"
+SRC_URI="https://github.com/linux-nvme/nvme-cli/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+RESTRICT="test"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+IUSE="+uuid"
+
+RDEPEND="uuid? ( sys-apps/util-linux:= )"
+DEPEND="${RDEPEND}"
+
+src_prepare() {
+	default
+	sed -e 's|^LIBUUID =|LIBUUID ?=|' \
+		-e '/DESTDIROLD/d' \
+		-i Makefile || die
+}
+
+src_configure() {
+	tc-export CC
+	export PREFIX="${EPREFIX}/usr"
+	local unitdir="$(systemd_get_systemunitdir)"
+	export SYSTEMDDIR="${unitdir%/system}"
+	export UDEVDIR="${EPREFIX}$(get_udevdir)"
+	MAKEOPTS+=" LIBUUID=$(usex uuid 0 1)"
+}
diff --git a/sys-apps/policycoreutils/Manifest b/sys-apps/policycoreutils/Manifest
index c8ae13916dd4..4880feede16e 100644
--- a/sys-apps/policycoreutils/Manifest
+++ b/sys-apps/policycoreutils/Manifest
@@ -2,7 +2,7 @@ AUX policycoreutils-3.1-0001-newrole-not-suid.patch 212 BLAKE2B 0d3efdc32cb29b12
 DIST policycoreutils-3.1.tar.gz 2817914 BLAKE2B ef68bb5f9cf577164ead44803b6be2bd6401c9e923d2c775c7c8c47f0e803749feaec4247fec5cc1cb766314954402fd2506370bb397f746437ecfcf65b384f3 SHA512 0592f218563a99ba95d2cfd07fdc3761b61c1cc3c01a17ab89ad840169e1a7d4083521d5cacc72d1b76911d516bf592db7a3f90d9ef0cc11ceed007e4580e140
 DIST policycoreutils-3.2.tar.gz 2817961 BLAKE2B 747cbd7b84ffa9153067340f8f1dc5a652eaf85b037a6e10e116d3d0b31c8e7c9794bc6a46ae212848bef4887478ac167e359a387bebac49e0acd08b727808ce SHA512 d16781d2d61b8b78d6fc242f2b5c3a03f47ea524fb61655823b6b0f0327ff376c65fe7bdf7a53f5863c01e599cf4a7050f21fda0fe6a8f2c2c16f89b156a4346
 DIST policycoreutils-extra-1.37.tar.bz2 8809 BLAKE2B a7f6122c2e27f54b018174e962bd7f4c14af04e09bbb5300bde6967ea7f2dc5cd03b5787919a4e7f5288bcbc6747922962b5bd3b588ab1e3a035fbff4910d8f5 SHA512 0a85cd7cf279256b5e1927f9dfdd89626a1c8b77b0aeb62b496e7e8d1dccbaa315e39f9308fb2df7270f0bc1c10787b19990e7365cad74b47b61e30394c8b23f
-EBUILD policycoreutils-3.1-r2.ebuild 4619 BLAKE2B 7cc7726962441be4d61b2ac8f15d2505d05fe943663f9ebb34f86f381c3319126699626c5f1b37e2d24231af9723e14e58bf79628703565d9e5314095e360c53 SHA512 5f739867053bb98e1f63c3e59512ac31b077163b54f6e420687b833da4d7cc5c4db623147866b3765ee433eb243f12e0e0683736a024641cdd09c8207084fc23
-EBUILD policycoreutils-3.2.ebuild 4476 BLAKE2B 799b932548e40c807a34fed32d3a6759ba49fa2e03e4d4a41493dca206307949b3a770bef991a4102a002e461998b75b71321f593a67c0e99824f13d364b4334 SHA512 ac6842ca482c0a87216f714195c801ac975263eaad93ef3768c1ad5b3edcb78237d7771dbb36aaab9fe9c9133a1a7a674402ea32a050ed816925f8a0ea60eebb
-EBUILD policycoreutils-9999.ebuild 4476 BLAKE2B 799b932548e40c807a34fed32d3a6759ba49fa2e03e4d4a41493dca206307949b3a770bef991a4102a002e461998b75b71321f593a67c0e99824f13d364b4334 SHA512 ac6842ca482c0a87216f714195c801ac975263eaad93ef3768c1ad5b3edcb78237d7771dbb36aaab9fe9c9133a1a7a674402ea32a050ed816925f8a0ea60eebb
+EBUILD policycoreutils-3.1-r2.ebuild 4624 BLAKE2B b467137228cf544f8467a109eb2a00fa80a8b1ddedeb13a60faf2dd0c9adf5c5b622ca045874c691cedc5429614c1d7c73dd385f8faad5ce1a95016c12790be6 SHA512 51e326cdb0f0103b40fee5826e8608e66d90b4ebf40b6313092f341f2438b49892813ef24d1bd60e00bd9102a31120db326ad47359c02fc7792d7fa9f755e32a
+EBUILD policycoreutils-3.2.ebuild 4480 BLAKE2B d4fa0161f0dd418acc6daab20613ba9f736bdfebe874860a1f0f45eff8837317310b9fe43a00d2f02c39f6bf89ae57a8c669f7408f51ac023ae1c0b77fefbcd5 SHA512 2ffd528e81b2e0e0144ad187531d22de978a3ca1dd4bad8d027caa4b15de1017f4a083c90573a12e0c54b2b7a6e616f703a123f2f65e4ee459c6d3798d252d18
+EBUILD policycoreutils-9999.ebuild 4481 BLAKE2B 58bb10ff43da7cfdf706cd201e19abe70992d1fb49172f20aba80f7cda1bce21de7b7bbbd342c3586b4f18cea6b0d1505d4def30477abba257f78fad6c54c9f0 SHA512 73808abce9ab0c4f9b4714945cd98ab70a1bb37b14fc4326fd8e0ba001db1152af45f0fa315bab57a357aaf80a111d8f517ae6bc87ab4a7de449fe25624f9e78
 MISC metadata.xml 1117 BLAKE2B 0ec558cea900ec5f25cef43a76a5c0436562ca9d43cfa23d9251ac4e8eb22f0154ca577f061f50762559be9b567faf5dd7ed994c59308ba140f2fe2b8a5d1ad0 SHA512 1f8703b31ced13b4e15311ecc9d4e03c085eb580e61394e8781744a9c33794e0f10144617415e69b703f5716ca5fd15ad6db14fe93a95c9b5d46c429542beac5
diff --git a/sys-apps/policycoreutils/policycoreutils-3.1-r2.ebuild b/sys-apps/policycoreutils/policycoreutils-3.1-r2.ebuild
index 90e31a898724..62b8f3856614 100644
--- a/sys-apps/policycoreutils/policycoreutils-3.1-r2.ebuild
+++ b/sys-apps/policycoreutils/policycoreutils-3.1-r2.ebuild
@@ -31,7 +31,7 @@ if [[ ${PV} == 9999 ]]; then
 else
 	SRC_URI="https://github.com/SELinuxProject/selinux/releases/download/${MY_RELEASEDATE}/${MY_P}.tar.gz
 		https://dev.gentoo.org/~perfinion/distfiles/policycoreutils-extra-${EXTRAS_VER}.tar.bz2"
-	KEYWORDS="amd64 ~arm64 ~mips x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
 	S1="${WORKDIR}/${MY_P}"
 	S2="${WORKDIR}/policycoreutils-extra"
 	S="${S1}"
diff --git a/sys-apps/policycoreutils/policycoreutils-3.2.ebuild b/sys-apps/policycoreutils/policycoreutils-3.2.ebuild
index fcc4708f1b9b..317d7990d80b 100644
--- a/sys-apps/policycoreutils/policycoreutils-3.2.ebuild
+++ b/sys-apps/policycoreutils/policycoreutils-3.2.ebuild
@@ -25,7 +25,7 @@ if [[ ${PV} == 9999 ]]; then
 else
 	SRC_URI="https://github.com/SELinuxProject/selinux/releases/download/${PV}/${P}.tar.gz
 		https://dev.gentoo.org/~perfinion/distfiles/policycoreutils-extra-${EXTRAS_VER}.tar.bz2"
-	KEYWORDS="~amd64 ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~mips ~x86"
 	S1="${WORKDIR}/${P}"
 	S2="${WORKDIR}/policycoreutils-extra"
 	S="${S1}"
diff --git a/sys-apps/policycoreutils/policycoreutils-9999.ebuild b/sys-apps/policycoreutils/policycoreutils-9999.ebuild
index fcc4708f1b9b..c8fe18af66f9 100644
--- a/sys-apps/policycoreutils/policycoreutils-9999.ebuild
+++ b/sys-apps/policycoreutils/policycoreutils-9999.ebuild
@@ -25,7 +25,7 @@ if [[ ${PV} == 9999 ]]; then
 else
 	SRC_URI="https://github.com/SELinuxProject/selinux/releases/download/${PV}/${P}.tar.gz
 		https://dev.gentoo.org/~perfinion/distfiles/policycoreutils-extra-${EXTRAS_VER}.tar.bz2"
-	KEYWORDS="~amd64 ~arm64 ~mips ~x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
 	S1="${WORKDIR}/${P}"
 	S2="${WORKDIR}/policycoreutils-extra"
 	S="${S1}"
diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest
index 80e1a8cad28b..8a6dc54f1470 100644
--- a/sys-apps/portage/Manifest
+++ b/sys-apps/portage/Manifest
@@ -10,6 +10,6 @@ DIST portage-3.0.20-bug-796959-c8a52e1-c3e4919.patch 10306 BLAKE2B 9ffcf396b983a
 DIST portage-3.0.20.tar.gz 1348818 BLAKE2B e8af0662d073110a921ef23865872b0440f5e549da92b828af3dc71010d0f49d98c429c52c90ed683407fcfee7bf17a504082166f2fcad9590d7435dd43dfb83 SHA512 69c1846dedf0cfa3f57b2748cf8e077ead05ab0185e785dfc6310439b8624cdd72449209a807f12f59a5175ba065f8cca1409d43bee6012900b2c8b1e7f9b7e9
 EBUILD portage-3.0.18.ebuild 8756 BLAKE2B 27048b15c8fdcae36bd51d56edeb0838b43e77a284930071833901f1484e14617f06090cdd1ed2ce6a166a78d272d9a37193b4d52f93942e9df1203715e09ae2 SHA512 38525aed603cfc379ff01f48f3bf3aa040b5355576c46515724350401ff948772b9aeed2b088f7d93805776ef4a55d32e02afa24b47cdfc7f298437c9019920a
 EBUILD portage-3.0.19.ebuild 8512 BLAKE2B cf8d97e8264830926303904e20b424a37f920d1431cbe3f4e352dd2416a1e7fc1546c8bca0b126da9ed1e111623557e4591b1c061df8a5aeabecaf94f90d74f9 SHA512 ff252978a99c5dc4fe7ab6cc8192eb9881d6b229d5933a0f10f57ca190b46c67f9899ff2ac16308b713ec43d3a01d4aac71bdc0f017d57e059c6c1a740c09083
-EBUILD portage-3.0.20-r6.ebuild 9873 BLAKE2B 178278bae7227dd21ff22045c8cd2c2fc94ff2985ff1b6207f7486d763597821d224fbb7bd548177b093321a2e5a1c8f7a8552dbbc1cf5df2c72d8f584c7503b SHA512 6a08faa561b1b001b2faaff3664cdf976b06c7e3c360ac05163311997ea846e5876b2aa6750dc39117d61052d8a8601514c62f000e7defbe96a6fc174ebe9aac
+EBUILD portage-3.0.20-r6.ebuild 9869 BLAKE2B 6594199ef0481440607515c45bcf7195e4df9a4b80b00c96ca72d8a8db0f5b053d980d9dc3df63e810db1096638f2f33bd7cfd54f694a3524381f81282d32406 SHA512 1fad03470c578880da1c27d40d78b712ae65883332900fa62106b57f9801e06ba2b1027f3c57a55ed4c53a65085b2cb41df0a56d9b54ea3d25ff154477679a85
 EBUILD portage-9999.ebuild 7782 BLAKE2B 807fe6fe4aef995e67d2a1af8e51f1564bb6598be720600943adcf41dacce4f22f1f7c6eff9d6f2a0a817d893b983460eee1578b6da402acf6d69ed2e6e7c23a SHA512 e99bb356b89ae7d00cf97c76d2a03145465a75e191f4a6039a2f3a082e553ee4ce6065580beecc7d6ce7470e8236b773cf40c9fc372786033ed30694deb05b10
 MISC metadata.xml 1482 BLAKE2B 1f75075b708135bace30a6fb3caaca01a411bcc53805e47720f639d7a8866ad703aac0a1d0b5e5dc3db5efa502c112b733535d3c7c40a691d444958cab3f065b SHA512 5ccf338f8847b8e958efdadb475af12bf689e1227830dccd117682f74b1ae4711359337a5c688b3ed9fc8056e4cbbd37a7e24f5bfdc2f650ab90f6e185091c2a
diff --git a/sys-apps/portage/portage-3.0.20-r6.ebuild b/sys-apps/portage/portage-3.0.20-r6.ebuild
index e0104657fc24..9cac0509113b 100644
--- a/sys-apps/portage/portage-3.0.20-r6.ebuild
+++ b/sys-apps/portage/portage-3.0.20-r6.ebuild
@@ -14,7 +14,7 @@ DESCRIPTION="Portage is the package management and distribution system for Gento
 HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Portage"
 
 LICENSE="GPL-2"
-KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 SLOT="0"
 IUSE="apidoc build doc gentoo-dev +ipc +native-extensions +rsync-verify selinux test xattr"
 RESTRICT="!test? ( test )"
diff --git a/sys-apps/restorecond/Manifest b/sys-apps/restorecond/Manifest
index 019f9a2ffdd8..43f450688e3f 100644
--- a/sys-apps/restorecond/Manifest
+++ b/sys-apps/restorecond/Manifest
@@ -2,6 +2,6 @@ AUX restorecond.init 647 BLAKE2B e716293dee6f66a43d95cf43b6e4a50392d66d3d1fb2f08
 DIST restorecond-3.1.tar.gz 18939 BLAKE2B 3a3fcde057dad3ed05692d679ba27e0b24f191d92ed5114fa38cb5f846c4cc00d85bb09b5d4e560ed2b914444e0c2d1c407f6c03900610624d5626d05f2991bc SHA512 cdcf299f48b89a7c641ded9507b9b966bf648497394f8e988a9cb1ceb3224c86369706027f3416a4f9750836f7a8f4580a4b3df76673e03f897b383d7ed0e2c8
 DIST restorecond-3.2.tar.gz 18965 BLAKE2B 6cbd32c7c33fcc9f3fff78cc1faaa354c7ee918bfde8e12dfa73ce99632a8bc1e00d2f3b7cdd9c72179dbb51af1847e8dadd41cdc3ca20e9fb45e61871325029 SHA512 b1437a5d4dffef3463a0f2994f07c98585e9cfbc354db2dc07483fd9b964b079090697a277d2f4fd6bcd8df62f7505962fdca22d700721f6ba71490ace0167a9
 EBUILD restorecond-3.1.ebuild 1170 BLAKE2B 98e3caa2596762f7a123252aebff2b9d2fd774e070fcbbd5bfcf13445b1ee1afe9e6850fcf37491cc6da6d382c0a6af360902180dc17905384eb78840dae1055 SHA512 68d65a4b44f6d1b5cd20226a25e8813af4cee19bb2d197ad188c79fa4cf3f152307c2cfd0ef4198f9684ada8efddcb243db97ec13b9dc5843d4fb4859938c91c
-EBUILD restorecond-3.2.ebuild 1086 BLAKE2B 5e96801f2054d6b2a825f9ab4d63f39f91597488a31dc76ce1111de3b1e3e357897dda4b6ff9ad09fa82dd180bd64770397c06a938bd5999896b38266389fd3d SHA512 a0108d23bfb7dc4990eb4d25e7ab53136454d9250e4849814602d394e31329fe7f7c6c94e07af3793bc689a4655d2c0442f1f70295750643c6948eaa4a8c5118
+EBUILD restorecond-3.2.ebuild 1085 BLAKE2B 15f16081601bd7ddfc087e1453fae50204c49d521663658f3890b75c713c658e583ad75e581d067920645d60ced2d448bf8b1adfc820fdd6e2ea7091c6c292f0 SHA512 9d804e90681f0af77a6dc2e21ebbd55cbce2be18a3fa9cb437445c71f0f00dc5a9c23a1d788579417f064542daeff195b9db96397791f32440f61a85058009a6
 EBUILD restorecond-9999.ebuild 1086 BLAKE2B 5e96801f2054d6b2a825f9ab4d63f39f91597488a31dc76ce1111de3b1e3e357897dda4b6ff9ad09fa82dd180bd64770397c06a938bd5999896b38266389fd3d SHA512 a0108d23bfb7dc4990eb4d25e7ab53136454d9250e4849814602d394e31329fe7f7c6c94e07af3793bc689a4655d2c0442f1f70295750643c6948eaa4a8c5118
 MISC metadata.xml 334 BLAKE2B a76cd05e8b752345f7624b375455c1f25ca0417c60a16cc0f2a37d2a876ce237faa80b4c997d34de967e61f05c299a4b1fbe848799d93a5f16dcfebcfed5ebdf SHA512 3bee1c898adaf223c205ba41afe4adfc620ccdff69ea77abfd02b3e33d21a307b889945f2d674b1c88fb4f853c6ace7cca67143f7339315abc3d167f752a1cd5
diff --git a/sys-apps/restorecond/restorecond-3.2.ebuild b/sys-apps/restorecond/restorecond-3.2.ebuild
index f3e66897e8c1..fe9b6bec869b 100644
--- a/sys-apps/restorecond/restorecond-3.2.ebuild
+++ b/sys-apps/restorecond/restorecond-3.2.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == *9999 ]] ; then
 	S="${WORKDIR}/${P}/${PN}"
 else
 	SRC_URI="https://github.com/SELinuxProject/selinux/releases/download/${PV}/${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~mips ~x86"
 fi
 
 DESCRIPTION="Daemon to watch for creation and set default SELinux fcontexts"
diff --git a/sys-apps/secilc/Manifest b/sys-apps/secilc/Manifest
index b81f5ea3930d..5d7c752b75bd 100644
--- a/sys-apps/secilc/Manifest
+++ b/sys-apps/secilc/Manifest
@@ -1,6 +1,6 @@
 DIST secilc-3.1.tar.gz 176631 BLAKE2B e79818580d2a788d672574ebd77349f0c59b678d2be628479f517412ca876fa225ba0dd63ef3200ed15ff693cd5f4cb4ff537d81666fef3a008ba4b3a7577e0c SHA512 79e3e4910178af49ea164d620aa997adb21dd18581c054a4023dd9116ec9dd203bd12989ef308aa1d253b47fcd251ee2b99c26e143d1db3de22a7f374ff38e0b
 DIST secilc-3.2.tar.gz 179384 BLAKE2B 89a02ceeaeb221eb5e819f6c6f09cd7e4675971d1870850867f0e258e3cf089c048a2976016c8200cffcb7904aae01d7e9d6a0c086a2a33fb08020df10b92059 SHA512 ef60aaaba3a9b4d8da496ae80203a8c9595dc2f97f767432f6b3323395fda65293540ed9574e8d7d3f40854c3ad38a95a7b96939b6c689f02a3d04834b81ca45
-EBUILD secilc-3.1.ebuild 872 BLAKE2B 755350212203ab5e1ad5a96c22c275f304bcccf96a7b2cbbff4eaf41ef35eddc4cb80cf72a781844a3ca19c3bdcf003216f834a1241ffef199cf65fd5d40b6b9 SHA512 d5fdd15eb659992be37725aa1434550b3ba5cdd775462f081c7785865083c7b40642b789076597a7c81db465e08d80bf3b708666c735b9eb4a198a93ec02fe3f
-EBUILD secilc-3.2.ebuild 762 BLAKE2B 4c616414c63c7514009a67e4e1dc5446eb24c946ff6ad123b8bd3e8c24f272fb151a5d167c45b2a87755379bd2af8d98b6d7adff6b27bd0d4c2a85371411ce8c SHA512 72a52bac0f49f41519f8e0c195cce6ca9983da8b9d4394e3e52e22a907fcfdd37d95f30060a07dcca4baf83940e49777dfec597fe7fb457014cf54f695d47590
-EBUILD secilc-9999.ebuild 762 BLAKE2B 4c616414c63c7514009a67e4e1dc5446eb24c946ff6ad123b8bd3e8c24f272fb151a5d167c45b2a87755379bd2af8d98b6d7adff6b27bd0d4c2a85371411ce8c SHA512 72a52bac0f49f41519f8e0c195cce6ca9983da8b9d4394e3e52e22a907fcfdd37d95f30060a07dcca4baf83940e49777dfec597fe7fb457014cf54f695d47590
+EBUILD secilc-3.1.ebuild 877 BLAKE2B ec8b1f7e9874e234d561ac9deb26b128ded5599616bd2e501b6fb591e77c45942466c227103c7f040dd10ba49445e283e9fb410d3f18635c8f4eb9d0f0571b8e SHA512 e3d0bd0d5bcb480d10f7a7e188a13b380f6452a5f153a0c5abe3b58bd475225d271e127cb1ec6c9ea98e3405095992aa88cfceceaae7278281cc8ce0bded1904
+EBUILD secilc-3.2.ebuild 766 BLAKE2B 4bda80f27ea47df93e24828b78619ce10a3de60bb3b318899e714ea89666a88b53ec8252e35436d25fd7aeef69da42b75e5e0589e4f40bbff79ed054d8598cc8 SHA512 1c584dc5b3bdd4a7b0bc8f4de599d962ebe59719895c02fd5162badec79318d6f411ddedde7989df2547a62c5ffbc49810ccb7a3f211c204dd5018385498789c
+EBUILD secilc-9999.ebuild 767 BLAKE2B a29b9d94a0b73c83f2d3b403e85a0a8d2b279e0cb6f82af8e7efec6e4293a33dc43622aa817180eb501c67d8c42854bcd08aeee80c8f99795679f964428cc2d1 SHA512 0a179e4c5deabd685f48103c0ecc6ed190aed00122d91731a040916cd55b2853987c44cfe6315ff872119a7b53f9a1b8eea88dd7b8c24b66ba62c6cdb8e2af19
 MISC metadata.xml 517 BLAKE2B 69224c0360ff5acd98dcd493463266090ad17693588e91a434e412460352594673563388b52eba5313c7a9aa3b745d916f089805fe88ba8270cef1528f1fe13c SHA512 457ff97de6f9c6992a025588a5af5692abfc38a7df8537de2006ac841989a9b7e566b796b16d304252ad03cf66f205dd3a4fb0218281fd551c430c58b9039310
diff --git a/sys-apps/secilc/secilc-3.1.ebuild b/sys-apps/secilc/secilc-3.1.ebuild
index 5ba3983cf787..37dbc1b714b9 100644
--- a/sys-apps/secilc/secilc-3.1.ebuild
+++ b/sys-apps/secilc/secilc-3.1.ebuild
@@ -18,7 +18,7 @@ if [[ ${PV} == 9999 ]]; then
 	S="${WORKDIR}/${MY_P}/${PN}"
 else
 	SRC_URI="https://github.com/SELinuxProject/selinux/releases/download/${MY_RELEASEDATE}/${MY_P}.tar.gz"
-	KEYWORDS="amd64 x86"
+	KEYWORDS="amd64 ~arm x86"
 	S="${WORKDIR}/${MY_P}"
 fi
 
diff --git a/sys-apps/secilc/secilc-3.2.ebuild b/sys-apps/secilc/secilc-3.2.ebuild
index c7694587c83e..5bb8db55a984 100644
--- a/sys-apps/secilc/secilc-3.2.ebuild
+++ b/sys-apps/secilc/secilc-3.2.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == 9999 ]]; then
 	S="${WORKDIR}/${P}/${PN}"
 else
 	SRC_URI="https://github.com/SELinuxProject/selinux/releases/download/${PV}/${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="amd64 ~arm ~x86"
 fi
 
 LICENSE="GPL-2"
diff --git a/sys-apps/secilc/secilc-9999.ebuild b/sys-apps/secilc/secilc-9999.ebuild
index c7694587c83e..38dc82e0bcdd 100644
--- a/sys-apps/secilc/secilc-9999.ebuild
+++ b/sys-apps/secilc/secilc-9999.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == 9999 ]]; then
 	S="${WORKDIR}/${P}/${PN}"
 else
 	SRC_URI="https://github.com/SELinuxProject/selinux/releases/download/${PV}/${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="~amd64 ~arm ~x86"
 fi
 
 LICENSE="GPL-2"
diff --git a/sys-apps/selinux-python/Manifest b/sys-apps/selinux-python/Manifest
index 1902f3d3d190..aaa471cb4345 100644
--- a/sys-apps/selinux-python/Manifest
+++ b/sys-apps/selinux-python/Manifest
@@ -1,6 +1,6 @@
 DIST selinux-python-3.1.tar.gz 2100549 BLAKE2B c5d207bad60c379259e3bfc8f029f76d4572818cdd41a263498ed4434a70eaf7ff51af7772cfb27de0e9e4af03bcf9906ab0f6a59e88de10e81cbe0e8c5928b8 SHA512 5dd98f77ae8ea8bac6a89ec7def76e12496b9a9f8c9612c4cc1dac7a8e8c60380a00c857426bfefbcb4273706addd2594e9b467f69408ef284f082a09d45bd49
 DIST selinux-python-3.2.tar.gz 2101106 BLAKE2B b4b185a7468de68eb2146011a9bc82ffb7db9878517833c1e8dfa23279aec3dfbf46a27b70b17c1e317a2c939bcf6d1748638fd4a078325b853de34ae3c51a6f SHA512 2c3483e27c4ad6942e23e39897e0eccf61b95d685ace62315678cb49739d300d4ca4a7a51fa7a9aacaa98737446a70923855d15827eb6275ffd6999be0b2a755
-EBUILD selinux-python-3.1-r2.ebuild 2543 BLAKE2B fd5cf8e64f172da259a7ff0f6be5d9d3f4824584b2d4e816689b5ac2c00c516b3692e748debd0dab51db4ef2faf07b10510b6b39147c0238969a6ca9cce25c45 SHA512 ae2066a82dd516c983aae8f00b1a7c14d25f61120904ce3cfcaf5958866d659386860598b76137a6ed311e7c6ad550f710f4b6daf099db4c125501c6768c1c72
-EBUILD selinux-python-3.2.ebuild 2383 BLAKE2B fcc4d47cd407f0004f2522e7341a424479310352c7452e30a6d5e09716e4b36c6bd4dc3887d4c6754a1fea99eb86ed165de097f8a5c5bbeae85529791f2ebd04 SHA512 9ac89baabe3bbfe17e87cabaaad5358a5d16aea252db7a407c58fb751fbf8306277c7df88ba54403251fdd843ece1dd2bef96155e870a71888f3cceccb86bbb5
-EBUILD selinux-python-9999.ebuild 2383 BLAKE2B fcc4d47cd407f0004f2522e7341a424479310352c7452e30a6d5e09716e4b36c6bd4dc3887d4c6754a1fea99eb86ed165de097f8a5c5bbeae85529791f2ebd04 SHA512 9ac89baabe3bbfe17e87cabaaad5358a5d16aea252db7a407c58fb751fbf8306277c7df88ba54403251fdd843ece1dd2bef96155e870a71888f3cceccb86bbb5
+EBUILD selinux-python-3.1-r2.ebuild 2548 BLAKE2B a449b67df1783f7a74859bb5fda7c6c17d4c71c21abb5e3f286872befd15c6f8b85b0a12b67232682bc4e5bcdb6701c0b926d78b4b428d56cec6f0f264072ca9 SHA512 a7ca65aab8c6c7fbcd16e1b26a0b21569f72ffc10e7784ca6cba5cbc1bf4cb57fc846095abd0056d0e4ddb4dc6065b464defef55053e4d554cf5baa086bd70f1
+EBUILD selinux-python-3.2.ebuild 2387 BLAKE2B a3562c641efba34a9c207bac993b2cbba25fbbc6c232c665296fb9e99f6b34736c576edf69e9cb0770648c19d791afcd161c7a242a275e25758fabe836fa1308 SHA512 16c620571c290dbea57e25ad1c4f9ce2a3bf2542a7cbc5609aee7131a315c16f5f30608da552749c7df043deeaea1a75d9b040bd115c18b83eb55d46ce3076dd
+EBUILD selinux-python-9999.ebuild 2388 BLAKE2B 70c5228702559cce48ba1430a0d216a696ab8edb79c5a67611dd214ae3de4c3e95f9e5d93b71bde4e6da9dda0099ab20e6c4268ad1a7a429b76b7a4ed7fc57cd SHA512 c57c79af8c506b93997561024e5fa71191c94be9297eaefff074d5518069b8a3a15ca7ab7db96011c61b6d931c877445d60c2dd809ea765143d2e2ba5da55e2f
 MISC metadata.xml 557 BLAKE2B 40a5075b9313be98cc5566696ebdf42dfa77814d2c5907832c06b8f846cb902023949bca3aa1b37a03a756649c6025f5f91357c0f6c73292b864396ea1c118cd SHA512 248d0177b4794bd342b35ce901f91a67227f1d8b256f6a56f06b3d424e94dbfb48b8500623bdccc2e0650402276cc1e50d1a7f475e2b04505ec0d4b4f2b590fe
diff --git a/sys-apps/selinux-python/selinux-python-3.1-r2.ebuild b/sys-apps/selinux-python/selinux-python-3.1-r2.ebuild
index 1237105e82d5..cd89ab2c85dc 100644
--- a/sys-apps/selinux-python/selinux-python-3.1-r2.ebuild
+++ b/sys-apps/selinux-python/selinux-python-3.1-r2.ebuild
@@ -25,7 +25,7 @@ if [[ ${PV} == 9999 ]] ; then
 	S="${WORKDIR}/${MY_P}/${PN#selinux-}"
 else
 	SRC_URI="https://github.com/SELinuxProject/selinux/releases/download/${MY_RELEASEDATE}/${MY_P}.tar.gz"
-	KEYWORDS="amd64 ~arm64 ~mips x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
 	S="${WORKDIR}/${MY_P}"
 fi
 
diff --git a/sys-apps/selinux-python/selinux-python-3.2.ebuild b/sys-apps/selinux-python/selinux-python-3.2.ebuild
index def193bf03db..df7cfa14c519 100644
--- a/sys-apps/selinux-python/selinux-python-3.2.ebuild
+++ b/sys-apps/selinux-python/selinux-python-3.2.ebuild
@@ -18,7 +18,7 @@ if [[ ${PV} == 9999 ]] ; then
 	S="${WORKDIR}/${P}/${PN#selinux-}"
 else
 	SRC_URI="https://github.com/SELinuxProject/selinux/releases/download/${PV}/${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~mips ~x86"
 fi
 
 LICENSE="GPL-2"
diff --git a/sys-apps/selinux-python/selinux-python-9999.ebuild b/sys-apps/selinux-python/selinux-python-9999.ebuild
index def193bf03db..2d1cc6d2b32b 100644
--- a/sys-apps/selinux-python/selinux-python-9999.ebuild
+++ b/sys-apps/selinux-python/selinux-python-9999.ebuild
@@ -18,7 +18,7 @@ if [[ ${PV} == 9999 ]] ; then
 	S="${WORKDIR}/${P}/${PN#selinux-}"
 else
 	SRC_URI="https://github.com/SELinuxProject/selinux/releases/download/${PV}/${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm64 ~mips ~x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
 fi
 
 LICENSE="GPL-2"
diff --git a/sys-apps/semodule-utils/Manifest b/sys-apps/semodule-utils/Manifest
index 7730d2bb660f..fa0e6d96e244 100644
--- a/sys-apps/semodule-utils/Manifest
+++ b/sys-apps/semodule-utils/Manifest
@@ -1,6 +1,6 @@
 DIST semodule-utils-3.1.tar.gz 14257 BLAKE2B c8c9a1ce7c9c4f53b1f4c728d16b149fdc284f4cff8b4fce0cb59b77d37d6d7e9bf2102c7177c4eaf94677af6147e42d8d0bd55c0bf3a358968d0162d5a6c65a SHA512 b92794bbfbce5834ee7f62fddb40b5506e9291e8fa7c5d669b2e281089b8f8dc40c4522ea287ac5deffdaee751442ba8e691e2ac45fdd378b60d5d6b2527d157
 DIST semodule-utils-3.2.tar.gz 14260 BLAKE2B 35c071c96071028d4a912a89b88d02672f1fb8c2d8d23c3cb472b607dad55acdf351ef870b4d52bb2bed7b816a199c18947afcd16e77b66268822288feb4af2a SHA512 f937647cc22f7ed719908bad64415d706fd97cf1dce484dbca2484b05b3295de40e31bec643b6caaf4e8be742b1f911428d393c5e2d1d0ae39a2a37fd3be9bc1
 EBUILD semodule-utils-3.1.ebuild 937 BLAKE2B 2a17b566209258d0f47adf56d8c38f7c920f6ceb053e07bfaf7dd51139e39a42cc60a4e1986ccb19b50c4bc89b1c97b3a133c02a38431127dfd17200e361e535 SHA512 e36fad3f19c5f81791e57a02ff677a42d02e8037b4cad66d24d7bf37fa50863954c8fe58c18d1416212d24537febed8b91bdfa6fa3ce9c79efb5c80675b3d476
-EBUILD semodule-utils-3.2.ebuild 810 BLAKE2B ec38af054d489b5782728e6c61f75e9b537c22fedc0babfcc9c9760cfd1af93d9ade3aab08a53374586497724fa3812d9c6c2817ce061bf00aa1a0e81cd2d433 SHA512 e524646d89401e49b007ff969ddce63e06efc42bc16960bda20b84c03c1cb6b98e89ad0608eb24208cf9f0afc0ef8d786bc58430f28935ae524f6b3a70fad069
+EBUILD semodule-utils-3.2.ebuild 809 BLAKE2B 3467e06bcc61d36f1a18ff049167a209bf73e6df5626385e0b44fcaf0535145151f29513fe58ce5b527ffd88256b946caf5b8537e89958bb8298d8af4dbe6dfd SHA512 fd8f5b14d0604fbd095e599dcc4685301bc3085758319463419b08efcb034c331e7a94302ff76eb8295d2696dc6a47adc6ec9f3bd8a4224ed87ab60993e8c35a
 EBUILD semodule-utils-9999.ebuild 810 BLAKE2B ec38af054d489b5782728e6c61f75e9b537c22fedc0babfcc9c9760cfd1af93d9ade3aab08a53374586497724fa3812d9c6c2817ce061bf00aa1a0e81cd2d433 SHA512 e524646d89401e49b007ff969ddce63e06efc42bc16960bda20b84c03c1cb6b98e89ad0608eb24208cf9f0afc0ef8d786bc58430f28935ae524f6b3a70fad069
 MISC metadata.xml 400 BLAKE2B 688a9292eb5fc938ae1aef1e62cb46f7cfb119f8d8e784e03c7d3f0d13d48b5120037195d1aac27080b6768a28fa51c209a6928ad0b84aa3802bda55d66f94be SHA512 737d2e097f9b98132e1a75d42c95aaf8ec51be2c4da9898f33b7b07ef519bb846bfc36836c33fc3ddfc716fac06c610475149b5923a684a249f4edf6cc13a147
diff --git a/sys-apps/semodule-utils/semodule-utils-3.2.ebuild b/sys-apps/semodule-utils/semodule-utils-3.2.ebuild
index 13fc0d86279e..68b824025192 100644
--- a/sys-apps/semodule-utils/semodule-utils-3.2.ebuild
+++ b/sys-apps/semodule-utils/semodule-utils-3.2.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == *9999 ]] ; then
 	S="${WORKDIR}/${P}/${PN}"
 else
 	SRC_URI="https://github.com/SELinuxProject/selinux/releases/download/${PV}/${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~mips ~x86"
 fi
 
 DESCRIPTION="SELinux policy module utilities"
diff --git a/sys-apps/systemd-tmpfiles/Manifest b/sys-apps/systemd-tmpfiles/Manifest
index 1728a3e35ee8..c94cd4577bec 100644
--- a/sys-apps/systemd-tmpfiles/Manifest
+++ b/sys-apps/systemd-tmpfiles/Manifest
@@ -7,6 +7,6 @@ DIST systemd-246.tar.gz 9534036 BLAKE2B 71b72abcd4d066d35d45d9835d41bec8faa9a7ed
 DIST systemd-stable-248.3.tar.gz 10320940 BLAKE2B 725494e0197dd182de55e4967088f4b4b709e6b2242723368b6cd95606582e01a57322b1f18fa194149055140a90993696734ad3c004843bfaceb72cd04a3a84 SHA512 8e7ff0d5e63cc933e4dc23f7e0bef9707fde90396605eb8822d34de90d7abe8fd37e5739e33b657868218aa7281147cc944c096c007324c3e6fb54d833a83485
 DIST systemd-tmpfiles-246-musl.tar.xz 25860 BLAKE2B 87fc4ca37abec9c1a0cee48bf78c575bd53e16a50d427eff338159dc6d5474ffd328af533ccf90a0e1e160a16baa7378070f418f2be0d7f77e00907a5d07d30e SHA512 4a93d9f0cb2df2dd0a2f91820615dd3a95d19583f45dc0589e37ceaedfc2040112310a6e3fc525e28e222e96a91498af2fe8541b5bf86a635c0f52dd1a84deb7
 DIST systemd-tmpfiles-248.3-musl.tar.xz 22904 BLAKE2B a277ce86577644cecbca5dbfde34aec494e3e14075ab4f7fcbb02f9307d714a93ca63f38e346a1e98391ca9c55860c7e90789cd5edb9b196cf638d54bfe1153b SHA512 d3db6a90bed6b6c1a9f6bce138137554742d1bc60da142fbadbd49b64677a562e47d8140b9c413857106e053d740476744b7f7e05af9dd4a1329058c78cef940
-EBUILD systemd-tmpfiles-246.ebuild 4806 BLAKE2B 631d8fe0eff04de317fbfb1455347a681b15c1ab1dfcba6f253f97c5ae99aec175ca96fdf22a410baf4a2faf72d55799943c8a7457128a0a94e62e08b75b9d18 SHA512 027e2c0929fea96074cb9e767d286defc681f789e02644994b659d9a8a5c17cb60fc47282b379d013473641eecdcb14780141d0e10527291e8ae598d4eae33be
-EBUILD systemd-tmpfiles-248.3.ebuild 5457 BLAKE2B ec6217051a2c813e739f2f740e4eb970c28b5efb46a6836dd738bae4abd596c9eb16fc496028589f741b4fd892508b716f31e67deb89364d8def309cb4aa5dac SHA512 3f112d52e5d3c4343d645769e6e79d9d33231e042493b21fdc3d86bc2dfa55962387aa3d20b8619016973b751a14a7fb60bcf667efbe4ba63fa43fa92d1f3f4d
+EBUILD systemd-tmpfiles-246.ebuild 4798 BLAKE2B 7a79b8e66836982ce2fccb0292cb39974db018a99846e692875743b726932246e7f56ccb581df4957938f369bb879ac52ccd701281c8ed8c02a22d246a9f803a SHA512 d15bcb442ae7706039c0443f8467a6dfe6702964a2f8fa735869c49bea280c6232794f8c8cb9bd3d8226df9006e469df4fb56475590b3f31ce5529f079fbd584
+EBUILD systemd-tmpfiles-248.3.ebuild 5456 BLAKE2B 0905dc2c8a65a9843200b11b073624fb2fd924ab2ba882afa9c43144c2b92969f116f1899f76d92eb2bb6a952372f86227a7986b4a6155d7060f11f60066d881 SHA512 6f6360edafb9a60789fe7d45e7ede624c2d7920492d9a326929f656e66b791f760cb808dbbf981f0a20cb0d0f46ffaa387ada4748de604c8c5d2ad35b0ddbbb2
 MISC metadata.xml 251 BLAKE2B e9e9d48943645d8b737bc1f7ab0efb05db0f8eddad759c9bb40d07dc008fbfb8f5cca2020de71a9ff6945f5d66292ac02355773545010cd49c77fe6dd5ab7b40 SHA512 1b6a6955118c1a74cc89a77d6de9be8f4ff9c7137c186753462670a5b93457dfd034ad5d1f4d2507ac95cc149c2a042fa5324220b58702a56b09d91de40151c9
diff --git a/sys-apps/systemd-tmpfiles/systemd-tmpfiles-246.ebuild b/sys-apps/systemd-tmpfiles/systemd-tmpfiles-246.ebuild
index 74e8fd428879..d5f47ffac79e 100644
--- a/sys-apps/systemd-tmpfiles/systemd-tmpfiles-246.ebuild
+++ b/sys-apps/systemd-tmpfiles/systemd-tmpfiles-246.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/systemd/systemd/archive/v${PV}.tar.gz -> systemd-${P
 
 LICENSE="BSD-2 GPL-2 LGPL-2.1 MIT public-domain"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ppc ppc64 ~riscv ~s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ppc ppc64 ~riscv ~s390 sparc x86"
 IUSE="selinux test"
 RESTRICT="!test? ( test )"
 
@@ -38,8 +38,8 @@ BDEPEND="
 	dev-libs/libxslt:0
 	dev-util/gperf
 	>=dev-util/meson-0.46
-	>=dev-util/intltool-0.50
 	>=sys-apps/coreutils-8.16
+	sys-devel/gettext
 	sys-devel/m4
 	virtual/pkgconfig
 "
diff --git a/sys-apps/systemd-tmpfiles/systemd-tmpfiles-248.3.ebuild b/sys-apps/systemd-tmpfiles/systemd-tmpfiles-248.3.ebuild
index 5f813cc32f81..9b9579d77a8f 100644
--- a/sys-apps/systemd-tmpfiles/systemd-tmpfiles-248.3.ebuild
+++ b/sys-apps/systemd-tmpfiles/systemd-tmpfiles-248.3.ebuild
@@ -20,7 +20,7 @@ SRC_URI="https://github.com/systemd/${MY_PN}/archive/v${PV}.tar.gz -> ${MY_PN}-$
 
 LICENSE="BSD-2 GPL-2 LGPL-2.1 MIT public-domain"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 IUSE="selinux test"
 RESTRICT="!test? ( test )"
 
@@ -44,8 +44,8 @@ BDEPEND="
 	dev-libs/libxslt:0
 	dev-util/gperf
 	>=dev-util/meson-0.46
-	>=dev-util/intltool-0.50
 	>=sys-apps/coreutils-8.16
+	sys-devel/gettext
 	sys-devel/m4
 	virtual/pkgconfig
 "
diff --git a/sys-apps/systemd/Manifest b/sys-apps/systemd/Manifest
index 01492d88ac40..b3fc8ad7e8fd 100644
--- a/sys-apps/systemd/Manifest
+++ b/sys-apps/systemd/Manifest
@@ -4,9 +4,9 @@ AUX gentoo-pam.patch 974 BLAKE2B 48e292bd37a32709e459c41b04fdf8dc0e51962cb72896b
 AUX gentoo-systemctl-disable-sysv-sync-r1.patch 821 BLAKE2B f5ef796725e023bb1ed83b34a3e4d45bb008de9a134892a5321b37b56809c7a44530d18e33c7877177e8b64b2d89dfc2de844bed433db6d5e57831d20fbfb456 SHA512 8d697dbd305f6b95a4ddc47cf9d99a0e954f54e161bd59164917b62a78ff5c23fa2d5be2614569c0a2297595dae59e1ee71bb04da72cbe0c0807e1abd7da974d
 AUX nsswitch.conf 734 BLAKE2B 5f5a7821a84f6c8aa31fe9a68c29a1a0f24be578d427a623f14a9ef795e7da481f226efe5511d92932b5edf5638fa719808a0c3a0b8fd340799dd6bcb703a0a1 SHA512 dcbd51dacaaebdff32edb3840cc7b9b47b6521009b8786690e3673a2e78bc60bfd8e591b1048c5d452117c6659b9917ae2864462f5057cc39b704b0130522e60
 AUX systemd-user.pam 122 BLAKE2B cccc07cab47dfc0481438e503c34fa1a0b2c6b1f8ab282197719a523421d2a526f19230bb459e0347cbeb2046e35a407c78178a3fb5b79619e987cbc4ac7d5e4 SHA512 c5437677ff00fbb45798fe594e8d61b1c2bfc2d103105d7bd82e476240452477ac263700800f5d0ba91ddc895eb85f4517d5cb15c80611ec1680a686d47cd781
-DIST systemd-249-rc3.tar.gz 10580191 BLAKE2B 137aa9a736b9c38dd075db536bbb9cb9de122dcefa7f422f53847e22d1e42daa21fda9bdb364e92851090115e1b54dfd3d528ea0a959ffd3cbcae7509992b580 SHA512 137835faaaffe843330b24b8c6ce589fad1981e08056b8c58dbd68f7586e984a515880c5e917013b184c5382eacbb180c9a4a9a83bd4861b1eb2d69115cfacac
+DIST systemd-249.tar.gz 10588828 BLAKE2B f7896dea0bdec25125188b94ee84270b972649b1eb16599bed1967ced79f62dbfd1494e22362934f418823c054b342fb24dc57706b49520814beb95b6956bf27 SHA512 0810d09cc32e4aaa4425ee5b7ddf129262b061ce159cbd43571fabda48285243d8f80b566379ece9215d531b9407ee45e1e72c71935644fea31c7bca1bbf540c
 DIST systemd-stable-248.3.tar.gz 10320940 BLAKE2B 725494e0197dd182de55e4967088f4b4b709e6b2242723368b6cd95606582e01a57322b1f18fa194149055140a90993696734ad3c004843bfaceb72cd04a3a84 SHA512 8e7ff0d5e63cc933e4dc23f7e0bef9707fde90396605eb8822d34de90d7abe8fd37e5739e33b657868218aa7281147cc944c096c007324c3e6fb54d833a83485
-EBUILD systemd-248.3-r1.ebuild 15199 BLAKE2B 9b9803595b04d9b1cb43f4e0bacd6f42b51c371d4d0e554aec40f3cf33006cc6863039dbd00d7a8672990e9074ad674c41b371240589c4108a259ec4911c3037 SHA512 94747763be930f606395c933a0050ff46d6996c75cf8acff4fe728efe1e5b1156754e04dab2572763154ea62f60d98d3d526f548af5f5451828122db92c6e24a
-EBUILD systemd-249_rc3.ebuild 14879 BLAKE2B 40d794320467f5a82b19186d178637621410b3b6895b635b15056cc80ab9fb981eb2b9cac646fc6a7838dd4903b68d6473b39f71b8b8b34f20a71302cb3e39f6 SHA512 a398fbebf7be6625fa5c5025660787fefe978ff6166b16020df99f05e8a1a5e233760ea0d67b43ec321819dfdf14b39accffbb115d2b07bfaa96ecffd2c726cf
-EBUILD systemd-9999.ebuild 14878 BLAKE2B d3c9b5a208993f8ebdbb111f5d99a1781f54e4cd1de27b95fc81a0b7a982ebd5593dc8dfab651067dd4aed7b3be1868bc71f454cfe50c6a5c9556ba28006f324 SHA512 7835f35a23c59a51903b23528b20b98bb7b973dbda7c4dc98e1fc9f38fda18043e55e71892987279fe2f84dd4b3e88f36d66ee53f9801afd381505a90c203be7
+EBUILD systemd-248.3-r1.ebuild 15192 BLAKE2B 799a00c488d832569392e3f6fdfd95abb529122b6084b392a8eeefbbb2b21a58d2e96439fbf33ab97b78792a412a28ffe49194b8cd249d282e8af1826a265752 SHA512 0abc8db451e49093ca9e352a0da22b33130df0bbf219a87ce2323dbb8b08d87c5e4546da76b3cc158f9ea3d56eab847a58b118bcda93902487d8000b73485f62
+EBUILD systemd-249.ebuild 14857 BLAKE2B adb4a4628071b11408d5430eb2d6c6e632589d56f68bea0d9c98475fe51336944bb5c1ad9796b95a4d326ab00491917dc28079a922b6c859123bc1e7463da6fc SHA512 a38d4cdbfbc4a524057dbd13dfdb5ce5bdb1c6b607ad25832fa3dae47ef63536683c11327d3fa7287d6544a9003fd1b725cf150822f5e7b041c0e5e74577e188
+EBUILD systemd-9999.ebuild 14857 BLAKE2B adb4a4628071b11408d5430eb2d6c6e632589d56f68bea0d9c98475fe51336944bb5c1ad9796b95a4d326ab00491917dc28079a922b6c859123bc1e7463da6fc SHA512 a38d4cdbfbc4a524057dbd13dfdb5ce5bdb1c6b607ad25832fa3dae47ef63536683c11327d3fa7287d6544a9003fd1b725cf150822f5e7b041c0e5e74577e188
 MISC metadata.xml 2418 BLAKE2B bec7b05950f495cd678359bca70723286c33d4943407fee45e1214a53d9bfbbb25d3612a5b1bb51d885c38ea63719b3de2f0341d2b8aeb5d5919a29459cb89e4 SHA512 46979fbafe3561a722efefeb82e283e221cb930e56e9f43c25a47c299712dac21f6ef4c970afed86cb390e21dc8dd86b23eea310d5dd7e66a7a6fde250b929d7
diff --git a/sys-apps/systemd/systemd-248.3-r1.ebuild b/sys-apps/systemd/systemd-248.3-r1.ebuild
index 190f25f5a2fb..a6e3d207945c 100644
--- a/sys-apps/systemd/systemd-248.3-r1.ebuild
+++ b/sys-apps/systemd/systemd-248.3-r1.ebuild
@@ -142,8 +142,8 @@ BDEPEND="
 	app-arch/xz-utils:0
 	dev-util/gperf
 	>=dev-util/meson-0.46
-	>=dev-util/intltool-0.50
 	>=sys-apps/coreutils-8.16
+	sys-devel/gettext
 	sys-devel/m4
 	virtual/pkgconfig
 	test? ( sys-apps/dbus )
diff --git a/sys-apps/systemd/systemd-249_rc3.ebuild b/sys-apps/systemd/systemd-249.ebuild
index a9e94af56ef5..7b82142e7ac7 100644
--- a/sys-apps/systemd/systemd-249_rc3.ebuild
+++ b/sys-apps/systemd/systemd-249.ebuild
@@ -16,7 +16,7 @@ else
 	MY_P=${MY_PN}-${MY_PV}
 	S=${WORKDIR}/${MY_P}
 	SRC_URI="https://github.com/systemd/${MY_PN}/archive/v${MY_PV}/${MY_P}.tar.gz"
-	#KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
 fi
 
 PYTHON_COMPAT=( python3_{7..9} )
@@ -142,9 +142,8 @@ BDEPEND="
 	app-arch/xz-utils:0
 	dev-util/gperf
 	>=dev-util/meson-0.46
-	>=dev-util/intltool-0.50
 	>=sys-apps/coreutils-8.16
-	sys-devel/m4
+	sys-devel/gettext
 	virtual/pkgconfig
 	test? ( sys-apps/dbus )
 	app-text/docbook-xml-dtd:4.2
diff --git a/sys-apps/systemd/systemd-9999.ebuild b/sys-apps/systemd/systemd-9999.ebuild
index a8e7949b207b..7b82142e7ac7 100644
--- a/sys-apps/systemd/systemd-9999.ebuild
+++ b/sys-apps/systemd/systemd-9999.ebuild
@@ -142,9 +142,8 @@ BDEPEND="
 	app-arch/xz-utils:0
 	dev-util/gperf
 	>=dev-util/meson-0.46
-	>=dev-util/intltool-0.50
 	>=sys-apps/coreutils-8.16
-	sys-devel/m4
+	sys-devel/gettext
 	virtual/pkgconfig
 	test? ( sys-apps/dbus )
 	app-text/docbook-xml-dtd:4.2
diff --git a/sys-apps/the_silver_searcher/Manifest b/sys-apps/the_silver_searcher/Manifest
index c6c7c19e6793..9a5411b11b5f 100644
--- a/sys-apps/the_silver_searcher/Manifest
+++ b/sys-apps/the_silver_searcher/Manifest
@@ -3,5 +3,5 @@ AUX the_silver_searcher-fno-common.patch 3785 BLAKE2B 860a2ee021e29e3c1729363a57
 DIST the_silver_searcher-2.2.0.tar.gz 163686 BLAKE2B ca81f701336ff463b6dc783ac8bc615a05e048c35b653a80c3fb74b053bb71f4822990b699a9e3741c7ffdd2581b65faa5439824189a9d8e36025d248201f814 SHA512 b635165fa3259475027986dd49c0786545cc2e3037695aec70f6ee54eaa768ab0e25af78d4bfd3754c4eb8352464cebf64324ed4a68a4b3de60a6889473da26e
 DIST the_silver_searcher-2.2.0_p20201217.tar.gz 165236 BLAKE2B eaf5e657b33d463048a83e08a90588448cb2fcd481b1f7f869e82c5e1ae1168a10dacb0d549dcc4acafb4323c96a9b67ff9e58de85f80bd2bd7e209ddc5ca6fa SHA512 96bc8da8ba10034bbb646bac71d479a21a68793e8af5377481da72c8dfa49ac99a1540c2b4193c4a95167127f1caa48fbd611ba367b8279bd2115549b6d8d126
 EBUILD the_silver_searcher-2.2.0.ebuild 1047 BLAKE2B 546d64df5130376827e3556a4c1ab8487d1c580f21682c4d0e954cff92d186f154d0f156cec508f65e7d77170230ce7cda7ca8128a4c62c8f59c3594d09b9950 SHA512 d0c7ccc383ea8ca8da7a81071106d6d9b2948292b65e3685406b1502fb16d6fec04527fb0887e6d9b97dc824e86358353173dbd06f03ed384794250f18ee89fa
-EBUILD the_silver_searcher-2.2.0_p20201217.ebuild 1086 BLAKE2B b4ee6367e752efd1256043f0fe8424fc27a8c2b9ff0cebf5279bc762ac8bfee08a52981a023168b0cec57482d4091b6a19fe40e58d2bd1875267dea5bb0eea9b SHA512 57b447da01d78940a1ab76e99b2783cde3a48a1d8ed09b72faf73b1e906ab6cb2184f563aa335edd1cff917eaf13eea50af10f8cd4a8766e9ffa5a2416e85191
+EBUILD the_silver_searcher-2.2.0_p20201217-r1.ebuild 1190 BLAKE2B e94c1495fc3ad22856544ad4949172ee5b6b369e7d565d216dd7a360d30f0c7d206f8b340f65d632bdffd0c9c8c70eb7e2e2b09de3edd2fad82ac1c2459406f5 SHA512 a84377c6d4cd8fca6a9595690fc3590e9c55a218df7b8e98015a8a0bc14dd9fe84068d1bef01f00e983d77b168ef74dcd5544c11afbe9c681961c52a579c516f
 MISC metadata.xml 343 BLAKE2B 21afa71f55c3a250d73910c6f8a96fcb5164b921758c8969b8fad8ac95e45f86d114742738d6f6f192a33be057b28440390b52719ee71755c3ba04a4f1a0cc0d SHA512 a2dd33c75fde978e49227132e7579e8c3d3b77989228f34f43e5611fafb6999320991f4bdb683426a30595771d2afebc5487487b890a9f399df086fe3946a39b
diff --git a/sys-apps/the_silver_searcher/the_silver_searcher-2.2.0_p20201217.ebuild b/sys-apps/the_silver_searcher/the_silver_searcher-2.2.0_p20201217-r1.ebuild
index d91cc784c825..fc7e2d49571b 100644
--- a/sys-apps/the_silver_searcher/the_silver_searcher-2.2.0_p20201217.ebuild
+++ b/sys-apps/the_silver_searcher/the_silver_searcher-2.2.0_p20201217-r1.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-inherit autotools bash-completion-r1 vcs-snapshot
+inherit autotools bash-completion-r1 flag-o-matic vcs-snapshot
 
 COMMIT="a61f1780b64266587e7bc30f0f5f71c6cca97c0f"
 
@@ -40,6 +40,10 @@ src_prepare() {
 }
 
 src_configure() {
+	# false positive TEXTRELs on riscv
+	# https://bugs.gentoo.org/797355
+	append-flags -fPIC
+
 	econf \
 		$(use_enable lzma) \
 		$(use_enable zlib)