gentoo resync : 25.04.2020

5 files changed, 147 insertions, 144 deletions

diff --git a/app-crypt/nitrocli/Manifest b/app-crypt/nitrocli/Manifest
index 5d0800e3bcda..a0aa70aa45a6 100644
--- a/app-crypt/nitrocli/Manifest
+++ b/app-crypt/nitrocli/Manifest
@@ -1,58 +1,59 @@
-DIST aho-corasick-0.6.9.crate 25979 BLAKE2B a1bbec11c322d20d435d8683151b144e31f04b07ca47fc1c8128464533256f4004c8d346fe59a1e1c41be5609fdf768fad5f1afa5df94d1a02ced5c4f02c4bac SHA512 8dfc817b435d8a44fb4ca79bb20e283659c2fe9a75a4892389958f5880acc436bbe32552098429f15585ee025d064fdb5806b814f0e9d67a4261ffd23852172b
+DIST aho-corasick-0.7.10.crate 111039 BLAKE2B 69f984dbe528ece5ce4345bc0f39c122507a88e781d7c2d5c9175d1788aeef8d21e0487c7c449e28fbbdaae8203fe68627d23ac0a58d30dc70befd26ac9af32f SHA512 e8a1cb252015435009883662ca23408f1491d8f01461f3a81082feabeeff72ec61beb4f1f3271fc8a87f1379899ecfc38036ac208dca17889f70ddaca2406a9b
 DIST aho-corasick-0.7.6.crate 108953 BLAKE2B d713366d0783e1ffbe65408e4d38ef9f12276f61043c768265de5d47e446a378306096a70252c9a49a6e7d3b97a09f30405a3d8df6b40dc2dfeb7407ed574c95 SHA512 120aa28e72279f561d7f51657aa0800dd46504cd92f758f848284e5f3695be6f5e24056a66b0f2d971c527277e92ae938e2357ade37b5cbe1c93913a5dc308b1
 DIST argparse-0.2.2.crate 19440 BLAKE2B 7b15b2072ff52149bc08c5d02a266f2eef78a3aa8844e49154cf2ae1a9cb960ddc2a96a065b4aa44637aca8216211f2965291364d9f06ff6f68524a1f15dfed9 SHA512 97691566d3adc6f6be1c00cdca48424fd3576c372d1c995e7e31658bd20e17ef13553f7de21968ba189fd812928aeb93ef0fa89fe2fd258f45a0a8e095783706
 DIST base32-0.4.0.crate 7791 BLAKE2B 6e457d08f6fe17159b0231b62774d2c366c623b07c7b37196edb8f33b886cdf7affece70afae6dd0b64fc4d2be10d3a01f2f0b81ed12d5c5e1cf50d39c80e68b SHA512 4c999f2fcded06d803471d08b8d9e42512a85f81974388afb3d5b450c86e5ea60e7b1fdaccc49b1e0346663827408f847e897523955edcaf397f20fe97038345
-DIST bitflags-1.0.4.crate 15282 BLAKE2B 63f5feb47460c344983cef8822804b1c4ac2f3adfffcf206df2b05fafb9c7bfd73986721cde46705a3e4a0dc72a40683e4d369f2339adfc1b55208bad1766875 SHA512 81850d2be62eabb8486024ab263da67e6eb8ebfa732cac3a5d46a9186c564b2065cba15fa3da468bbd26eaf2b67038680e5de19d5dd99d78f60dae8a1776c8de
-DIST cc-1.0.37.crate 44499 BLAKE2B d12551225fc4e20691a09fecc8a2a487090ce10ad7fe64b385cf54b74a124cf737aa31966f82d9a68e1a932dccb4ec495eb32cdb4dc808c985384fd0fa4b6950 SHA512 85cf4679d16df14a815563c459227ae85206eb79826099fcbd5f602fdfdc052f36237916a842d65d9a5ab57c559c18e645bb219422d85aa3690c11c0a8dcc92c
+DIST bitflags-1.2.1.crate 16745 BLAKE2B 0fa6d3ce44aad7616d5cd02aad8c1d0b0fed4022650eb43067c4a72e6fc88da05442674fa51826e4858a47c9de233e1ba2229820af094197cd11bb416ceffb2b SHA512 ad89b3798845e23737a620bba581c2ff1ff3e15bac12555c765e201d2c0b90ecea0cdbc5b5b1a3fa9858c385e8e041f8226f5acfae5bbbe9925643fff2bf3f0b
 DIST cc-1.0.48.crate 49885 BLAKE2B 98bc13fca4b9b39f61916c4cc6a0e4123f5805263a633dd329e0c943d6a3dc8e0572d5b382d61e207ef0e7ca96a66e4720fb7f1a817fd61b1ed842ecf09f5f08 SHA512 4392c4455195dabfefc920e3692dc41fc763f7ca9e7163be395d7acefdcd1cf4f5e7a2356a9d8be367d43cb3e4320ad8e7513e5532118a418cd38e98748fe165
+DIST cc-1.0.50.crate 49792 BLAKE2B 25ec14fd42536c381babcf697cf96fe8be61417a61ba5875a2461bb40bf3ffd9c9d03e1d9df83e2dabfc9472de3db97b08fdffb710e89b868a5e115d0463a9cd SHA512 34a721d9352f8b59cffb8cc0b9c520b972b65d6c23e83d9c6f6e88d6a6845c53ec89350a4aacd0444a5d6b03b867b97aedaf418b483afead209a7ae6d3885f5d
 DIST cfg-if-0.1.10.crate 7933 BLAKE2B 063a96ed176f34f788666b40adc483d147fc011dee941ab60569ddd0e57502b5dd06ed71090f4e14ce005d06e240500a286f74652615e9d068fba649610d8cf8 SHA512 9d22616bfb4a75770a828a0a3cddac6787297a5fdc53eb17e25811cc94de717f2de8bd66d53c5d65ba1c83d8892aefee5ae758cf56a1ef0a0c3120f70b244339
-DIST cfg-if-0.1.6.crate 7411 BLAKE2B 0a19f5afaa89acfa7877e06e747c1e73af8b8a9886c97a803fc3d61d075b43f3fee6089c67ed28efe70aaf4082fc21dd5b24ea514fb1d761ba3d939dad496fee SHA512 e393816f659bb5b1e64ebc72a4b6e3e673afd00cba302c3c92c6f2e98db341a29197f6cf413107e569175a86aad85e74a93e2cd3a9fa9fa2d1b70b01c3fcf378
-DIST cloudabi-0.0.3.crate 22156 BLAKE2B e12054fd474754031f8f5038d5e2829e1586db974d38230cfd8774db591a58dfdcaea9fb61fc0b35366889d348b2c73ceaabbb462f1abeeffeaab167013c986f SHA512 691ed793e9b35ba382f03897f4c0efc31a528394862a27b814ba8993ad30bbe0ebc9808484baf580e8b69d9c13ad1612776a1efd0f6981545b420139ff83592c
-DIST fuchsia-cprng-0.1.1.crate 2950 BLAKE2B 8519407ab5d1f04d03cc946a07050db4dd7bc70e03894e35b9e66910a3be11224084a86ba45103fdec845e94b7ba4defbd7c5217b035a0796c0c4a94b9562cd7 SHA512 ea9f5beb0dfcb023c22cfc2b37ce52dfcf3a2cbbed0f79ffffc332878858386805c65dce8469a431002367562d857a6c064e075688540c27fcb4056a110059d2
+DIST clap-2.33.0.crate 196458 BLAKE2B 3bb62d817afc77b421a6282746b9b61367d224de6b614c7ed66bde452ce1046728077dab3368a46635b5c74d82ba3196586d87c0201478ce5b89638910dadb1a SHA512 f1075031414d48e4340bfe308904a95a31b72460724773c52a0bc8c004e625a04c904a39fc5420cb8c26a633321f9b5f4f69019c7aae5ed89900b63ed8c21a91
 DIST getrandom-0.1.13.crate 24581 BLAKE2B a61df4369526f860eef6952a021c3f473562cc4171c373c105d8944c305370592cd98a6c28cc0f8d00496f6b47cb900a4498dad942d0b6f60b4d8163d8904f14 SHA512 534b01d28bc9e69a5ad1e84f34aa4154939c27d70c5f557f15e669fa8894c375486ee945a6a6d8adaf1b6b7accda0e24963f70e77dd51ee0638a6ae6daa38925
-DIST lazy_static-1.2.0.crate 10840 BLAKE2B ab0adcf0421131ddd35e95a31a0053e2ffccb03dfc0f46ca4bbb6341f40bdd56d01aed0987489e5e73aa5f7289f3c323d1de0db353a30bb0a75acf53ce8436f8 SHA512 0d80334da99292d68fb2ea9879540676fd45788547b7170b6df1b0a606c1645a07188837f9414196eb44ac63010a3c84fe5c4319478f6fc2cef837295a255edc
+DIST getrandom-0.1.14.crate 24698 BLAKE2B 8139227951eb65cc2bb7bba29291c0e8ff0b8d9a8e2d7eabb01682d1683c989c44b6195952ec7d087c338538c1d6858c45514822625266e0996829e8c50f3d17 SHA512 b5cb78ae81f31fffd7d720f9ea2b5917b4eac103711faf656a3a3fdd24ae5a2e671016d39309cdd11f902de919187311401dd8fe9e6ed68c29b83987de77c957
+DIST heck-0.3.1.crate 54666 BLAKE2B 99f7ceb44ea6af445749989730ce1e14156018ff046a136be2e6474b285088e1d90d6f8af9352affbbde5bac7e5a32971dd99f249f968105e9793b7de76def07 SHA512 134722192c46fd64b38d2fbec3a2511c560916e906491a72c4ec9d99b9f716dc58942fb99cac99b9a6ef2de5b5ad1d1c1155f292d091401b6873347d80c086d6
 DIST lazy_static-1.4.0.crate 10443 BLAKE2B 25b2e61bbac48f0dcbc79c81d7bf01f2403d8269ecb6be3ea6147bd00f7a588df15a91f44dfc18ada19b21faa71de4637c7d493a8628cbecd0e547d74e616a23 SHA512 e124c0521ec7c950f3c4a066821918da7a9c6e711115d98009ae7c351928fdddead852e7596fea5937a9c30e4e4ce8eee7099b20248b5d6e3b2494b6a6d88cb8
-DIST libc-0.2.57.crate 408902 BLAKE2B 5c84f490037b5e108400f710da79f5471d5f76c384641bbcb721aee21da84e6a2b523487dbf5984b746d070d23c449968ed546e0bfcdfa961dfd57bfb2f3dce6 SHA512 8f210c0e28d647cd2911ad2b7d2450b6e8ea3d628c0cc68000109a7bfdd64fa31706ed7e9bda0f71b920b38a3580fce3d53fe49e9cc53b6ab9e3aeb2eae0cb8e
 DIST libc-0.2.66.crate 457815 BLAKE2B 5da379ea738b75189e106d4be821c999394043303b8bb6a9caecdb1b53e449f11a58edc4589193611b76e7baf00e155ba1077bcca4d0cfae30826e946a0075f0 SHA512 5bf5645a7cbe626108cd71e1d189286ed161fcd3ea12cd34f4e392be4cf93bf78feb6128b1101bedc41a71091398f26771f3efd3880f779ee0be00f706914975
-DIST memchr-2.1.3.crate 20069 BLAKE2B 6afd95538abae42fdb22b82964b64657555734f2505e12c650f844b91d60a3f6f61277065e15289b6e6b7ef8ae5345674ce7465ce2320822e13734949ddcd49c SHA512 95fca57233f023191da0c0abf4835c63ca38404b05c2021e1fcb910068c29321e0b89660088e1be432ed8aea2c4d53f14587e08dba0b258892f2e608606b3b57
+DIST libc-0.2.69.crate 472393 BLAKE2B 41a9cd242ccc994c69da10f091061b2c31ed6a9c52cadb8e82fc7c5b7b5dd61c81ded5cfded098721500c87b021d5d79766571a7dd6fcde319c826e2e4244d38 SHA512 2addfd505e0904e18a600caa4e695536d2f95292af25906925066616bd588de9ea9abaae45bc8427bc6857c3b9fb6c4288e4cb48e3f1ba69ee1d7be8f3b3bcb6
 DIST memchr-2.2.1.crate 20862 BLAKE2B 79c8b7772f6c4e76ef98e416cab1a87648fe1f78f77eb31a894a2b1611fcf2d8336e361ab3d692cd03579b33f6bc5adb20d42418475dac5441b8bf356e38e442 SHA512 0f5e11507a4235edaa8ef639753abf62f1c187c8c6e35b0c80c9306958e41893492d4995e28bf28e5710e8739c7e75bb75a515507ec87870741a3b426ba8f44d
-DIST nitrocli-0.2.4.crate 63798 BLAKE2B 64a4998f9b232993692f85ca3890ecdd20e1027dee61b6f31f06be459a02f11a3cff2c035aa462ee5ea1d680f9e201e25cffdd4ca8d54de80c13d78d9a877fa4 SHA512 cf10287591d55378956118a213e4f9752087be37c67d4c89f7660f51c98dbbf3a877afaf11af7625d3776bdf2c7944b25637873af70119d514f2be93131f9733
-DIST nitrocli-0.3.0.crate 68465 BLAKE2B e5534634c090649a818c2b6015e1f9167b26749dccfe48e6ef8c2d7803b1bad9cffcaa1ee3de48a1a04356fe57d5ed6f77ce678ddc75b9a3feadbbcd705d2e8f SHA512 6280d8e7c34ad162e481f0eb2763280193a5b76d871186ebd776033a60a9139f9b436f33061d2bef6467eabb47eb62666c9cf3ddb83290ba2883dfb06ca85e9d
+DIST memchr-2.3.3.crate 22566 BLAKE2B f952070b98ef30f0d2780a6efbeb36d295710734f678517d913a8002cafebbd3cfc38975fc4546d306efc11bc815764d14320af3b7a2360bd46fc2ab3db9efa5 SHA512 922e05da920d0d94226857788878ee5e31518cd80d95ae57e1d7ecd233942c37d01565525db2f1dfdfd5b3b1f81b2c73eee058cbfd745cb4e1519518318df248
 DIST nitrocli-0.3.1.crate 67983 BLAKE2B 196076079b837f9fd622b0ca0ee63575cbe0a0e317321691472df489cea5b97e472477048a44dc46d5024c1882c1e8ad3305c95ce9e6da91412cf3f6c03737cd SHA512 4e4099400175115cd5304a2f135ec497d0fa3d74a2d19ceb1634b2d921d38f54cc5404ab4de31a511a0f2967ffff355ce34236ed3a3530a16e8e86b9d009fe83
-DIST nitrokey-0.3.4.crate 27462 BLAKE2B 07412e0d3d98a0fcaa54be3d494b107a0a4d999da41dc39f8710a5eb845911d175ca15918e212a1025a34e3ddfff89b5ca4a138d66effd47b639afcb19572ca4 SHA512 abb43ca94b7d4ba55cfabce56b712c99bc4e50671149ae2001de77c2cfae25f17465130729a4a856005a692b846c67b54b2992e41b708e8ad94a8c3af0843e20
-DIST nitrokey-0.3.5.crate 27340 BLAKE2B 6a799f841fa5be1291bfaa071f6fe6072983ad1fd57bcbfefba588ec9c340429cfcb6502e898d8dc2b2a2bcb7bf1afd2aebbc98dae579300d4d636e0603d9023 SHA512 c61b10ff423c16e4cc0f7084900513256ff017f579edc8dd49148bd7b5ab8a7cec93e070e2c21b1ff6a7a0c7775f4f40144a92dd498e7fea6e4e45ef10845ac3
+DIST nitrocli-0.3.2.crate 88594 BLAKE2B 8bbc50222724b674e2f76b6b945bf82fc86e4c7bfaa78eaa5806db69db3c324c9ab432f83425caa67a4e7ee275cf6404e9ed2d9ca9243ac05de53612333b5098 SHA512 48ee29dcadab938546bdb9c5d5a053e88d0860d6be6f27292db53fe304d32597a6c415fd61a1c69755e4f60b192a527de99fb603afb27b762a377e2a01bc0d9b
+DIST nitrocli-0.3.3.crate 89987 BLAKE2B bafa15d8d696d5899ac7d1a9af907d77e6ecf62cf09f7a9af5b01a9947926eb1544f2862322d912e283869067bea722e99693513d30ee367809de69ea54c32e2 SHA512 9bc58ea6d1d60985a0f7a8e07eef6a620805be6fc0284c8a43ecfede69e0421c40716812896609cb8516855900f8ed6017c4e693b5be422b00701b0c2437779a
 DIST nitrokey-0.4.0.crate 34431 BLAKE2B 97e5de4f53beabb90ca00685bc62cce152d320bde7092a2a1b911a00a6d6a4bd2bedf5e93e584fd268b119de6626f499ad75c01c715d840be84a94965b90c450 SHA512 b84440bf8624848be5db7c2547d30ebdc9d8bbc8ad09a8809a1a05104f6cb2efe8f5ebd9abd9825ad5028aa474ab556a83836ce4390e650484e0ed1e73543c3c
-DIST nitrokey-sys-3.4.3.crate 61875 BLAKE2B 8c2abf91a40f54907f225c21df9d1e40ac22022a3b8229a8bd6c7a5cb8f87df74675ed5eadf6441bc81025e0cf3ebb21d8301004fe1fc76799e11568317bbf0e SHA512 ae69bc8d3fd0a58224ecfaacd159fbab4f7686daaecd96480a6c824ffbd22a8d2c948c5b2c803fa20ae41adfd4334c6462335f5d02dd7acbae0ab19b33cf0a3b
+DIST nitrokey-0.6.0.crate 42218 BLAKE2B 09410ae8c5bbfd76b216e4ab6c1156dbc3840e9d0f09ab5727ef91bc54b58aab22bb3b54c42f5bc6a9e95936de8c2424449ed61d7cfd4a52ceb749eb6fa4306b SHA512 924c40ad43296538a49f58051d7fa72f6df2ebbeac4b91e416a9e2b017e60b867827352bab0975d1ed5828052572b719b7caf419ec611323b0b5fb8319d0d9e3
 DIST nitrokey-sys-3.5.0.crate 69014 BLAKE2B 61b036749f4c990c9f5575d464016ac4c2058ae81067dcfdefb49e70cc9702671ffe3e952848f24aaee475243208cfeb4bfb52dc5210b5b8db8d53124871378c SHA512 c7b5db1cd9d14dc46e2de6c47007da01ba9d242b0378490fd9c03b7e9ff18dbaea1e756b0731a7920cfae9be12f86b62e7219f8b380ac6dbdd0cfbe362fd72c5
-DIST nitrokey-test-0.1.1.crate 8044 BLAKE2B de775515a73a500d3c37a58431c14a1cb6d2f715808c855466b78373f983b948b9e257f03fbcb16729a3f17a3f930ddf3eaac913955286e27e0b27f573659d04 SHA512 4dfbc79e64ed77f58599bc570b126f7975e614de07fa30b3c7da421bf184fbf059f401da42110b14eae5a953599e3875430cd4f0e117df5ce9bd03a753026cec
 DIST nitrokey-test-0.3.2.crate 21714 BLAKE2B fc56914efde9fc25cbe04d8e69401b3bf1e231f80dae73a13e760616bf1aea92b9988efcdbede760b88747b4e33103405ad4c5e54597e8a23cc82aad08e4db60 SHA512 fbc2b00d7556244e880b3bf340bbb5bc19e3411f966d4474a661d5e78979a8eb9b02becfb528f026caa03eee658a715314d0e487fd3e0b2338ac489585a6fdf9
 DIST nitrokey-test-state-0.1.0.crate 14022 BLAKE2B 786a5dbbbbdc8043ab3fbdfe2b1f2e975c1b98558e828b47bc6ed210b1f4e053233b38dc12491d3256710863a20cd24ab404aff7b7a33789361e5304ccf87c71 SHA512 7d11336e50cdadb9d401a83def544c8aaca9cba5e85f7ecf3d1e94042c646dc39a4f4a17f9cdb1d14ae74b6bc1cf5f9ec2f1acb299c63d949f488fb5325b7580
-DIST proc-macro2-0.4.26.crate 33854 BLAKE2B 833db134470a8f12342248c514b08463836ea22eec90162ba96364686e593e3048fe16de669316d88ed5f44b27f948613cf98f4952d49f6b5f37f2da51584c2d SHA512 e35ce0e0a05559417475abc402ef88e6214d7f27ee6cff35577077c5334ec7c6dd5d1d8099f25617391cd4fd2f54838a16ae74039ea6f99ea1d2f0ef58dec010
+DIST proc-macro-error-0.4.12.crate 21979 BLAKE2B ccd12d75d8381dfaa15ae1a8f3c820a46e47ef34c49b6f21ca0df77a1e3e5d83b93b0c9d9c99485df6fd35d362b4df76dda222bf80f05ec42593161491b196b3 SHA512 3ba24e96100f859adfc67c25e98c0ded94c5e08e313fbaa0222e9ecc7860219c61dcfc4e0671ace0e684319a43b8b3a92918353fb7d1ade2ced5b01fc45552f7
+DIST proc-macro-error-1.0.2.crate 23699 BLAKE2B 2d8310300002d1dc3fa68391190c5536e1faf6be05f1dd2ed1429d530dc527f431bdb93a994f2e68ff6120523b0d10a4a2ab35a0703f3013b404d0b82ab68372 SHA512 a9ec65c02f853f05f6adbfd398a82e84dac5bc376f041ede65a47b510914f5def1ae480c1a7e68aa6fab836efb6bda0d712d45243472b73c12d1ce7cdf8c3583
+DIST proc-macro-error-attr-0.4.12.crate 6934 BLAKE2B ff7431bfe63ac865ed4facc2b86764179630a98b1949e8c45d4a739d7e7fef2a16919afed749bc3dfce8de4ee0b365ea5fa548d64fceefe0f2b418d4c5135854 SHA512 5927a8ec73e062e836403d9beb98de443a813615538855e40f574e7a82977d55466db191660f97d863efa7a3643ad6e2724759221ee30553b805c9cb7f5849fa
+DIST proc-macro-error-attr-1.0.2.crate 6974 BLAKE2B 4b8fb0c70873eb487dbfbcd37d5a5dae6d877a910f3523d9985a511ea97795082548f03bef926ca91028340dada954217926e7b9d8cc70765343f6d86c1e7c01 SHA512 1fe7ea1e005ab4d6b777b2caa4a5c2ad7655b5375fa987b0b2cfbec6a0673d844aee2dc273dd327687dcdf21a165261e78175eed69e881dfbe1f2992eb505c78
+DIST proc-macro2-1.0.10.crate 35622 BLAKE2B ebd141862796e8f0660608ef884ace446fa5158ed1a3f3491f5e5d4ab6b866f19652fe6ccce4432b3bcdbe5467d0a59af688c00fb97249045bf5a2bb5511f2f6 SHA512 a40e6422c26cb8171e5f2d9d7d3b4b2d99a444ff650a8dd8e22bbc7103bf3f9247fc2b2b57ff7da4ce65fb1d293f55c5ef56a5f60ecb5122991d9d2002395eef
 DIST proc-macro2-1.0.7.crate 35588 BLAKE2B 8d9b4c1f73c0959a77ac4b5839cf8b1a12259ef83c17fafd773a81518cf3750b43bb05df83719f2966afd5a71982b4a681d76692b93941127a52459990d3a281 SHA512 282514c6d052896130c83f632962a54f6310bea35b5418b41bdb540e51fad73d91bdb1c5e9f83dbd265c1f3d0fc67cd119db5483b5697e34b1598735ea9246b3
-DIST quote-0.6.11.crate 17283 BLAKE2B 04fa278094e505b806324d572154755d2696a6248ec6afb3aa5ea97ec2556e5b845cec3da1089ca321681591c0ca417caee1d51d7a2b57fc411c3f8270a0aea2 SHA512 5fd4936542eec530bbd33b1ee600746ed5c003eaf31c8aebf910fc1372d5ab91cfb10fbfe2a990a49e5eed88747f99d52cd430b34e0a5cce688094e55eeef4cd
 DIST quote-1.0.2.crate 23023 BLAKE2B 4091809b4fc9b8d0b56be814b127d6ffd7c1507becba85dc905606cbe85f46233dc4b429c1e865e7c7de336cb936d956169ceb5dd45b489b7722022ccf818a3a SHA512 67778dff9dc5c4edcdd6454b74ad9353bb6c0c4e51c16cb82f2e393a7d7a0cde084d3c93279b718a8398c40af0a9377ebfae5321e69e635efd8390c125b75ce4
-DIST rand_core-0.3.1.crate 15483 BLAKE2B 2e09b3b3306514c29bd7588498e79be7353de656d8cdeeb4dfc6a1ad092f15a861c2ac20591ff71f7f60d986de9a09c860de4a9f06799f04e736b31bc70a5fbe SHA512 5a7ae601124502bede760fd3179c2b28059ebc3b5983bfcb6b8fa62fb58df95cedc1aeb2734e792d894dfa4620801c13c29702f9cbee64243121575d4b6b9114
-DIST rand_core-0.4.0.crate 20326 BLAKE2B ff85118d2b5c793e3da37bd4d75032e2d73a87bbba0b4c0c07057c47c67b7e919e5c4458b4c929e3b55f53cd3ae6579be5d434369d307e962c00fb3272862937 SHA512 f80e76dabd3308a12880a9aa8b7be83db39b02778c95bb63f862488789a2a67e2f08d4f2dd1ad803c61df0a9fc7f6620aa753b3bf394542ce27c89189a911845
-DIST rand_core-0.4.2.crate 20243 BLAKE2B 22fee5e44127eee047ad8abcd9dd828befd0feee77ee9a0bcd4dd42174b1e650f2a19f1f3b39fde937e58c17afaabf7231e2aabf214c2eb22edf3f85b73f6eec SHA512 f7ae3b690e2cc1fbf2707ee04b752bc5472433f737ab581f9872f7c5660966bc6be45f0c5d2cd8771105df6d4a9d206c55f5cc6ffc1693b46e1ae03a2883b028
+DIST quote-1.0.3.crate 22939 BLAKE2B c50e47b647fe1ac1930544d20b2b78ad98e6398a32c98460701d93f93fa1437c6d12c632386ab9eb733cbe64cad57e02dd201686885d0a951cb013fc10a95a9c SHA512 b4867554b86d119251db67f9d0949bf8c3cd7c64f006c76531398ebb7478cb93805b9bcafe159d921ba1a32e92773853b56685cff0e1ebdc6aadaefd3b932ef3
 DIST rand_core-0.5.1.crate 21116 BLAKE2B e74791f941a79971f2741172d489d546373c9abcb0dfbffcb7b97b858ec800b2e0c97df4ac636f3aa1b8dd6c14685edf317336d577f31b5c6cb7d89a157e547a SHA512 4f7500b35e165e6c817fdd67a50745d5497d24e554bb554705097e37258751e8755c4d6b8a69fcb5e1977708ba78620bc35d640e4e018fcd4e88d9dbdbebdcbf
-DIST rand_os-0.1.3.crate 18965 BLAKE2B 3cd93b10a46a70e0e3ccaf1fb8ee52230d74b7d790351652a8e39323bf0dcb446d14e9229e13c14a84e93394a22e0a127f50ded11db1df8ffc0a6bd564af63a7 SHA512 01e81a692b78df3b2bd65bc285e5052ccaf208c7d0ace414f251db4fcff7f9ae1502ee60ca5745c95e778d3d5efe15fa84153c17c422b6b6bfee829376c14575
-DIST rdrand-0.4.0.crate 6456 BLAKE2B 330ee64d998a0358f95a3dce50b3e1bbda531a3b613db7e5ba4038a1cf7191b60be3a0f33416e05380c41040704ce52727928915e9d2f4565d39984d1c86fcd6 SHA512 6476275d124bee28747191471e8d8f321a3b1c148c1f2a7ece4175f5244a7de90afe5f99d2eba5244d886b92e38232398864bf90e6d434b09494533942c8d894
-DIST regex-1.1.0.crate 241219 BLAKE2B 37441c1cedfa7fac3904a3a261f618afbdc64e9bcbd9f6913c551ac2cffd454456fce71ae1aefda70cf32d000d990d4e97d9867ffa042abf0e71bdc9df3cbec1 SHA512 f60d9e7c5a8647a1e0d35e995e799335ae695903985cd9f90923ab6483172602e9493005b7c7bd3dee0824de992dcd2f03320d58419206a0d5cfb675c68c4745
 DIST regex-1.3.1.crate 234662 BLAKE2B 41643af1321748db717b37bd4985916afae3a84e19f628ce5d5c194de42620e6b02221083c7e4b35bea5a6749c265575b2c0318dd58ea26b8bcf8d01768e1a27 SHA512 6530767ca2896db30599e5b3e2bf46a785d9c95bda3e530e82c659e5a98345effe5424738fec7545fa5edad12729a396938a9c1dd3a680c0405dab6000fc19f7
+DIST regex-1.3.7.crate 235600 BLAKE2B 15370ec0cc9f37c6a7092eaf78a731740aae3d79ec6d385244f4568395cac8947860828ff585aba9f35ccae684bb19e214120f39e7f4998350ff2890a43f2466 SHA512 59090515860c26551ce08e8b37cf1227712944844148b79dcc7348f430e5c3c70767c20807cb1affb242686e7e8f885224c4c9fb9ae890b57f766fec96e2aa69
 DIST regex-syntax-0.6.12.crate 289531 BLAKE2B c1736b335844d8695e2795a869b538300a9bcfc92ca41e4e9840fc90c133553da4f2929b0f39fdbc7488551a8477b2adb20b83e728a3d847171579e20c925acf SHA512 671e4ecd9dbe58ab5938e0b55890ef0ab2c033221bf549ae0df3b6e831b57099b4c16f8577ca134a758999a1bfc0840aff49be138fb6a19e0b081089f66fa0ec
-DIST regex-syntax-0.6.5.crate 272475 BLAKE2B b2ff299b4b87ab91c925a10faa8a09507272600a12558cade5b18ce615844223384e8420f2025dbd642bf80acb5f608a6c0f5ca59a4c391d4f417fdea15058b0 SHA512 37f2c69b425335a28b8945fcd58a3a39a9adde5588fdcd4b460da0fbd137e0727a7835d71b4e87ff29185c153379402891847d93047e40a578f778a62b324f5d
-DIST syn-0.15.26.crate 145493 BLAKE2B ede140e0184464e765413aa4875a07ab9329de60eba6aa46253d2880032b84a56348060396ffec8a5d81a2aa22c6a6eca73c425778ead21c1c55ffb657cf3718 SHA512 947d70dff83ffd33fda806597d54e572555b54c1600e357df919165fdc7141c6f9762b37f25f9b850e8a7775c33b6df3fc93f3eff12b36b059e696ad90619baa
+DIST regex-syntax-0.6.17.crate 294004 BLAKE2B 3d203b06b8b1a5bdb42d50d395ce117ad92e41a7d36e5cb5194014eb7af1b17f944ae493041b7e9a2a9ea929381b4c1cb513c895747beff97aafef524ea2ced5 SHA512 bd9a165bcac207ec3bb87a81ae644be98d9b5ea0053b3bcc69efb334e3ebfeb85021aa372bafc3575758200640cbaaa67d372950fbb3ab210d8ec62b336d147f
+DIST structopt-0.3.12.crate 50273 BLAKE2B 9d7493700cfed14a8f20cae73c807fd103623ec6502a76ec677ff6bdd5385a88d5d20a395394fa28be580ac2fac34aeb19a8fb0ffb8dd23a50e9551ce973e7a5 SHA512 a71f4cb68ff3cfdacc4600350e35ab040e7fb5c929f3e9649fc0d93f9ca74c6a6efc46e1aecaadf3690106cd281118a1c7c03dd7b265d532e033d437f5ec2e7d
+DIST structopt-0.3.13.crate 50324 BLAKE2B 0c2060e87219437f036772e7457b6273c756c8ecf686bfd24273b713cbcb8410bff5d394e5c6effd12fa222fd0e7510cf16966ad6aafc9196d9d0c646e3a2445 SHA512 b22cf51caaa46c0ad07ad58709e024d615f2f8688db2414acce4f1abd677adb61f1dbdbf3318e194172c475781150da6bcf3c149f6acc60cc195ec598874db5e
+DIST structopt-derive-0.4.5.crate 19402 BLAKE2B 921dd4dcd8d19556351afa37d6ed4b1f6f3d1e847a6a33d80ff32e8fb0674d595f467cdb0d2949ffdcb95d36d6ac12db7fa37ff6a4088b9622519619ee75af1d SHA512 34205ba32a30bda80a06ca8c0cad3b17dcfdccfefec027b95769c08682736fb1462c161bbecf047ccb5f8d1ec02dcee6313dfad4fb61ef910deb1b65665b419a
+DIST structopt-derive-0.4.6.crate 19398 BLAKE2B b8bc319693dd46e77a3229ecee3a6b41e2e479cd6b86d76ad1e0fa33895ef79a21640c09d3fda5bfc6d2e181f37f66d8ada3eedae49f7be3e2774d4a2680313e SHA512 842507f9ac3172c48700d1ba350d93fe087eef37903fe71b15b39f21ada56dded638077dadbaa109869f9a0e65ab7e4a049504505e1d3e2736f779846ba6330c
 DIST syn-1.0.13.crate 195242 BLAKE2B c6889e24927ac5ebc1248be2d1dd1512b888e67ecad686dc67d29ff517aac2035cd4a8bf6dc87db54532eed72608f3a06ace41989bc7f47789c20041841a99e8 SHA512 234b470f432c1981f13e63e37334e200cd872d288f0ca10fb849281a5fe13c077eb9d41e75933a296f8c3d4e71ca8cce8724ef8c3d98bd9972146fab3d010663
+DIST syn-1.0.14.crate 195286 BLAKE2B 8311cdc0eb8ff69d65c250eb95706cd1e74a6ba899fac02ffc0a288e978c40a03fe5a7c18e3116a767eb6e5e08299d27f5ae04021b224d71d7b492a6b87d67a8 SHA512 7b2b7562ac89d719060b35bf89f21330c02a3c1f34270e864053feba9b0f7a16b5cfd11c57d57eab7c60df8663d8ae76709ca1c48ebab960db168d2836f57340
+DIST syn-1.0.17.crate 198158 BLAKE2B 7093cc8aab4ae2f435aa70a54c8c2b8e4f6928ea76186059942bf5c74e2ad25d73608f469cb0f1d97071a5dc2e3d048a155084bbc28647ca39032f06bcd5a3a3 SHA512 5acf5bafb32f780e08495e1e0782c170eae54baabd72c45a1d350aa41aa4ff2e5fa84b23d088fbb8522f430526e938c459087f89e3372690bde7bd0cb8c4750f
+DIST syn-mid-0.5.0.crate 14149 BLAKE2B 87170d072ab6f5ffc6d7f4dc1a08869d4e5c0f505b9130d9b5778a55e206a488b048e47895a524e117ed58b3d45907c8877c897d1d88536a06c9319826b596e7 SHA512 759e29a2ca984eddae3c091be036ad630fb985408be31d838af3bb04fe1f26a3d2b7ef597c1ffb61a72c96383cbf39d8fe83cfe0d79ed4bc3250a585156e637b
+DIST textwrap-0.11.0.crate 17322 BLAKE2B 257428908342774593bbd3528fcdae710712ff54e8a711393a24356d8ba0e16e466a4b20c05f942c48ca76b3b5b5aaa90ec202f782cad892caa8b71ccf124da6 SHA512 f5c0fe4f28ff1a3a0931e8e235b5157a45f67967985bcc752418c5ec3481fca44a8ae4800088889b37e8cd0533f53d3c456d5ffd19b767b3f83a87b49a2e209a
 DIST thread_local-0.3.6.crate 12388 BLAKE2B 290c35e5327e80a5cdca5609252b1efd1b78a654fc9ab4ba68eeaa3c2769d844f725d17d91cbb15048dbaac84913c51edcb39bb402882c9e7b4d0c4e4811518d SHA512 cd783d3d9caec43868da1f6118d4c4d520e03b9f1049d8f15d2c12482989401d3aee748e04a149953d35e5d6487355c2891d44569ef688bc1d45f01b6461d253
-DIST ucd-util-0.1.3.crate 25897 BLAKE2B d67d250603625d7fe55b1bd17a8bff03ddf2e48b531e8f754f51dcd49370a2b66d0915842fb2fce85a69df2c38f9c086ac3c36115d40c5a8138e5451f71a1cfe SHA512 50a796feb198012241d73001bb53c8e3d3168df379de91d7ecaccfd829b08a356afe3db736fb8cced8748141d7a9e4b157440442c425816c78c0615c08e20f2e
-DIST unicode-xid-0.1.0.crate 16000 BLAKE2B 159004a7bbb7476b39e982b51dbf615717095fd5946536e757653aa941bbf1b774f331db744ecc33bb2ead4b0a6d254fde86cfd6cd8b83ab9983fa89928eddbe SHA512 cc5343e2166938322cfd7c73f1f918f2a9c46846ac0ef55933d1e44cdfaf6f7da2b7ff18b68e356c47b6d8ba5565eda0db42c347dcbde830683f341ac2b1849d
+DIST thread_local-1.0.1.crate 12609 BLAKE2B 34206b5232262cda9cc0fb970e20f154d43ff1c4477a5ad5ff9200e6d874a6c7b2bcd99a2dae75a984b54574281e049ad35307ace0dd188f44c9a95fa93139cf SHA512 f2bfca4eee32a8fc88a01ff5bf24518c12142228d95916d13aae35ed6addd0b7da2235359f15220049ef197555344ac31a8833775e7a5bd49144db9c54b3165b
+DIST unicode-segmentation-1.6.0.crate 90703 BLAKE2B b7d63bb8b62cabc604084957aaff021df24a1291f0ebdcddc424cceefe10ad399ed53152211c3e7557e39e21255166f922256f9f8e1fb488d3bae368b49a378e SHA512 80c6f92d9b39602a05809dc63a7cb05a305441689b6056801097a882a36c9795aabd660f884f707daa7e7fe6ad4983f6e245c226962cc982dbfeea2ddfddf41e
+DIST unicode-width-0.1.7.crate 16644 BLAKE2B 8cc5ee2dfeeda8ffe3405a0d4f1576d2b3b8ede1a42cbefb0ba3bd0d71b53a92ceade86c4a06e9d5b31382955dc6e1152ae5cd279dc26dbc51f478dad1d0f64d SHA512 39b8a539c9009d0421f54ae68b139f21456c9cb03d743b58535a977f98bc9655cf42eaacfadbcff796c187a6f315ae16259ee22be9c2da5aa042172c6b464d84
 DIST unicode-xid-0.2.0.crate 14994 BLAKE2B e66b4255798f0ef1c81fb852613fee396a042d780d2158a171dbb5e7dedad0b3d2522f5401ae5d215f89ab8be4f5c371b046e4845693a65554c2a6eedc5d1e28 SHA512 590f727d8d8354023062ae5fe7ac5bed1bcf79d86b883effd7f33b3ea3b1c8922998a63d621ca6962a969e890fa6edd009871f21cd57b1969264f41ba3f78359
-DIST utf8-ranges-1.0.2.crate 8510 BLAKE2B 877ff38444aec99bf8e0d09c6880d4835eb453c8c7e38fa5e7f8fe3cadd5b34b11a030193e46fe97b19fd90e94de156c0eaf12c613aae7cee47f0f016a3fb96d SHA512 ac168b908a34c4814a682b77502d2e5aa3130acb01fa87e29c78b760a61ba61b01f9fa2d67202604ac9824e0b2fe92143b72c0d4100a62ff9f53e4b00a4a12fb
+DIST version_check-0.9.1.crate 11459 BLAKE2B 72f002c00504f635b7d2d7ee7137e07ba9c182d2e41d32a51851896f6bf6742c5524b7f66946437ba581ccf80b9c9a57280dd4b02df0918569ac710511940fc1 SHA512 b9cf363169df2022a961f5bed4fb7da07513e0283a85aa69752f6ac567e942611ed2216ac61799db1a199e2bdf0fd9b994e35d4a40c6cd80cd26b97cbfe977cf
 DIST wasi-0.7.0.crate 33941 BLAKE2B de1e4e577a1237a233f81ff1a3bd7f888020a42d93a807187a154a3ae0593397358a8667a065f0cdd5497dd2a89889e418d33a0d42ab1631b3f99677e9ebd665 SHA512 1950e78df7f0ba21b917680633d092704f1fb906bd973de4ddc43cedb7bf449f6e881d50e3aa0d5595e8d58796915d582b69c116ef536f819b6f035affea18f0
-DIST winapi-0.3.6.crate 1029391 BLAKE2B 9a52085c3cb74d84bc66cee575da0105eeca69f6abd3c8c601a4de013bafea795f044748be10ec9ab419a9ec82a304a0b65ba4d74f6cb39baff91228f83009f1 SHA512 991eb3d6ba08d59e7f7ec81ebf469cecc56b3723b636392972d2fdc1d6f13d88f8a244ad5cbb20f6058d12b44e060ed663c12aa3fbcd1235ab511fafa105cd3c
-DIST winapi-i686-pc-windows-gnu-0.4.0.crate 2918815 BLAKE2B 4d357e4d30f9552972170d65b9a5358b69c46a3e772fe05efc22f3d4ffc1caeeaad7aacdc7abd503a7ad0545f8bd7d22bf351dcb6df76f812fa4d45c34d65df0 SHA512 a672ccefd0730a8166fef1d4e39f9034d9ae426a3f5e28d1f4169fa5c5790767693f281d890e7804773b34acdb0ae1febac33cde8c50c0044a5a6152c7209ec2
-DIST winapi-x86_64-pc-windows-gnu-0.4.0.crate 2947998 BLAKE2B 2ad1ea8b5fa07d544e910ccba043ae925269b76b26c9da356305b34b86741dd8b9aff0b9ffe3d562db4fcd7d7c46a11ce9e3168b782b1d89ae6881742b7ede82 SHA512 4a654af6a5d649dc87e00497245096b35a2894ae66f155cb62389902c3b93ddcc5cf7d0d8b9dd97b291d2d80bc686af2298e80abef6ac69883f4a54e79712513
-EBUILD nitrocli-0.2.4.ebuild 1393 BLAKE2B fcd3890ed453e60720f06e9e59ed7e1122547d30f36e81329e32a1485a92adaec7e325e14fa4bf15a20c727f0cd77784eeb04177f9623c2c172c324a0bc5f2e0 SHA512 ece7cd759e2c873d9f7da95c186f622e3de27bc977d94be6684dc79e8138d47fdb2fcc000057052f900bd92f1baba6158358b13cd09bce24dfe791203e2aceea
-EBUILD nitrocli-0.3.0.ebuild 1402 BLAKE2B 583cbc0b43d355fa98cd5149d3a6ce0527a4cd2dead10f0c54af4be092f0dcc4301c9da92cd9ededb88ced0ff76f7efdae4dfb693663882981d3cae663378243 SHA512 693a801e8022455c8bf88a79d478b9044fd17566f10bae9afb32ef857b32242fd7c6390ee74589473ef932f5318f01808501f61b24218e6de41f5c28f7170352
-EBUILD nitrocli-0.3.1.ebuild 1207 BLAKE2B fa9299c2fc9af3c538bf199ffcca4efd369701c47d498827b2f416126f7ea472c11e76ad93d945c4a520f39c1157d80d94e04a971f08afc4543d79757bc3abfd SHA512 097d11e94992648c8fc318b52967621f5093c8a4535c966a36e8364ccbcb3149bf99dc8e5dab0d10e6129073086dd19cb97d5fd8536b9f876301b97ae1c144dc
+DIST wasi-0.9.0+wasi-snapshot-preview1.crate 31521 BLAKE2B 716bdd2ec46d0bc9911c5e5e29fc783840559931b2563d8619675fc11da9527ddbe653a0f1ce0b782ee0c5f7a3131aba2b0867d415f003aa9c2389357569e7dc SHA512 dbe641f796ee3a5daafcaafc911ecc6dff170340f477c2df7a61fb4858a85aefc2637c9e61973ecce66a987aa8e08a736273a4aad3ef47eaf61ed4268dbf9c47
+EBUILD nitrocli-0.3.1.ebuild 1196 BLAKE2B ab663b4fcba810d44b70f78f3b6eb9fc31287993a1c4fc78be8a0ce5c074078bdd4a2d472429cc6f748617536d514eddcdecd5e12e417c4a69de70f8a54114f1 SHA512 e955f82e18565d4373bccfe4439e4770e16e5c87cd3ea06221f130e4da7a97a81e2096be96608295b8e329ab3a3f5c43035be5e8dca557ab67b6ae239b204f85
+EBUILD nitrocli-0.3.2.ebuild 1402 BLAKE2B d98f0e19b8bf677f299131b7419401425bf5715a6deff8e01e2c340fcb3e2e4fd23c21d0a25411bc357c89c2b5807a48f0f10790341759e2147706691df67af1 SHA512 f873c00e2e2e0da275ab94ab05dcd62acb8ab652a968f722ab05baca8c596862dfa9327d7d635a575ad91b43ef038f7466d1d7c8ee2b187a8404c6b0cdd92223
+EBUILD nitrocli-0.3.3.ebuild 1548 BLAKE2B dc3ae38f16614a564f4d6c3893e7bac3c6469ba61d64e93468b9a5adf105fac05ad0db0d88a4841f87911c9acfec14c4cf7e984a7171a6a1c3ebe831cf75a838 SHA512 8e2255e1849411617ef7e22b187c368336394f52f3e91f9da6c194c556f82200a248859f123c55bbc5dabfc19ccdb26ecd1132a5014c0f58f41fa06cb31ce643
 MISC metadata.xml 683 BLAKE2B a973761f8df97168483a0adc13bf44f088f13fb9c472986cffed08d53f69cdbc27a4bc195babcd86796853968c8face6c00004e060086b2ba4d09c52ce978815 SHA512 3f4615ba5af13e358c1c3a4b28c3dbec77c0b99af4692c0b2feedb4f21a1e5f8f76cb7fbd2cdaa5a8c899d340094b8029a6967dd68d591586bef551f8eb61b1f
diff --git a/app-crypt/nitrocli/nitrocli-0.2.4.ebuild b/app-crypt/nitrocli/nitrocli-0.2.4.ebuild
deleted file mode 100644
index 8003f3ae49a4..000000000000
--- a/app-crypt/nitrocli/nitrocli-0.2.4.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-CRATES="
-aho-corasick-0.6.9
-argparse-0.2.2
-base32-0.4.0
-bitflags-1.0.4
-cc-1.0.37
-cfg-if-0.1.6
-cloudabi-0.0.3
-fuchsia-cprng-0.1.1
-lazy_static-1.2.0
-libc-0.2.57
-memchr-2.1.3
-nitrocli-0.2.4
-nitrokey-0.3.4
-nitrokey-sys-3.4.3
-nitrokey-test-0.1.1
-proc-macro2-0.4.26
-quote-0.6.11
-rand_core-0.3.1
-rand_core-0.4.0
-rand_os-0.1.3
-rdrand-0.4.0
-regex-1.1.0
-regex-syntax-0.6.5
-syn-0.15.26
-thread_local-0.3.6
-ucd-util-0.1.3
-unicode-xid-0.1.0
-utf8-ranges-1.0.2
-winapi-0.3.6
-winapi-i686-pc-windows-gnu-0.4.0
-winapi-x86_64-pc-windows-gnu-0.4.0
-"
-
-inherit cargo
-
-DESCRIPTION="A command line application for interacting with Nitrokey devices"
-HOMEPAGE="https://github.com/d-e-s-o/nitrocli/tree/master/nitrocli"
-SRC_URI="$(cargo_crate_uris ${CRATES})"
-
-LICENSE="Apache-2.0 GPL-3+ LGPL-3 MIT"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-BDEPEND="
-	>=virtual/rust-1.31.0
-"
-DEPEND="
-	dev-libs/hidapi
-"
-# We require gnupg for /usr/bin/gpg-connect-agent.
-RDEPEND="
-	${DEPEND}
-	app-crypt/gnupg
-"
-
-# Uses a plugged-in Nitrokey and runs tests on it. These tests assumes a
-# pristine configuration and will modify the device's state. Not meant
-# to be run as part of the installation.
-RESTRICT="test"
-QA_FLAGS_IGNORED="/usr/bin/nitrocli"
-
-src_install() {
-	cargo_src_install
-
-	einstalldocs
-	doman "doc/nitrocli.1"
-}
diff --git a/app-crypt/nitrocli/nitrocli-0.3.1.ebuild b/app-crypt/nitrocli/nitrocli-0.3.1.ebuild
index c12f84a33627..9d51dc07dddc 100644
--- a/app-crypt/nitrocli/nitrocli-0.3.1.ebuild
+++ b/app-crypt/nitrocli/nitrocli-0.3.1.ebuild
@@ -32,12 +32,12 @@ wasi-0.7.0
 inherit cargo
 
 DESCRIPTION="A command line tool for interacting with Nitrokey devices."
-HOMEPAGE="https://github.com/d-e-s-o/nitrocli/tree/master/nitrocli"
+HOMEPAGE="https://github.com/d-e-s-o/nitrocli/tree/master"
 SRC_URI="$(cargo_crate_uris ${CRATES})"
 
 LICENSE="Apache-2.0 GPL-3+ LGPL-3 MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~ppc64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/app-crypt/nitrocli/nitrocli-0.3.0.ebuild b/app-crypt/nitrocli/nitrocli-0.3.2.ebuild
index c8cb63260fed..443257457f3c 100644
--- a/app-crypt/nitrocli/nitrocli-0.3.0.ebuild
+++ b/app-crypt/nitrocli/nitrocli-0.3.2.ebuild
@@ -1,56 +1,55 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 2017-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
 CRATES="
-aho-corasick-0.6.9
-argparse-0.2.2
+aho-corasick-0.7.6
 base32-0.4.0
-bitflags-1.0.4
+bitflags-1.2.1
 cc-1.0.48
-cfg-if-0.1.6
-cloudabi-0.0.3
-fuchsia-cprng-0.1.1
-lazy_static-1.2.0
+cfg-if-0.1.10
+clap-2.33.0
+getrandom-0.1.13
+heck-0.3.1
+lazy_static-1.4.0
 libc-0.2.66
-memchr-2.1.3
-nitrocli-0.3.0
-nitrokey-0.3.5
-nitrokey-sys-3.4.3
-nitrokey-test-0.1.1
-proc-macro2-0.4.26
-quote-0.6.11
-rand_core-0.3.1
-rand_core-0.4.2
-rand_os-0.1.3
-rdrand-0.4.0
-regex-1.1.0
-regex-syntax-0.6.5
-syn-0.15.26
+memchr-2.2.1
+nitrocli-0.3.2
+nitrokey-0.6.0
+nitrokey-sys-3.5.0
+nitrokey-test-0.3.2
+nitrokey-test-state-0.1.0
+proc-macro-error-0.4.12
+proc-macro-error-attr-0.4.12
+proc-macro2-1.0.7
+quote-1.0.3
+rand_core-0.5.1
+regex-1.3.1
+regex-syntax-0.6.12
+structopt-0.3.12
+structopt-derive-0.4.5
+syn-1.0.14
+syn-mid-0.5.0
+textwrap-0.11.0
 thread_local-0.3.6
-ucd-util-0.1.3
-unicode-xid-0.1.0
-utf8-ranges-1.0.2
-winapi-0.3.6
-winapi-i686-pc-windows-gnu-0.4.0
-winapi-x86_64-pc-windows-gnu-0.4.0
+unicode-segmentation-1.6.0
+unicode-width-0.1.7
+unicode-xid-0.2.0
+version_check-0.9.1
+wasi-0.7.0
 "
 
 inherit cargo
 
-DESCRIPTION="A command line application for interacting with Nitrokey devices"
-HOMEPAGE="https://github.com/d-e-s-o/nitrocli/tree/master/nitrocli"
+DESCRIPTION="A command line tool for interacting with Nitrokey devices"
+HOMEPAGE="https://github.com/d-e-s-o/nitrocli/tree/master"
 SRC_URI="$(cargo_crate_uris ${CRATES})"
 
 LICENSE="Apache-2.0 GPL-3+ LGPL-3 MIT"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc64 ~x86"
-IUSE=""
 
-BDEPEND="
-	>=virtual/rust-1.31.0
-"
 DEPEND="
 	dev-libs/hidapi
 "
diff --git a/app-crypt/nitrocli/nitrocli-0.3.3.ebuild b/app-crypt/nitrocli/nitrocli-0.3.3.ebuild
new file mode 100644
index 000000000000..132dfa4a321b
--- /dev/null
+++ b/app-crypt/nitrocli/nitrocli-0.3.3.ebuild
@@ -0,0 +1,77 @@
+# Copyright 2017-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+CRATES="
+aho-corasick-0.7.10
+base32-0.4.0
+bitflags-1.2.1
+cc-1.0.50
+cfg-if-0.1.10
+clap-2.33.0
+getrandom-0.1.14
+heck-0.3.1
+lazy_static-1.4.0
+libc-0.2.69
+memchr-2.3.3
+nitrocli-0.3.3
+nitrokey-0.6.0
+nitrokey-sys-3.5.0
+nitrokey-test-0.3.2
+nitrokey-test-state-0.1.0
+proc-macro-error-1.0.2
+proc-macro-error-attr-1.0.2
+proc-macro2-1.0.10
+quote-1.0.3
+rand_core-0.5.1
+regex-1.3.7
+regex-syntax-0.6.17
+structopt-0.3.13
+structopt-derive-0.4.6
+syn-1.0.17
+syn-mid-0.5.0
+textwrap-0.11.0
+thread_local-1.0.1
+unicode-segmentation-1.6.0
+unicode-width-0.1.7
+unicode-xid-0.2.0
+version_check-0.9.1
+wasi-0.9.0+wasi-snapshot-preview1
+"
+
+inherit bash-completion-r1 cargo
+
+DESCRIPTION="A command line tool for interacting with Nitrokey devices."
+HOMEPAGE="https://github.com/d-e-s-o/nitrocli.git"
+SRC_URI="$(cargo_crate_uris ${CRATES})"
+
+LICENSE="Apache-2.0 GPL-3+ LGPL-3 MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc64 ~x86"
+IUSE=""
+
+DEPEND="
+	dev-libs/hidapi
+"
+# We require gnupg for /usr/bin/gpg-connect-agent.
+RDEPEND="
+	${DEPEND}
+	app-crypt/gnupg
+"
+
+# Uses a plugged-in Nitrokey and runs tests on it. These tests assumes a
+# pristine configuration and will modify the device's state. Not meant
+# to be run as part of the installation.
+RESTRICT="test"
+QA_FLAGS_IGNORED="/usr/bin/nitrocli"
+
+src_install() {
+	cargo_src_install --bin=nitrocli
+
+	target/release/shell-complete > nitrocli.bash || die
+	newbashcomp nitrocli.bash ${PN}
+
+	einstalldocs
+	doman "doc/nitrocli.1"
+}