Sync with portage [Fri Apr 9 09:15:55 MSK 2021].

4 years ago · 4efe0c22e7
parent 80a414c62d
commit 4efe0c22e7
526 changed files with 9054 additions and 2116 deletions
--- a/30
+++ b/30
@ -1,23 +1,23 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA512
-MANIFEST Manifest.files.gz 29275 BLAKE2B 4f48c629692a200fcd341aacc00e56528eede77f120f3d81eb24284b32b265651e9f3040ae4b46b93549170d01ff819bff7be59c44b971ced312fcbdaf0f5c63 SHA512 29c274d57a2dad4426ed0bc737907ecbf69eb305f0d41948b5acde31ef1184da9742c0bb4d295742e8eb77a41cb9dbd5957971052baf9c2bf8c9895414152319
+MANIFEST Manifest.files.gz 29331 BLAKE2B 83ac2ee98ebd6516f3f53d7cfcc12a6a04c591c79182c5c356ba51c7fd44883bc9d3432e2bab155f9df0d5e767f3b8050286a5c88eb58b298c463ee0c1144a42 SHA512 7247a4d167a2e6a9df98294120931fa00c684d5883739c986b13a667662f5560ec2d11f932cac783f7c03ff3b15d9794abe316bacbc42b8c9a0ebb2981e8647d
-TIMESTAMP 2021-04-07T20:38:38Z
+TIMESTAMP 2021-04-09T05:38:37Z
 -----BEGIN PGP SIGNATURE-----
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmBuGE5fFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmBv6F1fFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klCayQ/+NvzFXLqBSob2OhZN0q+eHKRAoumzqYRMNp233lz14CaPp5qlhEwaY3Kg
+klA+7Q//e8Zq+uW6r2YBaq0BsWVgl7n22puOrr1WJcMyiKxLZg/KWvFZM7exI+Q6
-UihKwUYhfu5DNfaJOb3ayY6liWpBiLNq6OH57RxJ2O2+iscTXifNiXHkSnAgoLYI
+6Zirr77EAr9WN6yAfK58fjbAMpSP1kZOZMtU2w33SOpVSF6NSpeOOIEbWVwEF0lo
-2YJ1469BQ486Rynu+JRq32MYFc7bTAmTurwuW80/efRcUzeoUPZP+fc3eH1UtoOG
+9v/CFPD96qWJBQ8PZ+Xe5fnSlHCRMu8kPxSP72VK5w1HPWuDjGG6K0v/QEqJpN5Y
-WfPXZu1D4m1TnY2oRWW90wOpGWvxSTvAheqeLbY0qrEHBKYOhv2wztEqZdLqdyb4
+i+C5nUV0HNk7t1tHAxYoJts0HjOlfH78lw16U3Iu4/GtLIQX2NCEzI++nvUK/Ej5
-19T4lg5w/UrtNp42zfSZdRXSR+hStzUFbIRuso+xxXdp5WJ8nBIoTw1nmciDLpmF
+H9FwRfWENr1LXV+IOubgihNvlxgsBcQIKsVi9aoFW/MYCQGPQWNswf69SHsGTeai
-UdexpH85QUpHBScu7jk7q3fDf9MabtQkwF/MEJ+T4FeuklMOJV/mfavBjYtcAaui
+RoBqBNg05kEvahei1HkNXveQE9miC/ZbJ/CRhQkmcAZAqj7KtDp5mFRSzVZw5PZT
-cchNsmDtTUdm3FOX1aaL/ahGhN7CYVaVu/L0O0ITppNiaIXRvvURg/8PMVnKmmZY
+pjTCPyC1akVLvyXa+Ff5HDP5yPVuxJT7D4YjW4SPPRSKzIHXSHItwAk4ne5dwO+/
-Jxi5wdTv3641UFwWDF3uzeS7cLYapn26+dzE4wsk9alviErIIX3UXAgh8JiUv2VK
+xLZR/L6QGAlWEQCgGdf8lfUGLPDppWYmoXAxOieMOdUgjQ0agcKA8rPq/nDROBdx
-CsTro2hXB7sidqifFaISABndYkmkEbN37XE6jGfSEAI5kEChjO+H6YN9tAOGm8xy
+SepMMZpSWS4Tnqv7UxyGatTBa6JH5obtnoeUVV1LuFxsGBlXD3ckBelgbwbey2JE
-oSHCmDY5AK0Ccuhbrm6axWlqiR+//EDCWv62RJmnVxvPoOu4XUPO9bQkKgjqI6Sx
+LLX010ByAslKZSiqbbNSgJD9m1ltu4p3qjsld2Hk5LySCtPC/OWJvIDH/wygFe+I
-eDloHA9gEynAg39zXnVSsduw0i48EUi3b4upbDW2WIjd7jp3rw4=
+pCK+Y9Pcb/uGEbVO4kswPvZbH38n78OgrNPZwit2X84OXheHalM=
-=/7au
+=VFMR
 -----END PGP SIGNATURE-----
--- a/Manifest.files.gz
+++ b/Manifest.files.gz
--- a/acct-group/Manifest.gz
+++ b/acct-group/Manifest.gz
--- a/acct-group/snort/Manifest
+++ b/acct-group/snort/Manifest
@ -0,0 +1,2 @@
 EBUILD snort-0.ebuild 146 BLAKE2B 005f9cdceb0dc59cc49721fded69e56a6b23e4c66a9fe1b12319aec9a73d9158ecebf00f67d98c8e4b06ac4217f50c1a3fedfd7debb5ecb5f7cccd9c68acf1cc SHA512 06eed08d803f36aabd9b1eaffc6207bf2c5be87a2696acd64d019a6c2248a1561ed8b28c249e019f638b6ce1022edd91d82aae099518fa3beb9e4f619e3a6b2b
 MISC metadata.xml 388 BLAKE2B f44ba993517ecb2175a9f2d4aa668ad95dd3d57f60a2e5efba2ab0c55bd1931cfbb283e2dd04b994294eef7ed1d8823a332305f10aac8e37a799f3c07fdcfa2e SHA512 3685cd1850ce762cf90185731f4e3deaeccc3dbd0a39514a8b836896495fe7718d0d014010fad50f6e0a49245dab093d2c5379c7de5fb1b356f60b204cc94cf2
--- a/acct-group/snort/metadata.xml
+++ b/acct-group/snort/metadata.xml
@ -0,0 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
 		<email>patrick@gentoo.org</email>
 		<name>Patrick Lauer</name>
 	</maintainer>
 	<maintainer type="project">
 		<email>netmon@gentoo.org</email>
 		<name>Gentoo network monitoring and analysis project</name>
 	</maintainer>
 </pkgmetadata>
--- a/acct-group/snort/snort-0.ebuild
+++ b/acct-group/snort/snort-0.ebuild
@ -0,0 +1,8 @@
 # Copyright 2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 EAPI=7
 inherit acct-group
 ACCT_GROUP_ID=328
--- a/acct-user/Manifest.gz
+++ b/acct-user/Manifest.gz
--- a/acct-user/snort/Manifest
+++ b/acct-user/snort/Manifest
@ -0,0 +1,2 @@
 EBUILD snort-0.ebuild 220 BLAKE2B 182b20f6e477e5cf055bceed938dece508ffcb144531e445d4db11edbd7c75965be861078a7bfea22ae87f8dba8bd286b56038a3760afdb56d5340c012880a79 SHA512 32ae2d723d3743a766e2939d4d196f9f014cf492f0880db9b75360542144543629d54104c0f1baf60cd97848bfa81687f3226e468aece4a61ac4cecdb01cfdfe
 MISC metadata.xml 388 BLAKE2B f44ba993517ecb2175a9f2d4aa668ad95dd3d57f60a2e5efba2ab0c55bd1931cfbb283e2dd04b994294eef7ed1d8823a332305f10aac8e37a799f3c07fdcfa2e SHA512 3685cd1850ce762cf90185731f4e3deaeccc3dbd0a39514a8b836896495fe7718d0d014010fad50f6e0a49245dab093d2c5379c7de5fb1b356f60b204cc94cf2
--- a/acct-user/snort/metadata.xml
+++ b/acct-user/snort/metadata.xml
@ -0,0 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
 		<email>patrick@gentoo.org</email>
 		<name>Patrick Lauer</name>
 	</maintainer>
 	<maintainer type="project">
 		<email>netmon@gentoo.org</email>
 		<name>Gentoo network monitoring and analysis project</name>
 	</maintainer>
 </pkgmetadata>
--- a/acct-user/snort/snort-0.ebuild
+++ b/acct-user/snort/snort-0.ebuild
@ -0,0 +1,12 @@
 # Copyright 2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 EAPI=7
 inherit acct-user
 DESCRIPTION="User for snort"
 ACCT_USER_ID=328
 ACCT_USER_GROUPS=( snort )
 acct-user_add_deps
--- a/app-admin/Manifest.gz
+++ b/app-admin/Manifest.gz
--- a/app-admin/cli53/Manifest
+++ b/app-admin/cli53/Manifest
@ -0,0 +1,73 @@
 DIST cli53-0.8.18.tar.gz 39059 BLAKE2B 993b1431130ce6bf9448ff0ca3c0bf09f4875b0a19df311160e940241b2127ee78c6d11eeeb3ca007763a54511951d3dca8f9e9585661e765c83bc340c38b7b4 SHA512 0bacbf10ce7fcbd359c16ff66ec5d415b4d9776e5a138847851c32715c90514b2ae2152a7b3e28a3a3b533b8d0b85d586faa7f62dc932fcd089ddfc706906a11
 DIST github.com%2F!burnt!sushi%2Ftoml%2F@v%2Fv0.3.1.mod 34 BLAKE2B ce54a247aef91043830bdf0603c8452ba38eceb1495af6e7a74c9119234a0dc5cd080cb25258c28f5e270acf91189a5ed33e361cbf17de2be5e37dadbda1d90d SHA512 320941bc3b7fb8bc595e6135cbc513a7583d129f0cd92508055291e141191066303cf75148e25198c21f6c6c539a790ea3210f3ecf5de6a2a03b70c753091146
 DIST github.com%2Faws%2Faws-sdk-go%2F@v%2Fv1.29.19.mod 293 BLAKE2B f9e61a09652a858841e6530749b9dfc87509f2360d87ba277003cf6eb48bb8a00e49d57dee39026bd68f9c38b48b23e415ab10a45220f529045462ef707ec8ee SHA512 498bef5869b7df953499ce3416d9336e36c7b992c46f1bd96331aa2a224be136e93385efcc827e579fc479e3ca38f7e54fb0eb1df3e90b9b16f43182dd4ac58d
 DIST github.com%2Faws%2Faws-sdk-go%2F@v%2Fv1.29.19.zip 15716467 BLAKE2B 6e78494ef8fd092d14ab0fdb82fd0bfded351b24128fe99c30577516df56f80d23db5b71171bc00cdbe544858d64107927fcb566ee0aa1b905c941abc91c59d7 SHA512 d1368d715b79c32e9e74cabcfe79d297864090c3460a1384dbeb88ab5ba3f119f48808536b59f5ab1781ec5c38ceaa57d5dac920dcfb504132b6a1e1f48950ea
 DIST github.com%2Fbobisme%2Fgucumber%2F@v%2Fv0.0.0-20181101035029-55b04af03920.mod 35 BLAKE2B 535cfe3e9cd8eeef4a17508e93bc9821be02b3e190c0c0aea1778f4a7e02df3132a144c2463764d264141ccb97aa4778f3be622c3dc2463cbe5ee403da7240de SHA512 18fbbe515a39bed395be0f868b498b9fd17d695cb8114afc85bb98740cc81b62ec0871d2e824d5dcc189ca690445691073f139a7edfb0bf4cecfb5637be0bcd3
 DIST github.com%2Fbobisme%2Fgucumber%2F@v%2Fv0.0.0-20181101035029-55b04af03920.zip 22475 BLAKE2B 40d4853b6021ffa27199b48e8bd29d3bfd4fbe04f51cb4973c6ff33cf36e47f25baf0d786b58398e130cc6dab895d0c042c28d37bc949b4b304c5dc89667d217 SHA512 d4a9700c79d71cdf75d3d692d64c2d91610db3c7e69befa29b19d0e1474e2dc1d8f0ece9fbd481c91d51bc87aaea7ffb20426660c2918d38776a30df23c374c3
 DIST github.com%2Fcpuguy83%2Fgo-md2man%2Fv2%2F@v%2Fv2.0.0-20190314233015-f79a8a8ca69d.mod 217 BLAKE2B 4232fdc22064d42e7b97efa666b5345f93d53d40ba11231778e5d17bc7d48c6178d27f4e8678d2139ba4e40a90d46a6caeab1a9696b76db5aa361fc17d3c8c93 SHA512 000449de8fe27ac12c5e7614bfb48a31d506b582ce2deaf0a0709d3673c9fad41e3b97e25df872609c5a190e899a56755d2d9f974a38523c51c9fa3af521d73d
 DIST github.com%2Fcpuguy83%2Fgo-md2man%2Fv2%2F@v%2Fv2.0.0-20190314233015-f79a8a8ca69d.zip 12266 BLAKE2B 93705895ca63c348ac5397fe8531214f5745a3be6f5760f9d3fbf67fd85b917dab4a2077376251a005bcf07450df1fe0b0114feacc5f92c6facbb2da637beacd SHA512 284116b4f2778ee7981e3aa5583c4e685afd8434e36ca647f0c72c5bb308e87bc3bfae8c83acd259c9da75549339aa382663b7103e4033b2418e314106923c0f
 DIST github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv1.1.0.mod 34 BLAKE2B 7e09c2779bf7a84a9271e31522ebbe600a1c11b107d651d91f58c8373e4336332a3a881f3e12b382543d75f20398af66085fcb3e780eed341e870e9c30f29267 SHA512 5e079462f7e0dff0efda71f580aa185700cfa936b718a19d0e2a8c63212e47a07022dca0c282832d48e5165aae8e82aeeeb2ac3664268f1148fc772010fb860e
 DIST github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv1.1.0.zip 60546 BLAKE2B e775860f49c6ee09a6c48902d38fdf5d2d77af4cd405d8d303902170e46493301d4aa873a48b4d12a16d92dafaa65290de1fd3a42545025fbfc82f15a3881e8d SHA512 53dc5484f488ae1f8d0eb672c3431bbf9fce33dfcee83dda7929103e3650559cf703f601716984a640422f01cc640860dba0b47e16aef04d0d2452a266fefbf9
 DIST github.com%2Fgo-sql-driver%2Fmysql%2F@v%2Fv1.5.0.mod 47 BLAKE2B 7252c3d085ad65bc8d2694f6fabeaf42736c8af8f4e061f1b6f254c35859619db00c1e204057cf355434b40f403b1c67c29fa5f93661626284bde20c8877a606 SHA512 149783bbdf84f15c29931e06d98707db26048d13ae9fd157600b522c0ddc60612c39764dc177e063f844205321ba98a01eefc1744dbc6f786861d0607dbdb0bc
 DIST github.com%2Fgucumber%2Fgucumber%2F@v%2Fv0.0.0-20160715015914-71608e2f6e76.mod 36 BLAKE2B 14fd61f36ea542953914eaef9b6b835fa06886e938a1eb938cb6aaa97284304a195c8e693a3d22bfb42aa893b7df9c06c514779f8326ddd2a178d668a36d81b6 SHA512 e89319c3348a8818ed7c37e43ba2e1facddc6582fc9bc0a9a93bca912f4b4fb99d54a8d9cd248030c86093db9b9262c38c8934b3eecdfe94897b0ecb11e3ae2f
 DIST github.com%2Fgucumber%2Fgucumber%2F@v%2Fv0.0.0-20160715015914-71608e2f6e76.zip 21454 BLAKE2B 02969de603a60f4cf3b640202f1fde06549e489d50a0b3909c68b44b8dbc785e7079a14bee544d250c711657535a8dfeff51f1445f82753b5a43ab6be16f9a0e SHA512 c01460622485d34553e3616b2568b1c2b990b5d871d70b115d1711abf29dd04d9f5ac4c1d3339d472b98d86a5ce0ad20a0e70cc5f0fc9c7b52281da6f2d8f88f
 DIST github.com%2Fgucumber%2Fgucumber%2F@v%2Fv0.0.0-20180127021336-7d5c79e832a2.mod 36 BLAKE2B 14fd61f36ea542953914eaef9b6b835fa06886e938a1eb938cb6aaa97284304a195c8e693a3d22bfb42aa893b7df9c06c514779f8326ddd2a178d668a36d81b6 SHA512 e89319c3348a8818ed7c37e43ba2e1facddc6582fc9bc0a9a93bca912f4b4fb99d54a8d9cd248030c86093db9b9262c38c8934b3eecdfe94897b0ecb11e3ae2f
 DIST github.com%2Fgucumber%2Fgucumber%2F@v%2Fv0.0.0-20180127021336-7d5c79e832a2.zip 21606 BLAKE2B 4a004faac49999a6bd3b49b308c7305f667d1608683aec51fe25599fe095a582942c1962b594c150e3183c06b86358aba962246e0464d712fa89b55b8369132e SHA512 e5d8ae77326c1c69b0429abde66ffc3806df56eac13017f19052334d5329eec488b60eafa907aa0e542cc36d979e59f5ac4b67385ee2f922a9a5ba72ae0f4aa1
 DIST github.com%2Fjmespath%2Fgo-jmespath%2F@v%2Fv0.0.0-20180206201540-c2b33e8439af.mod 39 BLAKE2B 6129177aeb4cc82860b5e233715d4330fc61c4b6783af687d936a5d783b32f7192f268ee0954d8a37fc1a6c22c147e86a1fc1c9ee8f48cc979931b0500fc92b9 SHA512 19819e43a514d9d7b1c8703c06c3729456a39a963a1cd3cdce7f6318a3ef67f8663c5a66b6bc402cf422d823b1b63540a6c79f371cb81ecd1f13de646598566a
 DIST github.com%2Fjmespath%2Fgo-jmespath%2F@v%2Fv0.0.0-20180206201540-c2b33e8439af.zip 231432 BLAKE2B 99b12826322d86b39d622bba690286fbc43b9e0336161d5218e6620caac0580fc7b3a021e60047a19815e35a4821d31066bf1ee6ca0e49f7bbfb1df10df21380 SHA512 331f1c4fa97173f022210d15719a9ae8a0dcc1c7574e1f019959070bd8cc3f77e34dba16d78e8d9e0083fee2ac24751aa36d5cdc0b2d1303a5118156ea514b7f
 DIST github.com%2Fmiekg%2Fdns%2F@v%2Fv0.0.0-20170818131442-e4205768578d.mod 28 BLAKE2B 7846fb7a9c146e4b4cd0db250d3a84bca13c7c3b8292ba71215a041006c8ea39a36b88dac7749a9bba96dc463b499633591f6f19d43369067b0f4f46594b8ddc SHA512 4ce4d3df63fbdbfe3505816e81dc7e806554d79cfe0254ce8e0228bc16eafc014c98475c24f4a6e0c6efb6fa16e891e2e47c43c9ea10ce20a95dc69f686f6361
 DIST github.com%2Fmiekg%2Fdns%2F@v%2Fv0.0.0-20170818131442-e4205768578d.zip 209643 BLAKE2B 201d3e0dc85957885c9375ce4c696b70a835dd58dc013fe8b83c2a95778297d53c9719fa8f2674a4456e5d27190b2271eb1af5b9a6eebd9b3cdfece10ee562e3 SHA512 00002ed2e2a7349c110d60ea90da8c19e752e06bf15795019e0f4e238c32fc44224ac07a409317290beb4819d41a1eb5ee5ac526bd569860df2eca10e7f6fc8b
 DIST github.com%2Fmiekg%2Fdns%2F@v%2Fv1.1.31.mod 333 BLAKE2B 8d0eee290f65ec90aa77494795ca379d6e0dc3c1a3e040b045309e1ddcac7623330a140fccbf829cbd32cd6788195f3446d340144d5757340734804504203f86 SHA512 838358c8d40bce54c7010bf6c141e2022f2036ba91129166dbf27e2fbf355b8c32392fe8fd6edece94934c460c1b9bc73c496627b4b7efd63341d7086fd0b114
 DIST github.com%2Fmiekg%2Fdns%2F@v%2Fv1.1.31.zip 224434 BLAKE2B 7719d75840f11f1c547a91228ea7472b1774560966f9b456aaa3c19095e9bfc51c4e8655aa0a0a02590a52f0b06c2ad6ce3c0994d23d64f5a324539d7a98eb0d SHA512 d60802ce85252ea35f932efa2c04e10ab19bb94d56e6e7c84b1c41b9a43124b9b9e082f0eaa1ac7c903f31d70da9b8bb1f537edc71c0dfb19626226860d52a4f
 DIST github.com%2Fpkg%2Ferrors%2F@v%2Fv0.9.1.mod 29 BLAKE2B 7fb53b19bd1be0e783039647b42ecbe2070f51af102e473ec6d3544eea0ffa5863f1874ca1615348d5f8abbaa39c841b4fe18d43a8a615fa648cf22f35955e38 SHA512 0c156e21d35c45a89c1a1b69ff1976b4f7511b3870bf96126121f5a5effa3723eb45bf080e840d5c8b96898c65207dba83eb3e1a23668dd8a5e20ee6be775cc0
 DIST github.com%2Fpmezard%2Fgo-difflib%2F@v%2Fv1.0.0.mod 37 BLAKE2B 94636062c94f8ff68cdcab7593a3acae7b9ffff616cad7b1d5c9cd147a4a1042d33666cbeed6fd816d6793113abfb595183097dcc46de7a3dfadc1423ed43e79 SHA512 c3d5c48cdb8ba6af7071a07cfede06e0ab67e3726d9de592a952fad40167dcbdd9621dc2c4df1bd3c28eb99d70b1b6d8d812441237c35bf492e5b7f07bd33902
 DIST github.com%2Fpmezard%2Fgo-difflib%2F@v%2Fv1.0.0.zip 12433 BLAKE2B 0c911c9d173080abd8edbbab1f47222343801d8eeae36b4add24773e3282fc2a39283fdf519a3d4483e39cdb7d9509b8570d151f46841ac1a616f312dc4cb0ba SHA512 3b85697185ba85cdef6202444ab6cabeabfad8a03d66b3839a852586b1f91ddae7897a57c8c138d5647022aa44906c7ef3c5339d520f90eeea0742a935da8cf2
 DIST github.com%2Frussross%2Fblackfriday%2Fv2%2F@v%2Fv2.0.1.mod 42 BLAKE2B 23dbba19737db7327590adaf3988abb9b5548cb3f959a9746a3b745c51f3c1397f071f2573a413a088f58e32959a2210c2b5354c47c263e90ad2ff1506872a5d SHA512 ac376a387fa39fe35dc4d073d8becd74e79f52e9d36b0a6628740dfe0e7c1f4fb6533fc262212663b105afcaa104082e055fa87d20cb3068359faae6dcba7738
 DIST github.com%2Frussross%2Fblackfriday%2Fv2%2F@v%2Fv2.0.1.zip 110026 BLAKE2B 862c858d51e59569c38e1304de08c256752db260cde7f7f44fab41d22695999fe73483d3854166f4e8d3da9b4f8e41b7999d7e44510ab8c2ca6c0120173b77e3 SHA512 992df87104aa66dec048d39496c85819cab19bc890cb2c60326660d011642f49cd926b082d3eb4136b229a6e4893ed023a133e4bf83a4993c534b24e14d77b4d
 DIST github.com%2Fshiena%2Fansicolor%2F@v%2Fv0.0.0-20151119151921-a422bbe96644.mod 35 BLAKE2B 8f3128dc040f9ac7ecc871893ffcc8343bd3941cab96aaf21133b518d5656b3c59c8bb9d07cfece35f5c8619e63043db9c4a51b0ac39686ae127de1c7f8fdd82 SHA512 f14916c4f94415a1b3f5514a30de5e2010fec1040ecf62bd32bc5a44fbdab80a58fc22c86161d14104a496d3984eb36b6694e3c9da76b1b09bf51001016229ea
 DIST github.com%2Fshiena%2Fansicolor%2F@v%2Fv0.0.0-20151119151921-a422bbe96644.zip 11636 BLAKE2B b9b7ce90e854745fd9c60b9dc8fa1b489613c42b25979167c2723895476267647af6bc1b8e72291fde5f78dadd4949863a9dd2919b14d1344b4d1cb6e0f5d8e3 SHA512 80f334916e67d79105c27c2bbd81f6657fd49cced58d217e411e01425c01dbd23c5be1a36231b1a69654fe39dd569692a4d334fe321b508b7b82c7de8f0cb81d
 DIST github.com%2Fshurcoo!l%2Fsanitized_anchor_name%2F@v%2Fv1.0.0.mod 49 BLAKE2B 47bc5235e81d233e28b446ec2403accc442b4cc1ee956a0b7d47b5dac2a525f22bba87d05c3fe09179837860655f27191e073a3f6d7d0dad81c9a750752fe5f8 SHA512 6f6b924c2a3af28ef4342cdf8b83b726f2c409accf19c6ba0a4a47c6ae61857e4b69727fceb9e9e16fb8ce660a7181952714d49b6cafaacb282fa4e8af6e13b3
 DIST github.com%2Fshurcoo!l%2Fsanitized_anchor_name%2F@v%2Fv1.0.0.zip 3399 BLAKE2B 348c2171bf3404d8b69166fd412707d8a348e1d808618036de2ae01fce77e3880fc782ef301f9b4135a19d81ca9ded5cc0cc4fd73d36b66b121b7f0baa73df51 SHA512 d02d5e4b8a24b1709c053138c4128d4bd6347d4adef95d1e25141935cf560fdcfd5c2b7837d6e690f175f1cd5a21b0279ce97b8b3b66d5e0a5006e4103b25f46
 DIST github.com%2Fstretchr%2Fobjx%2F@v%2Fv0.1.0.mod 32 BLAKE2B d698910da1ef00a70a1673b8c74105de195020ccd95d1e70c5dd1e1615210886ff9acbc9cfd03f46e99f5223b60b04695b8d362b9e0edd4e485480f802bd229a SHA512 4e366e5a60559a8863cb2a50280deb307d8bf885ca5440cce1b49a084b4cc4583b3481240125f35f161226592a43f2c0a426152f117d79b68c92c72a93f751d5
 DIST github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.4.0.mod 179 BLAKE2B 3bb7cee3118f0d335ade107dfefc3a594dc3883564fe4c9e96d615e179d394a49a3d6cd6584ba9c684772bc3dc6479af6a168dd3841c03957252667384f6ba11 SHA512 243bf1f69c146252164ad72f853773dcc77f15d7c9e9b731bee26a95e7c8f4ce9ed9738db601b01edb82f4b3808873e1f153a6d4a0c97be0babbe65abc0f8d52
 DIST github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.4.0.zip 90474 BLAKE2B 2f79f0cac2c15acaeae764aeb640534f58ec2ae86fe88a82533498e718cf37d67c563606090ad39b38e22ffca1e63a25cd881d6a472b862ddaf150c7d329b16a SHA512 a047ba8d5f529d459fb6ae8dd39367e6f6cd2e785e90f54a5f8759ff76e4cfff990f1b8c1e0cf49c67b97ca8de36ecf8fdeb3b8f16e579aeae2d563d38da69db
 DIST github.com%2Furfave%2Fcli%2Fv2%2F@v%2Fv2.2.0.mod 183 BLAKE2B 43fea991eaa4bf055a796d40ee3a72557fca99711c698b3ef2feec5d175ff6cd1af486f7e3b08c6f95b6035ea5a6c9bd76478264102ce85cb0bf08f22b841957 SHA512 4630a9172936eba1e550a8f6e95847faff6c2a3687900143cb8ad593df1b1f7f793969efb94dbf42a529074f6a4049554773157c3bc4eb7179f435d0af317c90
 DIST github.com%2Furfave%2Fcli%2Fv2%2F@v%2Fv2.2.0.zip 3449475 BLAKE2B 5eff2b47efe3fc06e2b99b939997554e58fc2548310656f990cc44dc1787d061a4bcfdf6010a20bd9d469c6b66dbf16dabc205357f28cd46322a2442a1c3c093 SHA512 087961c76752484ae4be8d7f0b79538638428e35ec47db185f57a6ec07e3b60d55873ee0801919b169acd5a1e36c5150613e528fc051910eafa362830791fda4
 DIST github.com%2Fwadey%2Fgocovmerge%2F@v%2Fv0.0.0-20160331181800-b5bfa59ec0ad.mod 35 BLAKE2B 37259015d6e78647e4bae8cd5be6c9b49824fb31b641093bd17cb2a0d3ad0d0f01b6b4634988b6ae81bc6b3c4bd4e5907aa3066566397e6e7ed2227302ff8eb6 SHA512 4b15d52818e6cbffb54542844afa76c5b6a2b8c30ead35d3c8b77cfc40f143bcda269fe6c22191b41f9185966b61761b09e74b3109cdf2601a0d92489c976856
 DIST github.com%2Fwadey%2Fgocovmerge%2F@v%2Fv0.0.0-20160331181800-b5bfa59ec0ad.zip 2832 BLAKE2B d7ddd1d9d4c2e4e5219db98b3c85fe1e5fcc229aa90569ad20d68489951fbf08df3a4ea14339894d7d888e9287685e197564a42cb602934a0899c5e154b9855e SHA512 976ddf67ea97ba65839c3b6c89fbfdbfcc93b8e4358eebca0d50bad112f2428c81e178442f41d2ead9ec2b4c6bcfb6319d4d52e882944c61073ef0da442f574b
 DIST github.com%2Fyuin%2Fgoldmark%2F@v%2Fv1.1.32.mod 41 BLAKE2B 44917ea3a6fc533933ccd76d1594e19246c682d96311e030eeeeaeac3c126f6cd2c2de67ca410c89738918c5ab0594f1e9b2c2202c48f462c368ad31fb5feff6 SHA512 b7d81f5cbf1b55ebebcbb86ae89899ffec6fcd730144f1719947a76080f587d298d0e37a073a8768d7768ef64fc47b1673104335203a32a557f31e42a4e5a950
 DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190308221718-c2843e01d9a2.mod 88 BLAKE2B aec7d0eea1278eb3d1568d5bfb4041267501ad14457ebfcbdbc5fe21473170b8616ca4028f52af2edbfd85922cbe04540b4b0df7f69f63197698143cc5557a7a SHA512 2df49895053b36fed7ea905aa73f86568fbafd79ff0a7976679d8c77cf15025129435d9dbfd89367b611b1aadbea4f4bd1835eb4efa9ea702466e443638d379e
 DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20191011191535-87dc89f01550.mod 146 BLAKE2B 6fe18cbe4eb6c3f6c26a4d2f9f309c48eb9ea59017125179cbfd61bb1e62395515c8cb286e1139fbcf54d37dcb2baa1a2f98dcfbcb6178b7f7df3b51929ff5c5 SHA512 f40c7b620b28b5bdc6ce92d43768af71b5869e7f0eb7872dd0f2751eed2bd15a17f7af26bf2dc5c6f7e6b816a174d010bfd22b3f8f5dd72f22dc4e4357dea842
 DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20200622213623-75b288015ac9.mod 155 BLAKE2B 8bba3353db8ceb3b9fe40b8fd59aacde169776a4a553a069a04836bbf15e5a9a8d7a2d39feed98dac6cb890198180fda39f26b528ff95f24c5b2bbf6601b45c3 SHA512 7c5a755a03063d47d259fda0a6c2faa63c2f30b98dbac583e106aaa817d6cde3e07551e0b5e08f3a25db4c4ca45a23cebe993ae6f3d39c88deeaf2c7d8086a06
 DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20200622213623-75b288015ac9.zip 1874261 BLAKE2B d31130353795828e794c9a0fbadafb9d745947d03c7e826fe7cc70f14002f60fb6f2f2699a875fb49b37ac3419b22b484bf95b86522b936b8136d4c627b24c2b SHA512 cdb474720f4b2b0357ac218297be03b967ccf068b05c11bc8eff60cf5383ff8738b0ebb87459a64643f3f8aac2f73967dbf616a51685ba48ecaeb15898851cea
 DIST golang.org%2Fx%2Fmod%2F@v%2Fv0.1.1-0.20191105210325-c90efee705ee.mod 159 BLAKE2B 7124b4e21f0b1ff142fe4cd5c57a22de7bc5b1c578e16e8661085d475d67573279c1ce3165e05a28c77a41eac43fe29b1d98854abdcc7b0b66167f82db652dd8 SHA512 5e225da646ef87b8bf435b745313187cecd1bd3e88660f8a90cd2a6fdcadbe8fc51f53edae4b3aa2357ad273a8e58034920bb61a1cd5898b95d3fe39f30ec648
 DIST golang.org%2Fx%2Fmod%2F@v%2Fv0.3.0.mod 214 BLAKE2B 9a9c23e4a6fbf1e2168cc2559ab0eea14e2a1bbf32cab7eb95e276c3c1f2e06dadf6c58e39a4722211fb882e48f25a8de2969422590c62851292747f1da76b02 SHA512 16d72a943c436bf27c18ee65deb1e1a3b1283dcfcc76a49f01919df97f41ae6ef7c5fe7f95b5bb62cf6f6fee57eb9654ca27ec3bae448ebfe894f8d6d0101fa1
 DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190404232315-eb5bcb51f2a3.mod 119 BLAKE2B e042b2716739483252c3340451b2c3c7b421fdf8d6b3e0333e979802fca66159596982ea63a24b6a64457b2757a0ad24cbb9ea032bab4c5377edf84a3ea18b97 SHA512 26b6c92eecd2208967336d4d23f8a71f77f9a73643ad1e5cd84dee36b2f626fffc806e4dd33acc284831a0961e2b363d898a747903235945fbfb665c5b4d5ef2
 DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190620200207-3b0461eec859.mod 181 BLAKE2B 95ef87cbad118eb6bfc963893e37a555067b7fcf70e52cf4261de029eb46b739b12f50530a46fb91ec9119febcf5033176324a55064f589c17b240a23a15bb4a SHA512 2794c616072f01ca3324107aad2ed97e05f6e6c1e9811a1749073376a89c9ce57a910cfdc8dd6bdc2583d133bb53605c7a68917eaa221ec5c1c8319e5dfbb236
 DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190923162816-aa69164e4478.mod 181 BLAKE2B 95ef87cbad118eb6bfc963893e37a555067b7fcf70e52cf4261de029eb46b739b12f50530a46fb91ec9119febcf5033176324a55064f589c17b240a23a15bb4a SHA512 2794c616072f01ca3324107aad2ed97e05f6e6c1e9811a1749073376a89c9ce57a910cfdc8dd6bdc2583d133bb53605c7a68917eaa221ec5c1c8319e5dfbb236
 DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200202094626-16171245cfb2.mod 181 BLAKE2B 95ef87cbad118eb6bfc963893e37a555067b7fcf70e52cf4261de029eb46b739b12f50530a46fb91ec9119febcf5033176324a55064f589c17b240a23a15bb4a SHA512 2794c616072f01ca3324107aad2ed97e05f6e6c1e9811a1749073376a89c9ce57a910cfdc8dd6bdc2583d133bb53605c7a68917eaa221ec5c1c8319e5dfbb236
 DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200202094626-16171245cfb2.zip 1499901 BLAKE2B c60f861c6531bcfe3b3ba34efc287605a9e7089a7fcb98546a3b9ea46dc982821d3233d613c96d4e4660ca00923cdbc1593d94469fff552882ab83e3eb35d2c0 SHA512 8585cf85ad230928be11a456d2153f918d8403da892e1ccf0b638d0f79e2edbf30d9e18e687c33dba4d486ef743226c5f8ed23ef96b14f6c8910aa550b2e0f3b
 DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200625001655-4c5254603344.mod 181 BLAKE2B 05d6754fa387bac4a6481ad34fb7b681064fc6443b3f70cba316fe2fd0896050e4a772fd8e1be655130a00bb5feaded4725ffea1c5dd6ba55ba55315aaae34d2 SHA512 54d242da2536da38e292b62a955b3961f7b0a9789fe36c5f7ae93577eeac734a6e5bac21a657cf71d488395278cd7683db538e16a9c853835277a800a9d43471
 DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200625001655-4c5254603344.zip 1503434 BLAKE2B fbe488dcc21384cecc664d4316702cb7d6d64511f7a5cd7645ba7c5b277c42e17574c21cf584644e3890dbbd6dd1a242267406c617c6c69285b60e629020d3f0 SHA512 0bb5a5bff662443e54bc1896896985f10dc0cf8b1307bf9a31136e1b3257ee6ae9cd8f3abe779a101f50b7fb70f07203fd803d737e83d26da634e73937e8cc3c
 DIST golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20190423024810-112230192c58.mod 25 BLAKE2B 01f7f78a0324ca728efd4d662ea130d7e200ab25805125e472720ca01feaaf2625b15bf53f51837a6913e35e060a19018928a38851d7445f39e6e42e237dfda2 SHA512 a9dd073f69c5be1153aaab6e84dd3bb1610a0df8b9882ca4c486c6625d4b5201e5032f86e5014421358dff564d93c4e67f20e5fd1d21ed5e259ddfbc90af43c0
 DIST golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20200625203802-6e8e738ad208.mod 25 BLAKE2B 01f7f78a0324ca728efd4d662ea130d7e200ab25805125e472720ca01feaaf2625b15bf53f51837a6913e35e060a19018928a38851d7445f39e6e42e237dfda2 SHA512 a9dd073f69c5be1153aaab6e84dd3bb1610a0df8b9882ca4c486c6625d4b5201e5032f86e5014421358dff564d93c4e67f20e5fd1d21ed5e259ddfbc90af43c0
 DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190215142949-d0b11bdaac8a.mod 24 BLAKE2B 64a70c4594f5d3c37d962c1ed07630fba8abeaf534242f8f1509af271684499252af9a2320d5bac8e44064dba344b807535e4e9dd085fc0fb47bd9304120601a SHA512 ffe50fccf7f1d200f2ebc805b190e3f10c5a3184458a38f4590e520d7ce115e1520fbabe56651bbdc2e08da4a8db5ac86d0e88728efde3ab26c64ab4e0cd604c
 DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190412213103-97732733099d.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
 DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190924154521-2837fb4f24fe.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
 DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200323222414-85ca7c5b95cd.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
 DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200323222414-85ca7c5b95cd.zip 1470272 BLAKE2B 9a8bbb988370bedc24428e6c78f42a9ba44dbb852ce91c3d7fc54e83678b72b9177e67c955c49dc8ef7a1e2e214475a2e55c53254469e3426ec271e90ec9e2d5 SHA512 e46ef76fe4a1628def4c6a291003b64cf11185c0214427af9c49b9ff3af99f258488d49e887206a9c8652784228d822665c5841ce87d6ff993e95ea3d0494129
 DIST golang.org%2Fx%2Ftext%2F@v%2Fv0.3.0.mod 25 BLAKE2B 31009af0fdcd0f8730c9985287e6e364ec4e5183e57e92560dbc80a2010eced51b8a90f01a82b49384268c8a0adbf69d179c205d3f68e0eb459169d2ea9528f0 SHA512 ca081ef7cccd7bbedc6843fbe0c452352661a07e1298cd02ff338ed79d807c6401d613a3cf20011189d2f98a794ffa410547b3e352eb58a6f0a84822285d391d
 DIST golang.org%2Fx%2Ftext%2F@v%2Fv0.3.0.zip 6349244 BLAKE2B 0aa464ac7b7d17fa7ec0627b64cd2301ed4f2819f837807db7a55725950dacb40be899b5148b07ea31b51530818edcccc6444a9800755e1d369ba8f1bce949b0 SHA512 982d78f580a7eac99a0c51e6f1fd2b2c3b91f56cd5e2b96fe960510049f7daf5915264f73f55f05675eee232a52998f9667fa84a9ccba15ed7819e4c93f583a7
 DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191119224855-298f0cb1881e.mod 212 BLAKE2B ab1d99a25eed3af5426d8a58d249b827e4d30a046302df72c7e0b59955e65b636f4645c5c436bb21ec54ec3745b9996bce92d29826ad93cbc9120a06dc19b49a SHA512 6a0316ac3b01aba3f186b5db540a368ab780a821252f7f0975f9e44afea9170c4b3e7027dc5f79a54ebc6af290cbb59b876d3b53bbf26fd05fc3a80a06fae109
 DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191216052735-49a3e744a425.mod 267 BLAKE2B d21181b3e1491ef78b09fc3546ed8ffbfeb7a4578039aaa24e2f5cc2352885c1a4d7dbfaf2853c421daa2a06691ac47513b5f186d31893fb1ef476cf9d4bb9bc SHA512 91b0380c7073eac4442bfd1924d311fc7b50b098ec4c72ea72fcc831273012326a44245add9b05a90895be46d11052ddcc942ea6bb909bda51d782f95acddff8
 DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200809012840-6f4f008689da.mod 271 BLAKE2B 0db774e0a6eb6f5a689dec79257cf2571c5897939c1a313284797523b817ac950ac5c5a6a5ce9ce013d21bd436e2856771ccda706e31bb300788f0c67cf31473 SHA512 8eaf3fcaae282863d851f958000614a0ac6e8fd57847a842dde206a5f18cad1b492b5600e3f183be7d31944823015610682f5007df531005717b94980e9189c0
 DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20200809012840-6f4f008689da.zip 3267394 BLAKE2B 18cfa37fb8e2c8ebec5da0067c1105fbb1fc4f197ff9bf8c37c6913b1138d087ec2ff7d26d9ecb5a0fb1939c32c5fd4a55db965b650ce01e157a2920d3790386 SHA512 9b6c484761c80e65e4379d87feee33824a9a65640c485a7c613ef60954b1eac1f644252d1457989b4bbd4c8a8359e0a86a2138920ab3dcea4d1f86238a13e2ff
 DIST golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20190717185122-a985d3407aa7.mod 37 BLAKE2B 7449be81e1998a6439070de1a0ddf5bfd1e4971c90c2e358590a9c1c41128bfc1daa42a9bbc3709506df2442ec8420e6354343a095c837be46335c180083f28a SHA512 659d18a7a3a1be45ff6dc9e7475276b82ee7f11c47d39b0c237d7f872836a1dbdfff0902f21d6cd8093663997865da92e3e5a4acf1ad6129f972dc5e667b4f05
 DIST golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20191011141410-1b5146add898.mod 37 BLAKE2B 7449be81e1998a6439070de1a0ddf5bfd1e4971c90c2e358590a9c1c41128bfc1daa42a9bbc3709506df2442ec8420e6354343a095c837be46335c180083f28a SHA512 659d18a7a3a1be45ff6dc9e7475276b82ee7f11c47d39b0c237d7f872836a1dbdfff0902f21d6cd8093663997865da92e3e5a4acf1ad6129f972dc5e667b4f05
 DIST golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20191204190536-9bdfabe68543.mod 37 BLAKE2B 7449be81e1998a6439070de1a0ddf5bfd1e4971c90c2e358590a9c1c41128bfc1daa42a9bbc3709506df2442ec8420e6354343a095c837be46335c180083f28a SHA512 659d18a7a3a1be45ff6dc9e7475276b82ee7f11c47d39b0c237d7f872836a1dbdfff0902f21d6cd8093663997865da92e3e5a4acf1ad6129f972dc5e667b4f05
 DIST gopkg.in%2Fcheck.v1%2F@v%2Fv0.0.0-20161208181325-20d25e280405.mod 25 BLAKE2B 6470f3d94700c4d8b3176d692bdb91646750f2c6a866ff2ef4183aff1de01f024a8757f97b4626ec0355092e5f25e7ded91cd5be845f627d107c58b1daf400d7 SHA512 9ac0f80ef05881387cb2f48f81560f3207fe586ea16495383662e6d62e43d93fac01dfe72e1d0063d3ab065331dab3a8098d7da4f1830ba1aff6f27f8e1bc1b2
 DIST gopkg.in%2Fcheck.v1%2F@v%2Fv0.0.0-20161208181325-20d25e280405.zip 39844 BLAKE2B b3dab69dbd1ebb999938c12595de7007dce9431cfeaeb5e77aba80c49918d1a4edf7fb95279e9b66686cb45deaf57a011c083e55fb66ec2c614582ba323954da SHA512 97c96a92ec86372c2f06141c30bceaa86ed62c1db34696f9542f43f3411cb0a37dea654de923a5ee054e603198179b9048e3b477da140e4092ffadc4525b9241
 DIST gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.2.mod 95 BLAKE2B adb3684980f1d8e6c23444e91028f8db55f1bc496114eb3508dbecf9917dbc8a0a4bed7c0d761123335a75b9ffe727e180f2d6aa5f84312edb05a798185c8362 SHA512 916ff67ddb6c2ba39905db4277ce42596d9ca5a42f8aa7f47f16335e78d91a1b30419fd1b7b6967b37e248363397ec527b38d2f500b3546edda5d2bce1944379
 DIST gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.2.zip 78275 BLAKE2B 139c8eb7c405dddbb67321eacd25c0af1e5b3f031831266abf6a8e5a5ed12f6381778868383c03433f8ef760d6b42ffbff40150f2fee91dedd0b312f9fe81c7f SHA512 3214b38f348921f6a6d9ef93d4337bb90abd0d101d69d16ad8e38415c22d3b9a85bda873df2eb7a271f9b973ef38b74731405e522e1bb8083c78932762cb5535
 EBUILD cli53-0.8.18.ebuild 4615 BLAKE2B 7d166a5d2a3213a41fc99ca6eb4a5b17e4371cc14ba3523cf193fd036f635526a6d1302eec8b1673a874ce45e86a229aaefbf6e648ae6db6d5b484e2917f5226 SHA512 679c079a35ecd8404d4da337596643fa2dad7a453c7a50971ce0bf9a69ad48b346630a31977cf66f2599b101b2cb2bdb8b72e9cb183ef76e09328fdf1489867a
 MISC metadata.xml 392 BLAKE2B b2f039b5d8aac9d0c7fa74b2d8241668c3eaf40c8711acb8a333ed38066e83b8a730a6bd79ae0f34b48ce3e66ab119eae9acda11bce766c77c6a4dd4cc842fa7 SHA512 5f7e4c7576c1182bb8e45c15e7f093ea71f245b675f59340632aa2d00b499f44f988956047c48b14ac3e2981ee0b38609f4be30d1fdad6267b61c4fdf0741446
--- a/app-admin/cli53/cli53-0.8.18.ebuild
+++ b/app-admin/cli53/cli53-0.8.18.ebuild
@ -0,0 +1,107 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 EAPI="7"
 inherit go-module
 EGO_SUM=(
 	"github.com/BurntSushi/toml v0.3.1/go.mod"
 	"github.com/aws/aws-sdk-go v1.29.19"
 	"github.com/aws/aws-sdk-go v1.29.19/go.mod"
 	"github.com/bobisme/gucumber v0.0.0-20181101035029-55b04af03920"
 	"github.com/bobisme/gucumber v0.0.0-20181101035029-55b04af03920/go.mod"
 	"github.com/cpuguy83/go-md2man/v2 v2.0.0-20190314233015-f79a8a8ca69d"
 	"github.com/cpuguy83/go-md2man/v2 v2.0.0-20190314233015-f79a8a8ca69d/go.mod"
 	"github.com/davecgh/go-spew v1.1.0"
 	"github.com/davecgh/go-spew v1.1.0/go.mod"
 	"github.com/go-sql-driver/mysql v1.5.0/go.mod"
 	"github.com/gucumber/gucumber v0.0.0-20160715015914-71608e2f6e76"
 	"github.com/gucumber/gucumber v0.0.0-20160715015914-71608e2f6e76/go.mod"
 	"github.com/gucumber/gucumber v0.0.0-20180127021336-7d5c79e832a2"
 	"github.com/gucumber/gucumber v0.0.0-20180127021336-7d5c79e832a2/go.mod"
 	"github.com/jmespath/go-jmespath v0.0.0-20180206201540-c2b33e8439af"
 	"github.com/jmespath/go-jmespath v0.0.0-20180206201540-c2b33e8439af/go.mod"
 	"github.com/miekg/dns v0.0.0-20170818131442-e4205768578d"
 	"github.com/miekg/dns v0.0.0-20170818131442-e4205768578d/go.mod"
 	"github.com/miekg/dns v1.1.31"
 	"github.com/miekg/dns v1.1.31/go.mod"
 	"github.com/pkg/errors v0.9.1/go.mod"
 	"github.com/pmezard/go-difflib v1.0.0"
 	"github.com/pmezard/go-difflib v1.0.0/go.mod"
 	"github.com/russross/blackfriday/v2 v2.0.1"
 	"github.com/russross/blackfriday/v2 v2.0.1/go.mod"
 	"github.com/shiena/ansicolor v0.0.0-20151119151921-a422bbe96644"
 	"github.com/shiena/ansicolor v0.0.0-20151119151921-a422bbe96644/go.mod"
 	"github.com/shurcooL/sanitized_anchor_name v1.0.0"
 	"github.com/shurcooL/sanitized_anchor_name v1.0.0/go.mod"
 	"github.com/stretchr/objx v0.1.0/go.mod"
 	"github.com/stretchr/testify v1.4.0"
 	"github.com/stretchr/testify v1.4.0/go.mod"
 	"github.com/urfave/cli/v2 v2.2.0"
 	"github.com/urfave/cli/v2 v2.2.0/go.mod"
 	"github.com/wadey/gocovmerge v0.0.0-20160331181800-b5bfa59ec0ad"
 	"github.com/wadey/gocovmerge v0.0.0-20160331181800-b5bfa59ec0ad/go.mod"
 	"github.com/yuin/goldmark v1.1.32/go.mod"
 	"golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod"
 	"golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod"
 	"golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9"
 	"golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod"
 	"golang.org/x/mod v0.1.1-0.20191105210325-c90efee705ee/go.mod"
 	"golang.org/x/mod v0.3.0/go.mod"
 	"golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod"
 	"golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod"
 	"golang.org/x/net v0.0.0-20190923162816-aa69164e4478/go.mod"
 	"golang.org/x/net v0.0.0-20200202094626-16171245cfb2"
 	"golang.org/x/net v0.0.0-20200202094626-16171245cfb2/go.mod"
 	"golang.org/x/net v0.0.0-20200625001655-4c5254603344"
 	"golang.org/x/net v0.0.0-20200625001655-4c5254603344/go.mod"
 	"golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod"
 	"golang.org/x/sync v0.0.0-20200625203802-6e8e738ad208/go.mod"
 	"golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod"
 	"golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod"
 	"golang.org/x/sys v0.0.0-20190924154521-2837fb4f24fe/go.mod"
 	"golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd"
 	"golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd/go.mod"
 	"golang.org/x/text v0.3.0"
 	"golang.org/x/text v0.3.0/go.mod"
 	"golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod"
 	"golang.org/x/tools v0.0.0-20191216052735-49a3e744a425/go.mod"
 	"golang.org/x/tools v0.0.0-20200809012840-6f4f008689da"
 	"golang.org/x/tools v0.0.0-20200809012840-6f4f008689da/go.mod"
 	"golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod"
 	"golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod"
 	"golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod"
 	"gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405"
 	"gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod"
 	"gopkg.in/yaml.v2 v2.2.2"
 	"gopkg.in/yaml.v2 v2.2.2/go.mod"
 )
 go-module_set_globals
 DESCRIPTION="A command-line tool for Amazon Route 53"
 HOMEPAGE="https://github.com/barnybug/cli53"
 SRC_URI="https://github.com/barnybug/${PN}/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz
 	${EGO_SUM_SRC_URI}"
 LICENSE="MIT BSD BSD-2 Apache-2.0"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 # gucumber is required to run tests which is not yet packaged
 RESTRICT="strip test"
 DEPEND=">=dev-lang/go-1.14"
 DOCS=( CHANGELOG.md README.md )
 src_compile() {
 	GOBIN="${S}/bin" \
 		emake install
 }
 src_install() {
 	dobin bin/${PN}
 	einstalldocs
 }
--- a/app-admin/cli53/metadata.xml
+++ b/app-admin/cli53/metadata.xml
@ -0,0 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
 		<email>whissi@gentoo.org</email>
 		<name>Thomas Deutschmann</name>
 	</maintainer>
 	<upstream>
 		<bugs-to>https://github.com/barnybug/cli53/issues</bugs-to>
 		<remote-id type="github">barnybug/cli53</remote-id>
 	</upstream>
 </pkgmetadata>
--- a/app-admin/hcloud/Manifest
+++ b/app-admin/hcloud/Manifest
@ -1,5 +1,5 @@
 DIST hcloud-1.20.0.tar.xz 790040 BLAKE2B ba0d62c8e817daadaa9eb891adb3f655a9ae33b05617449e26b09a3ba6b99a6b6f61df1cf29138a008a7ee58e45efdfe07c408af89efb1c2bd870d7340976bb8 SHA512 5dbb9060595e836ccde99984783954e894f74c098f911ae8c4cc1944d444fd28b6f722bb711d9b1ae245ddf3af8cca1939585ed778c8026fbf8c4201c2d15469
-DIST hcloud-1.22.0.tar.xz 826148 BLAKE2B 1e1c35b0aa7f17e0a986ec4c859ae20dcf8b3e77547e648236cde995b5cd6ded63d3c56af9e884097896c8b52f1c3fcaec46b3947cf6ba9ce05337af091babdd SHA512 d10df05fe62d0680fa45e0e2afc6c2990890ff34e25c220fe5de73416bb21c732200e96d8c5822f704488c3df9333e19ada520b1861613aab6f946e2a238c560
+DIST hcloud-1.22.1.tar.xz 910672 BLAKE2B 51e18c530964677bd0cef8232c68031f3186b83fe0da91e8c6572b95130df32e5b00de6e734fb6cce56a51b6fca6136bb306d33ad4a6c728aac3d0afe634c738 SHA512 365823e779f526ae9cbbb50ecaed557c5a838b6614208e4d03e7eadb9569a2e2156e05e019aea2623a811defda707b8822d0eb09a4bfd7006262bd6a19e09aae
 EBUILD hcloud-1.20.0.ebuild 712 BLAKE2B 989221cd61ab4500042665da2679e7f611c9a7db8ce4f38ce81ee40be0d292c4be438846cf643bc056f3785889adba86765a6ee7845ec66cac15481933d9b8ce SHA512 761fa5b38c983a29cd12c069d1c79b141f88b077071351935b670c87e5534a96c9436c8dbd4479ef8401811539c2ab5124b62fc0eccb07a53a85980f9b6622a5
-EBUILD hcloud-1.22.0.ebuild 713 BLAKE2B 1d3c6e47bac7202f60f52182a6e0c1c9fbdf29599dad88592fbf7e4786a2972fab2013e7283d3c3583dd4c7dc08f1dad45c8b1fac525c433107aab3685a40a09 SHA512 a02fc4c5453e1f4786eb226ed2811c7c5de4393dc0f9f8cb5807caa3be9a86cd45de92fc5ec7638c6b5a6536c8ec02822fec782b75912defdd21e8111a8cdd24
+EBUILD hcloud-1.22.1.ebuild 713 BLAKE2B 1d3c6e47bac7202f60f52182a6e0c1c9fbdf29599dad88592fbf7e4786a2972fab2013e7283d3c3583dd4c7dc08f1dad45c8b1fac525c433107aab3685a40a09 SHA512 a02fc4c5453e1f4786eb226ed2811c7c5de4393dc0f9f8cb5807caa3be9a86cd45de92fc5ec7638c6b5a6536c8ec02822fec782b75912defdd21e8111a8cdd24
 MISC metadata.xml 337 BLAKE2B b05bca1fb33b8d8d66798d3fa410b5a00bd63fc245d29c76d812415dcfd38d6e86187c5ea74500debdac3715b559289881b4bcb5cdb1dc4d1ffcde409d666b6b SHA512 e3b82ce2611ece38238d64baa5424f680c406cfa491037024af80dbb3b2e9e6737ab5756d732852b6749a132aee61701116515fd3fb52c597ceea255534c7f2a
--- a/app-admin/hcloud/hcloud-1.22.1.ebuild
+++ b/app-admin/hcloud/hcloud-1.22.1.ebuild
--- a/app-admin/metalog/Manifest
+++ b/app-admin/metalog/Manifest
@ -9,6 +9,6 @@ DIST metalog-20181125.tar.gz 39472 BLAKE2B 64d90835d50c7cb10ab2bf2708d00189b9f8c
 DIST metalog-20200113.tar.gz 40276 BLAKE2B f2fcaccf610f3b7f1974aa97f2c7b5181f3c625c9e28d72832ba1570cfa369873887c83468bcea6a9f3d3080356bd1dd62849ec34a5d03c1272ada7f476946f6 SHA512 d399d86f988c69c9f74553cd682a5fe04886bca458e6f8bb3132fe1fb9f522510a428cfde8af0857c5ba22531b276b04fa05183e0006c2d28ef0f0aead488f93
 DIST metalog-3.tar.xz 360784 BLAKE2B 951841d423769cd97e14985e15d5a2499ca351e082c0effe28dc16d46db91235b7ef0448fe32d38b2ed5b53011d04b3375dc87c2a859c49bede2ae177ec16954 SHA512 2ac614bb85fe466308c4ced0842fdab5f056eda60e892189a8220719f1e06a72fce3c76842a2ac8c63a6808c20d8b7a7d8676896e14f7f54e40630ecbd21e289
 EBUILD metalog-20181125.ebuild 1578 BLAKE2B 1395f79b4c7e48e26e882aea0ce93be12416dca6422541c487ae90088b52d14869163f537ae69c0c804b6688f4486b55e9766efc536babfe26e8d60d4a129850 SHA512 9ba876486c43812467cb088d2134ec8ff331a6f98910bfc3d2ad318f59a930710248366a81d31461e8d6787f09be7ce576b67671a0a74c228065c2a8086979f5
-EBUILD metalog-20200113-r1.ebuild 1593 BLAKE2B bf42784531f869cbc52aa2900e0812c7380edaf5eadb81b9ebd7c3ac6eb0c4a5c42db8d20bc5236dbbbd6dd4e3ed2024689384459fca782b074803a2ec13ed77 SHA512 c2abb6816bb91da920e9ad7634f80ac689dccc15b496bc3ab7b6e385085d132ffda5ba5553b95c9259137680846ef9864e1929b21e9fb59dae881f7c106910cb
+EBUILD metalog-20200113-r1.ebuild 1590 BLAKE2B 6d83b89925d61264614dd7cdbbe1c74c5e9af7f6a06cd80483dcc1ce44cf23b2dfef2a6e2bd48ba7444f01d6bd5a9ef7e42fb7332d1c01b0523d6bd65ce5f48e SHA512 7399486d54730df84ce216e079cfac32fa4c76ed780a2d9e451209f648f9bf38ca20870a26811a66a1658cfee2542677ff47be271a42900405950b9d6c10ab4d
 EBUILD metalog-3-r2.ebuild 1460 BLAKE2B 10fbcf16b9e38a7029a53014f4c600037e2a88938e2b0fc57607d9dce707657b62bd817636621755b082c305e0b99f24ca12cf727620996f006ea268eea8cc2a SHA512 1bf49fb973a34761572998faa71cba319356cd40a06bc1399c3dc20b0521b9588175a4c96107dbae8726ce10f20065d5640fb7ff5e348e9e20cc64e4cba06202
 MISC metadata.xml 334 BLAKE2B 2d9ae46fcede549cabba6654513afcb6bee8ea22ba48bdc910c7b136e4d27bf6e223db5b13501b275790ecbf4fcbcb4ebf5ac9b6b81c6fa098e2f2c402793b0b SHA512 14ef6878732ffc5d14d1d27cec55ec886e76969e016ce8a009cafffa0b8d4e470c1b0f2480da5aaf0ed885c101b20d5edd7ce333efb9bc6f0bf56462e7260b37
--- a/app-admin/metalog/metalog-20200113-r1.ebuild
+++ b/app-admin/metalog/metalog-20200113-r1.ebuild
@ -10,7 +10,7 @@ SRC_URI="https://github.com/hvisage/${PN}/archive/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin"
 IUSE="unicode"
 RDEPEND=">=dev-libs/libpcre-3.4"
--- a/app-admin/superadduser/Manifest
+++ b/app-admin/superadduser/Manifest
@ -2,5 +2,5 @@ AUX 1.0.9/superadduser 13973 BLAKE2B 4458ad50a2699293ef2e5ff9cc63051d91d0892f394
 AUX 1.15/superadduser 15878 BLAKE2B c55c30e217e5df3f6802f80dba9350fc114004fce3e228f1da95954947839f8a2ef164914e3a320f201f2c9fa3c8f4747eada8c58edc7cedac068ae15ea9bdf8 SHA512 0187b3d85f6f8ff956c3612ad937c9645d8d6423382def5ae00a9528bad1c9d06a1c0ef01e12da010de2c2eac527eac26282d1ff5c71492671c14ebd5923827b
 AUX superadduser.8 517 BLAKE2B 25817073bfd4effb62fb18a8a7721cffe9dd376d88734a3dea337ba9c6cfc3ad4663c56e44bf44ce70ddf23113d3691e6ffdaf6bd5a6eb67add357fc47d46d06 SHA512 f07bc575a8ee89b2fcc27714eac4ad5c7129dedc2fa927d5490735109594f81dbe0fd7057f5c1317f3aa1905a1ac5a51e589d5eb9484b528b0174380e6c3297f
 EBUILD superadduser-1.0.9.ebuild 488 BLAKE2B cf56953bbb821e88b3baf4cde060c494c135a5144dcb0ec2b80d2d4a6ff90e2ceb2956c7d38ce92e797f4a6c5c688ed022c77b37376edb2f65d5d5495ccb1950 SHA512 4f41dea9fb109e0a9757989422f35d694e1caae1b4d3e340c283d5f6f113f3306b7c0de8a57738849ed1dbfc436782ad2964f177591d4c4f4f97eb0618e83596
-EBUILD superadduser-1.15.ebuild 493 BLAKE2B 0741c2cb55660a28519adc41783db7f1433d6e48c6cb5db566447021497085e1f585b5babf992a4024aa7d2d45a788ad9bff2f8ef1b4c66bc02970bc3f30b00c SHA512 8999f35eeaf92ca29cec48f4aa3e0b2683731bae0c33743a775afcecd271889cbf83dad61777f7764fc14e07c6127c4364280633b5692febb7c4e65fa5893701
+EBUILD superadduser-1.15.ebuild 490 BLAKE2B e6a5dc912002d2b105d84a374fa4e1f1c1c9877e1b26ed2b5e114925ee7eb37c92dd3a2271081f63fd75a86f3f9099e01967372576cda57e2c8f0913c7c7c141 SHA512 9a1381f59bb8c349c0b7be17ea63d70109ef294cc8192fdbf4925411a7caa05870c04c592156f36f7bef2c31c0c4fbbfbe682cb13aeaf1d761bd6b0e590bbb12
 MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555
--- a/app-admin/superadduser/superadduser-1.15.ebuild
+++ b/app-admin/superadduser/superadduser-1.15.ebuild
@ -9,7 +9,7 @@ SRC_URI=""
 LICENSE="BSD"
 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 ~s390 sparc x86"
 IUSE=""
 RDEPEND="sys-apps/shadow"
--- a/app-antivirus/Manifest.gz
+++ b/app-antivirus/Manifest.gz
--- a/app-antivirus/clamav/Manifest
+++ b/app-antivirus/clamav/Manifest
@ -22,5 +22,5 @@ AUX tmpfiles.d/clamav.conf 33 BLAKE2B 447c5ad4ad79bc70fc386833fa763451d30bf30f1a
 DIST clamav-0.102.4.tar.gz 13234444 BLAKE2B 7109da3e2281472032777b8a9d14ca6ff345aead33e5aaf0b9d1ff4721459926062f789dd1f7e8637155e4b9f3bce9f78127bf450f32baf3f1006b8083d3431a SHA512 29893deb8d2d913dff72331875d3dc3a10356bfb254ddfe1c1933b3ea4f8b76c96a1b840f95e72be36cbc0e00b9ec35e395225ef264761f53e709bb1026a4f09
 DIST clamav-0.103.2.tar.gz 13387954 BLAKE2B de0ececd2fe4486d2e8194dbeb45bfb74086ab3eb45fcab7590e75aa5a2242981066a4e8fa99b571cf7278f4516d986ad1a24254a8fe2c5caf4c870b3179c4b6 SHA512 87d47c4529a57da0b47b3744a279996ca24fa74ce10d7e27a53c19c1e13098af680e0e48ed767122bb2bbd3f927302451da84ccf51a933e7e3556ef43cbe9f45
 EBUILD clamav-0.102.4.ebuild 6960 BLAKE2B 6dac663098f2b873fd67d9d7777e927c87cd5d77c05564931d400f86e1de607ddc7189e028f2642584845c9d4d1e39788c0c82f18ee786ab27f654f6390e6190 SHA512 6faf340c187fff0e91e7cf011f624a0245ecd053976ceabec8337d72d32a2e1489f8bd0908632d6563a2828874c95456806a7a734d0692f61448d73df548de4f
-EBUILD clamav-0.103.2.ebuild 7363 BLAKE2B c23f6231021920fa662b52eac841b61987193ae522647de9f176381d38963232933e21227ba2adebac9a6f0800ce11be6303abf222e11803819175fe11a3202a SHA512 43bde7b4bd5448930d8b439e7b8586908920ceea11b40bb11e686e275eb5bbad25837b490565becb952064e26d9bcebca1f9731c3640d4f2d1eb4e92adb5c4d4
+EBUILD clamav-0.103.2.ebuild 7362 BLAKE2B b4f8434d4d0e33c74528e3dd67e47b95b4becc390890f09286a82085a8a29516e79c4ee0c1a0981231b33a47767eb33370a36857c3e717b048b0ba15b5d55e21 SHA512 13e66d3ea9911c6c3cb4af4af8f281fa3e956ad63d684b7a1a4263173131d4d3b54c62b3e3260d43e26719a57ed47fe8c2ba56e6cfd75cfcc51fd9637fde54d7
 MISC metadata.xml 933 BLAKE2B 867499e23131bf714cdddd911ef727dc6e487be8c6f0be1985611bc2ce8bfbee639e114f8ade6a6b9418095d03a45095030168912ab21484da81385c53255b05 SHA512 c0a3132dbfafbdb8852d621de187cfbd5daa30ab682593b88c77278e0c8a58fb57ed1427b9f8aa798926ccc94db4a19eeec77915f06de9b0cd182237aa77a892
--- a/app-antivirus/clamav/clamav-0.103.2.ebuild
+++ b/app-antivirus/clamav/clamav-0.103.2.ebuild
@ -11,7 +11,7 @@ SRC_URI="https://www.clamav.net/downloads/production/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
 IUSE="bzip2 doc clamonacc clamdtop clamsubmit iconv ipv6 libclamav-only libressl milter metadata-analysis-api selinux systemd test uclibc xml"
 REQUIRED_USE="libclamav-only? ( !clamonacc !clamdtop !clamsubmit !milter !metadata-analysis-api )"
--- a/app-arch/Manifest.gz
+++ b/app-arch/Manifest.gz
--- a/app-arch/dump/Manifest
+++ b/app-arch/dump/Manifest
@ -1,6 +1,3 @@
 AUX dump-0.4.46-openssl11.patch 3324 BLAKE2B 5cc60ef04e7f53e96e900bc78e41f4c4bcf46f3000663ac7bb1995856b5cf067c69d84331b5dfd52da4ef2649e61f6e410e59f9a99bff3be44f9e46df1b75b4f SHA512 ae7c2549683a4cf33760685fe5b07ca88b158e81f5e3b866e58f618dced4c5909dec231d07a1df590a5ebbbc9f0eee575e63f4ffae719afe01315d53d63a76b0
 DIST dump-0.4b46.tar.gz 578200 BLAKE2B 91102bdba06f3affdf4ebd9de525145c0a4cc1b9fb4c6ff222c411c118b3b7835f3aad666d530019d8b9ee46590e4a283a143d188d6800218100cecf67877274 SHA512 a30e72ab6c4d18497dffe3d25634c2e55ca90861d1cd8a6c0fd44709e735a217dbf4cdabb8c80e02053def94d9a22cf1d685ee0d0f24f5b748ee5f0de19cf17d
 DIST dump-0.4b47.tar.gz 583380 BLAKE2B a5a6c507fc67451e6ce5117b28b9e97e45783059358c357e1f6d4b268437c8340f13e0d77e97631112824eca8205c49d206a8a7904bc3e00b1f0d5abb31418f7 SHA512 e9c567fe2ffad196b9657c551d83f7607758f3704cad6cb407514bbe2bc765c16968997dc3a5bc92b9eb5900fa5bd6e7cebc92c81afff53339fca92891a5259d
-EBUILD dump-0.4.46-r1.ebuild 2204 BLAKE2B 4b3c3330641d1b450dc4b074902a20cd042ae2ca7974d07fe041ef3504daa7c9c598b1a572c238d0637be1168adbaa6f1d726e9f7a8337bb84e1a1b14de221e5 SHA512 9231cca4d70a776f1aeea7bd8fb3864af52b191fba5afd0ee76c0914971d9887c810189d7e6b3a55cdbcf6159a218638db4a17a2e30d0ea8163dccf714afb092
+EBUILD dump-0.4.47.ebuild 2205 BLAKE2B f33dd05e219610738dcdc06a49450932bcfc205f69604e407bc81f7d37a2d555cf30bcafbb55fb280f3e1f7ea8c3066983cf857399c9ce503a0f61d9def0435e SHA512 3317a307a1b5bfc507a56aeacd25b00d0ba05ae5a0a1194a0493c7ca501d6568a8e037912080208ff323fe056ccb8f1992004d84f0638c54826cae2a94b52cef
 EBUILD dump-0.4.47.ebuild 2206 BLAKE2B 00a64b5b28f0ae4f0f6243d2d1c34102e1f22c8b9a0e15c23b47578eccb3605d6aeed13dd6c1a123ec6953c46606eb8d84f0573a7ecbc94e6e6d622444e467e7 SHA512 ba25f8c5fd912be6ef996296178e1e85660288e5f3384ff4d39d083acbf2fb76c823921a563c9aef590ac89b2665ebefd031eeb4f9eecbd02d4f2100db35a40f
 MISC metadata.xml 442 BLAKE2B 2538d02cfc5053f384863f9b9eb06d0d143d5e53e6e5155d1b242b943fa9255afbb244cac5f79de78ac9bfe38197b1fe86d1c67602d7d2bbf63fa29424e56333 SHA512 37d2ba01ab35909dab9b0f96ea9f8de02ab9999d7da7724d04b4e5430a4d133ccec1cbd007fe9a6cbba619d39dcd66b48dc93b61cc1afa030b541574b7a75957
--- a/app-arch/dump/dump-0.4.46-r1.ebuild
+++ b/app-arch/dump/dump-0.4.46-r1.ebuild
@ -1,94 +0,0 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 EAPI=7
 inherit flag-o-matic
 MY_P="${PN}-$(ver_rs 2 b)"
 S=${WORKDIR}/${MY_P}
 DESCRIPTION="Dump/restore ext2fs backup utilities"
 HOMEPAGE="http://dump.sourceforge.net/"
 SRC_URI="mirror://sourceforge/dump/${MY_P}.tar.gz"
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~alpha amd64 ~hppa ~ia64 ppc ppc64 sparc x86"
 # We keep uuid USE flag default dsiabled for this version. Don't forget
 # to default enable it for later versions as this is the upstream default.
 IUSE="bzip2 debug ermt libressl lzo readline selinux sqlite ssl static test uuid zlib"
 RESTRICT="!test? ( test )"
 REQUIRED_USE="
 	ermt? ( ssl )
 	ssl? ( zlib )
 	test? ( sqlite? ( uuid ) )
 "
 RDEPEND=">=sys-fs/e2fsprogs-1.27:=
 	>=sys-libs/e2fsprogs-libs-1.27:=
 	sys-apps/util-linux
 	bzip2? ( >=app-arch/bzip2-1.0.2:= )
 	zlib? ( >=sys-libs/zlib-1.1.4:= )
 	lzo? ( dev-libs/lzo:2= )
 	sqlite? ( dev-db/sqlite:3= )
 	ermt? (
 		!libressl? ( dev-libs/openssl:0= )
 		libressl? ( dev-libs/libressl:0= )
 	)
 	ssl? (
 		!libressl? ( dev-libs/openssl:0= )
 		libressl? ( dev-libs/libressl:0= )
 	)
 	readline? (
 		sys-libs/readline:0=
 		sys-libs/ncurses:=
 		static? ( sys-libs/ncurses:=[static-libs] )
 	)"
 DEPEND="${RDEPEND}
 	virtual/os-headers"
 BDEPEND="
 	virtual/pkgconfig
 "
 PATCHES=(
 	"${FILESDIR}"/${P}-openssl11.patch
 )
 src_configure() {
 	append-flags -fcommon
 	local myeconfargs=(
 		--with-dumpdatespath=/etc/dumpdates
 		--with-rmtpath='$(sbindir)/rmt'
 		--enable-blkid
 		$(use_enable bzip2)
 		$(use_enable debug)
 		$(use_enable ermt)
 		$(use_enable lzo)
 		$(use_enable readline)
 		$(use_enable selinux)
 		$(use_enable sqlite)
 		$(use_enable ssl)
 		$(use_enable static static-progs)
 		$(use_enable uuid)
 		$(use_enable zlib)
 	)
 	econf "${myeconfargs[@]}"
 }
 src_install() {
 	default
 	mv "${ED}"/usr/sbin/{,dump-}rmt || die
 	mv "${ED}"/usr/share/man/man8/{,dump-}rmt.8 || die
 	use ermt && newsbin rmt/ermt dump-ermt
 	dodoc KNOWNBUGS MAINTAINERS REPORTING-BUGS
 	dodoc -r examples
 }
 pkg_postinst() {
 	if [[ -z ${REPLACING_VERSIONS} ]] ; then
 		ewarn "app-arch/dump installs 'rmt' as 'dump-rmt'."
 		ewarn "This is to avoid conflicts with app-arch/tar 'rmt'."
 	fi
 }
--- a/app-arch/dump/dump-0.4.47.ebuild
+++ b/app-arch/dump/dump-0.4.47.ebuild
@ -12,7 +12,7 @@ S="${WORKDIR}/${MY_P}"
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 ~hppa ~ia64 ppc ppc64 sparc x86"
 # We keep uuid USE flag default dsiabled for this version. Don't forget
 # to default enable it for later versions as this is the upstream default.
 IUSE="bzip2 debug ermt lzo readline selinux sqlite ssl static test uuid zlib"
--- a/app-arch/dump/files/dump-0.4.46-openssl11.patch
+++ b/app-arch/dump/files/dump-0.4.46-openssl11.patch
@ -1,91 +0,0 @@
 Index: dump-0.4b46/common/transformation_ssl.c
 ===================================================================
 --- dump-0.4b46.orig/common/transformation_ssl.c
 +++ dump-0.4b46/common/transformation_ssl.c
@@ -215,7 +215,10 @@ generateIV(Transformation *xform, unsign
 	/* to be exposed to any attacker anyway. */
 	*saltlen = 16;
 	if (xform->enc == 1) {
 -		RAND_pseudo_bytes(salt, *saltlen);
 +		if (!RAND_bytes(salt, *saltlen) != 1) {
 +			/* PRNG not sufficiently seeded */
 +			return -1;
 +		}
 	}
 	memcpy(ivbuffer, salt, 16);
@@ -274,7 +277,7 @@ ssl_compress(Transformation *xform, stru
 	digestlen = sizeof(digest);
 	/* generate salt, put it in header */
 -	generateIV(xform, salt, &saltlen, iv, &ivlen);
 +	generateIV(xform, salt, &saltlen, iv, &ivlen); /* TODO: check return value */
 	memcpy(tpbin->buf, salt, saltlen);
 	/* compress the buffer first - increase the entropy */
@@ -351,7 +354,7 @@ ssl_decompress(Transformation *xform, st
 	// how to know salt length?
 	memcpy(salt, src, saltlen);
 -	generateIV(xform, salt, &saltlen, iv, &ivlen);
 +	generateIV(xform, salt, &saltlen, iv, &ivlen); /* TODO: check return value */
 	EVP_DecryptInit_ex(xform->state.ssl.dataCtx, xform->state.ssl.cipher,  xform->state.ssl.engine, NULL, NULL);
 	//EVP_CIPHER_CTX_set_key_length(&ctx, 8);
@@ -515,7 +518,7 @@ Transformation
 		//EVP_CIPHER_CTX_rand_key(ctx, t->state.ssl.key);
 		//EVP_CIPHER_CTX_cleanup(ctx);
 		//EVP_CIPHER_CTX_free(ctx);
 -		RAND_bytes(t->state.ssl.key, t->state.ssl.cipher->key_len);
 +		RAND_bytes(t->state.ssl.key, EVP_CIPHER_key_length(t->state.ssl.cipher));
 	} else {
 		// how do we get keys?
 	}
 Index: dump-0.4b46/rmt/cipher.c
 ===================================================================
 --- dump-0.4b46.orig/rmt/cipher.c
 +++ dump-0.4b46/rmt/cipher.c
@@ -23,7 +23,7 @@
 char *
 cipher(char *buf, int buflen, int do_encrypt)
 {
 -	static EVP_CIPHER_CTX ctx;
 +	EVP_CIPHER_CTX *ctx = EVP_CIPHER_CTX_new();
 	static char *out = NULL;	/* return value, grown as necessary */
 	static int outlen = 0;
 	static int init = 0, which, blocksize;
@@ -71,13 +71,13 @@ cipher(char *buf, int buflen, int do_enc
 		}
 		EVP_BytesToKey(cipher, EVP_md5(), NULL,
 			buf, strlen(buf), 1, key, iv);
 -		EVP_CIPHER_CTX_init(&ctx);
 -		EVP_CipherInit_ex(&ctx, cipher, NULL, key, iv, do_encrypt);
 -		EVP_CIPHER_CTX_set_padding(&ctx, 0);	// -nopad
 +		EVP_CIPHER_CTX_init(ctx);
 +		EVP_CipherInit_ex(ctx, cipher, NULL, key, iv, do_encrypt);
 +		EVP_CIPHER_CTX_set_padding(ctx, 0);	// -nopad
 		OPENSSL_cleanse(buf, sizeof buf);
 		OPENSSL_cleanse(key, sizeof key);
 		OPENSSL_cleanse(iv, sizeof iv);
 -		blocksize = EVP_CIPHER_CTX_block_size(&ctx);
 +		blocksize = EVP_CIPHER_CTX_block_size(ctx);
 		which = do_encrypt;
 		init = 1;
 	}
@@ -95,7 +95,7 @@ cipher(char *buf, int buflen, int do_enc
 		outlen = (buflen+blocksize) * 2;
 		out = realloc(out, outlen);
 	}
 -	if (!EVP_CipherUpdate(&ctx, out, &n, buf, buflen)) {
 +	if (!EVP_CipherUpdate(ctx, out, &n, buf, buflen)) {
 		syslog(LOG_ERR, "EVP_CipherUpdate failed");
 		errno = EINVAL;
 		return NULL;
@@ -106,6 +106,7 @@ cipher(char *buf, int buflen, int do_enc
 		return NULL;
 	}
 	// assert(ctx->buf_len == 0);
 +	EVP_CIPHER_CTX_free(ctx);
 	return out;
 }
--- a/app-arch/unrar/Manifest
+++ b/app-arch/unrar/Manifest
@ -3,5 +3,5 @@ AUX unrar-5.9.3-build.patch 943 BLAKE2B 1f482772b491269413e11e600e049ed608ccb4b0
 DIST unrar-6.0.3.tar.gz 232331 BLAKE2B bcea5219daf8338cbb73fc43131d1c7e7a4c576164a30d79352d1bb3a96b3c66fd190dc40a5149b9bf38e723c0654bc5d5d45e246276c2ea18c1c8dc9904e555 SHA512 1ec20e7a122cb7f48936c691a8c3dc96b4dd989aa8416e6a96332733a0839490996baa22f709af3eb07be17e5987d871f995b5dbc36284cb951bed8047bdfb7c
 DIST unrar-6.0.4.tar.gz 232379 BLAKE2B 39382eeb71cafdeaa608ef497c44cd88d950d761e5c8395a224b2bdd530328a0060dec658aec943f9af8e135ce29cf86c3522ed17799f869cd0d84cbd7acc74a SHA512 9d2beb39fa0e3c60298b482967f1ae51d8a6531c88f5b8b053cc8905c033c0235cabb776d8449f9d96da6b81946167b84d19acdf93dda7ada14cc3c53bb7df19
 EBUILD unrar-6.0.3.ebuild 1876 BLAKE2B 48c22bf05ee8de9f2116f6b6284c0fa3c2b2e27d6ca6ea565e5cb547e76cb00c6af9e40912b823f0e6e301f57f1f4dd16eab25684e9712cb5a0a77c6d306bc55 SHA512 9244574ddda6372ba486383f135948fe30cf824b84ab4bc175a71194623ce75aa21c2e4c8ca96c07a704b356af03f8d2a61407b10db937f21822c86ab534f6c6
-EBUILD unrar-6.0.4.ebuild 1885 BLAKE2B 1e81beb6752c5dc7a1bafe0f6e056cf0b261f4aa520e521631f94ef34677a54819d74fe86e35258e7c8851dd9475f134acc7dca72e1a5ac6722784cff9a60fa2 SHA512 4596865f5e35d1bdbe6444498f1236e019e2178ce3b647775fd5fcc638f2bdf6830fc8505ec3e10ff8457d52529e4630eb06df5ea544773cd743d42117e1c091
+EBUILD unrar-6.0.4.ebuild 1884 BLAKE2B 0762aa53ee530c0e51577149a11bcdaf077efce265e0cd2fb2c5ecb4970c4521f3a8122446390c3987167146cd8996f62225ef1420848f29a05524a816e59885 SHA512 7ee592a5000ca67a8e4b499c37eeda60c12f367cdf343fccab7fc35d73db9fc8db6b5d651fb4b105cdbf0c161a0a2246f49d28371dabeb8b0b706784471116a5
 MISC metadata.xml 512 BLAKE2B 260947f2fad1c57508f689b2db22fff72276f40fb91789cfd0b0a2ae63d6710ed186d6350e4a23d19566e3469a097294f95074810652d61cb752a54dfe92ac80 SHA512 4a8c151dbda173dada5635cbd844459a1d999c6c41a2e140a09ba31536e1856d896141471c65b5cb52c9c92229f55c211e01ba23b975f4d25442ffc55ae6a13d
--- a/app-arch/unrar/unrar-6.0.4.ebuild
+++ b/app-arch/unrar/unrar-6.0.4.ebuild
@ -14,7 +14,7 @@ SRC_URI="https://www.rarlab.com/rar/${MY_PN}-${PV}.tar.gz -> ${P}.tar.gz"
 LICENSE="unRAR"
 # subslot = soname version
 SLOT="0/6"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x86-solaris"
 IUSE=""
 RDEPEND="!<=app-arch/unrar-gpl-0.0.1_p20080417"
--- a/app-crypt/Manifest.gz
+++ b/app-crypt/Manifest.gz
--- a/app-crypt/gnupg/Manifest
+++ b/app-crypt/gnupg/Manifest
@ -1,7 +1,10 @@
 AUX gnupg-2.1.20-gpgscm-Use-shorter-socket-path-lengts-to-improve-tes.patch 1048 BLAKE2B 36f37b74da309100191f4d8f9c27d08a1b00d2d30fbaf169dbb74ebbe42293357a4fb62332e286fe5725dcfdc30645a602dc2a51c51924b06215b68fd5235658 SHA512 fd12827150e96cd7979ea9611d64ed4ab9e6c61cfecdd697b8fb4d162f20985b734c2bfc365a921809b9029e86a85a9b36c10ec472b3dd49c25ea18f5aef56ce
 AUX gnupg-2.3.0-sqlite_check.patch 1860 BLAKE2B e5d808932e9a72dff63d9776ccc55bdb9f28e5c9e1d0a58a46980a0c62e90f206cef5b94bf5492d96faa2e927b7b0933a90e924095e5f75be5f4cba3abe3cc7c SHA512 6c67368629fd47ce17c1e3564e8b2e4d1c5f844ce641462b833a2346853b9fc086258d525fc82adc3e778a140e450071159a44894ed230f995c480696c390190
 DIST gnupg-2.2.16-scdaemon_shared-access.patch 2586 BLAKE2B 42fd5482c4e86751ce62836125997c2295c44bc5db0671a06460fd306b2ed93f290fb898fc1b1e463a863eddf9ab5f99ea3c90a55499ef45ca1ed6edf2854663 SHA512 38abaa4200114ae6b6f220fabc0a84a056761949c97bd0564557f4411a299b9a1939893555c27e26da2d8e8da4bc97a298fa7e68f1e80fe99c3f88cc329eaa84
 DIST gnupg-2.2.25.tar.bz2 7195857 BLAKE2B c930edf9259a0e1c508af8d76a86f979860adfe2c525020b37d3741679200f96483f0ad8bc1f72e2dbf7fe77696cd04d4272a2ee23e4c4abe1ed6ba88b95f365 SHA512 ab1d7cc9d8be3e7189bc4bea431b9d5db313cbd1739823950f32fbb611b2f4374889f444efbf43ce1fbf498b9865d7e6e953cd4c86d58fd688f63923c434ea2c
 DIST gnupg-2.2.27.tar.bz2 7191555 BLAKE2B d652aad382cf07cc458b29ff82718edd47457d8236dcbeee51f22d88503be141f009e9ea45b6dafe614115d9558fe371509579e58ce17a5f04540a31aa406ea3 SHA512 cf336962116c9c08ac80b1299654b94948033ef51d6d5e7f54c2f07bbf7d92c7b0bddb606ceee2cdd837063f519b8d59af5a82816b840a0fc47d90c07b0e95ab
 DIST gnupg-2.3.0.tar.bz2 7557228 BLAKE2B 10a1e37a7f6aa3d429905b3e048e69b8e321dd616e3a26b0f778c3bd9e8298562ade439f7e27b8605ed155e55a0939c35a7b8554f8a89eb33cdb724506126fdf SHA512 f8d2b31e9ae750b132ecb7b478be52cdb7628a5806967a2ee3be19d3e955c3f64214997b168b1ec00caa6830c26711f2ea8430cc6269d6b980b21239186ba29f
 EBUILD gnupg-2.2.25.ebuild 5276 BLAKE2B 6fdbf1498cadd72d16cbbc8a0a6d453480112f502f9fd77d71c6d52486ff5388e30c05d69b4b204e3eb1866f57053da13238351093fd8cea791cd57d7360a1fd SHA512 9efd4650a42fef0b1107a74170d6e432305f3b1f36c87c65646901e2fc650de3efa10d30602be5abf81f821d6f8f0abbb4bc10f522deb10ac89317c23363b3c2
 EBUILD gnupg-2.2.27.ebuild 5168 BLAKE2B cc9ad82a855cb56a630aa043537fe44fadbfece92cc09205996ba4cc3f3ca000534f7b11c29da543ec923b118d24bc23b490ce6ea29b09a799d17b36e387f855 SHA512 3f1377ad593d19580e953ef426dd23f23ae2fab65d8e6bcfee58c09605086fc0a2f2d2432b5d33ed70685ebb87561801a6b3dbf781d585aa59b6e8c9fc0dd81e
 EBUILD gnupg-2.3.0.ebuild 4831 BLAKE2B 093098049196bd759fdf6f5b40db207eb7e7e061fda3fff3faf76d204d45f04d3cf25f4268ce5edf58dfdc4ff116dd6bd89d5ef7e37f03c06e74193ba42b4938 SHA512 0d90cc64ae9d2ad09ae4732d1f617a3e7f178453c3c137dff6ad96efe0ac5dabd37e98e1fbd20ad602211088da7d0069faadb9a405655411555b704770a9e5a6
 MISC metadata.xml 1379 BLAKE2B e51735e46f2b9ade13d8aa53c1354b1285904933c260efef8e0d6d66e7b8a36199f33ab48cc98006e75e566a21422883dc3694d91e1dcbf1e7c413ba7dab557f SHA512 cd71918f048d081e7a223b9b09b0089b3e015aef674ef233c2aff43e1325ac61a3bd2bfa828071dd157fea0f5ec76ee719ccd339cf94539e3702d48ba6ecd5d4
--- a/app-crypt/gnupg/files/gnupg-2.3.0-sqlite_check.patch
+++ b/app-crypt/gnupg/files/gnupg-2.3.0-sqlite_check.patch
@ -0,0 +1,62 @@
 From 58aa0e8547a29e147f3d9d1792117d96bc00ffda Mon Sep 17 00:00:00 2001
 From: Lars Wendler <polynomial-c@gentoo.org>
 Date: Thu, 8 Apr 2021 11:05:36 +0200
 Subject: [PATCH] gnupg: configure.ac: Fix sqlite3 detection
 or else --disable-sqlite has no effect and linking later fails with:
  keyboxd-backend-sqlite.o: in function `show_sqlstmt.part.0':
  backend-sqlite.c:(.text+0x42): undefined reference to `sqlite3_expanded_sql'
 Signed-off-by: Lars Wendler <polynomial-c@gentoo.org>
 ---
 configure.ac | 23 ++++++++++++-----------
 1 file changed, 12 insertions(+), 11 deletions(-)
 diff --git a/configure.ac b/configure.ac
 index 9cf0c6a7f..d46469cbb 100644
 --- a/configure.ac
 +++ b/configure.ac
@@ -969,18 +969,20 @@ AC_ARG_ENABLE(sqlite,
                                [disable the use of SQLITE]),
               try_sqlite=$enableval, try_sqlite=yes)
 -if test x"$use_tofu" = xyes ; then
 -  if test x"$try_sqlite" = xyes ; then
 +AS_IF([test x"$try_sqlite" = xyes], [
     PKG_CHECK_MODULES([SQLITE3], [sqlite3 >= $NEED_SQLITE_VERSION],
                                  [have_sqlite=yes],
                                  [have_sqlite=no])
 -  fi
 -  if test "$have_sqlite" = "yes"; then
 -    :
 -    AC_SUBST([SQLITE3_CFLAGS])
 -    AC_SUBST([SQLITE3_LIBS])
 -  else
 -    use_tofu=no
 +    AS_IF([test "$have_sqlite" = "yes"], [
 +        AC_SUBST([SQLITE3_CFLAGS])
 +        AC_SUBST([SQLITE3_LIBS])
 +    ])
 +    ])
 +
 +AS_IF([test "$have_sqlite" != "yes"], [
 +    AS_IF([test x"$use_tofu" = xyes], [
 +	use_tofu=no
 +    ])
     build_keyboxd=no
     tmp=$(echo "$SQLITE3_PKG_ERRORS" | tr '\n' '\v' | sed 's/\v/\n*** /g')
     AC_MSG_WARN([[
@@ -988,8 +990,7 @@ if test x"$use_tofu" = xyes ; then
 *** Building without SQLite support - TOFU and Keyboxd disabled
 ***
 *** $tmp]])
 -  fi
 -fi
 +])
 AM_CONDITIONAL(SQLITE3, test "$have_sqlite" = "yes")
 -- 
 2.31.1
--- a/app-crypt/gnupg/gnupg-2.3.0.ebuild
+++ b/app-crypt/gnupg/gnupg-2.3.0.ebuild
@ -0,0 +1,158 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 EAPI=7
 inherit autotools flag-o-matic systemd toolchain-funcs
 MY_P="${P/_/-}"
 DESCRIPTION="The GNU Privacy Guard, a GPL OpenPGP implementation"
 HOMEPAGE="https://gnupg.org/"
 SRC_URI="mirror://gnupg/gnupg/${MY_P}.tar.bz2"
 LICENSE="GPL-3"
 SLOT="0"
 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"
 IUSE="bzip2 doc ldap nls readline selinux +smartcard sqlite ssl tofu tools usb user-socket wks-server"
 # Existence of executables is checked during configuration.
 DEPEND=">=dev-libs/libassuan-2.5.0
 	>=dev-libs/libgcrypt-1.9.1
 	>=dev-libs/libgpg-error-1.29
 	>=dev-libs/libksba-1.3.4
 	>=dev-libs/npth-1.2
 	>=net-misc/curl-7.10
 	bzip2? ( app-arch/bzip2 )
 	ldap? ( net-nds/openldap )
 	readline? ( sys-libs/readline:0= )
 	smartcard? ( usb? ( virtual/libusb:1 ) )
 	sqlite? ( >=dev-db/sqlite-3.27 )
 	ssl? ( >=net-libs/gnutls-3.0:0= )
 	sys-libs/zlib
 "
 RDEPEND="${DEPEND}
 	app-crypt/pinentry
 	nls? ( virtual/libintl )
 	selinux? ( sec-policy/selinux-gpg )
 	wks-server? ( virtual/mta )"
 BDEPEND="virtual/pkgconfig
 	doc? ( sys-apps/texinfo )
 	nls? ( sys-devel/gettext )"
 S="${WORKDIR}/${MY_P}"
 REQUIRED_USE="tofu? ( sqlite )"
 DOCS=(
 	ChangeLog NEWS README THANKS TODO VERSION
 	doc/FAQ doc/DETAILS doc/HACKING doc/TRANSLATE doc/OpenPGP doc/KEYSERVER
 )
 PATCHES=(
 	"${FILESDIR}/${PN}-2.1.20-gpgscm-Use-shorter-socket-path-lengts-to-improve-tes.patch"
 	"${FILESDIR}/${PN}-2.3.0-sqlite_check.patch"
 )
 src_prepare() {
 	default
 	eautoreconf
 	# Inject SSH_AUTH_SOCK into user's sessions after enabling gpg-agent-ssh.socket in systemctl --user mode,
 	# idea borrowed from libdbus, see
 	#   https://gitlab.freedesktop.org/dbus/dbus/-/blob/master/bus/systemd-user/dbus.socket.in#L6
 	#
 	# This cannot be upstreamed, as it requires determining the exact prefix of 'systemctl',
 	# which in turn requires discovery in Autoconf, something that upstream deeply resents.
 	sed -e "/DirectoryMode=/a ExecStartPost=-${EPREFIX}/bin/systemctl --user set-environment SSH_AUTH_SOCK=%t/gnupg/S.gpg-agent.ssh" \
 		-i doc/examples/systemd-user/gpg-agent-ssh.socket || die
 }
 src_configure() {
 	local myconf=(
 		$(use_enable bzip2)
 		$(use_enable nls)
 		$(use_enable smartcard scdaemon)
 		$(use_enable sqlite)
 		$(use_enable ssl gnutls)
 		$(use_enable tofu)
 		$(use smartcard && use_enable usb ccid-driver || echo '--disable-ccid-driver')
 		$(use_enable wks-server wks-tools)
 		$(use_with ldap)
 		$(use_with readline)
 		--with-mailprog=/usr/libexec/sendmail
 		--disable-ntbtls
 		--enable-all-tests
 		--enable-gpgsm
 		--enable-large-secmem
 		CC_FOR_BUILD="$(tc-getBUILD_CC)"
 		GPG_ERROR_CONFIG="${ESYSROOT}/usr/bin/${CHOST}-gpg-error-config"
 		KSBA_CONFIG="${ESYSROOT}/usr/bin/ksba-config"
 		LIBASSUAN_CONFIG="${ESYSROOT}/usr/bin/libassuan-config"
 		LIBGCRYPT_CONFIG="${ESYSROOT}/usr/bin/${CHOST}-libgcrypt-config"
 		NPTH_CONFIG="${ESYSROOT}/usr/bin/npth-config"
 		$("${S}/configure" --help | grep -o -- '--without-.*-prefix')
 	)
 	if use prefix && use usb; then
 		# bug #649598
 		append-cppflags -I"${EPREFIX}/usr/include/libusb-1.0"
 	fi
 	#bug 663142
 	if use user-socket; then
 		myconf+=( --enable-run-gnupg-user-socket )
 	fi
 	# glib fails and picks up clang's internal stdint.h causing weird errors
 	[[ ${CC} == *clang ]] && \
 		export gl_cv_absolute_stdint_h=/usr/include/stdint.h
 	# Hardcode mailprog to /usr/libexec/sendmail even if it does not exist.
 	# As of GnuPG 2.3, the mailprog substitution is used for the binary called
 	# by wks-client & wks-server; and if it's autodetected but not not exist at
 	# build time, then then 'gpg-wks-client --send' functionality will not
 	# work. This has an unwanted side-effect in stage3 builds: there was a
 	# [R]DEPEND on virtual/mta, which also brought in virtual/logger, bloating
 	# the build where the install guide previously make the user chose the
 	# logger & mta early in the install.
 	econf "${myconf[@]}"
 }
 src_compile() {
 	default
 	use doc && emake -C doc html
 }
 src_test() {
 	#Bug: 638574
 	use tofu && export TESTFLAGS=--parallel
 	default
 }
 src_install() {
 	default
 	use tools &&
 		dobin \
 			tools/{convert-from-106,gpg-check-pattern} \
 			tools/{gpgconf,gpgsplit,lspgpot,mail-signed-keys} \
 			tools/make-dns-cert
 	dosym gpg /usr/bin/gpg2
 	dosym gpgv /usr/bin/gpgv2
 	echo ".so man1/gpg.1" > "${ED}"/usr/share/man/man1/gpg2.1 || die
 	echo ".so man1/gpgv.1" > "${ED}"/usr/share/man/man1/gpgv2.1 || die
 	dodir /etc/env.d
 	echo "CONFIG_PROTECT=/usr/share/gnupg/qualified.txt" >> "${ED}"/etc/env.d/30gnupg || die
 	use doc && dodoc doc/gnupg.html/* doc/*.png
 	systemd_douserunit doc/examples/systemd-user/*.{service,socket}
 }
--- a/app-eselect/Manifest.gz
+++ b/app-eselect/Manifest.gz
--- a/app-eselect/eselect-cdparanoia/Manifest
+++ b/app-eselect/eselect-cdparanoia/Manifest
@ -1,4 +1,3 @@
 AUX cdparanoia.eselect-0.1 364 BLAKE2B dbdf0c69f8ab295bed4529d7c2178f4c5bb64862d7192eb37c280eba47fd566fdb1ba60109b3e289e35e9a55b4d6fb32dfe06f19ca51d4cc76df6ced769679ce SHA512 000d15d17432e7fd7d1e6c56b3ac6069f6ae20a08e20f0380879695bbba726102469fda8ef862f3e23fd8878b1a986e60f4d8194cf19a85eb39b6bf5378a262e
-EBUILD eselect-cdparanoia-0.1-r1.ebuild 600 BLAKE2B db394736f3f9dd4c9a256214763aeec17be69d3dc873298815caeeb9502916c36d30d0c6accd88467aa26797370452dc4cf766905124db7dd905336db7807903 SHA512 05cd94d43c2ca663f61ab110999b9375a33322cac4c2845bf9f3b4a14587e46d5277cc4b7ff19b4dc5750c5519774d7166ea6a2a4fc1569186be3b4cf10387bd
+EBUILD eselect-cdparanoia-0.1-r1.ebuild 593 BLAKE2B 6aee86b73d8bcb8b517f192d95a40228e31a4ac03259eeff84ec57f2b9e9aff6a6bab111920585301a117190ae54a0e64b15509f1acfc9adedc9bec9762e6a15 SHA512 24202536930f5a749bc3210ceb0c7d6597276236dde4a48dd3bab6d120508d6eb6d2c07588d2caf7e3a176a21466f499b2ecb020a3225ce9c20ffe7cee858368
 EBUILD eselect-cdparanoia-0.1.ebuild 641 BLAKE2B 556a678fa8d9c287ffe8cbf7940799b8d9fd49db5fa4b9962e720b512c276b53fae9ab3094c15015772830990a2d949d8eb38cbf4d7cedc768d7d3a63ff28e64 SHA512 25f4dd107429823543aacde1f083f7e1aea3976386152cfe263102bef294f45f526486c640ad86755e6166a89d53c96e6646dad78a11b36fd321276a67b9e155
 MISC metadata.xml 277 BLAKE2B 35a106d1d8e47c9f07c219869060cb03d99ffeff39280e946d5e20588db856f81f0d85b88fdc1579f3ffccefff0d8a78b1c5844822a4e89ec35f55e912f6f9d0 SHA512 ad7844b9de76df83b163da2bfda97755433e905fef9609753b7a7e809503cbfee67d115309f66cffbba94ee3175ecfa88e3403ac1103d6bcaa96484c6aca7d0a
--- a/app-eselect/eselect-cdparanoia/eselect-cdparanoia-0.1-r1.ebuild
+++ b/app-eselect/eselect-cdparanoia/eselect-cdparanoia-0.1-r1.ebuild
@ -9,7 +9,7 @@ SRC_URI=""
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x86-solaris"
 RDEPEND="app-eselect/eselect-lib-bin-symlink"
 DEPEND="${RDEPEND}"
--- a/app-eselect/eselect-cdparanoia/eselect-cdparanoia-0.1.ebuild
+++ b/app-eselect/eselect-cdparanoia/eselect-cdparanoia-0.1.ebuild
@ -1,24 +0,0 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 EAPI=5
 DESCRIPTION="Manage /usr/bin/cdparanoia symlink"
 HOMEPAGE="https://www.gentoo.org/proj/en/eselect/"
 SRC_URI=""
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x86-solaris"
 IUSE=""
 RDEPEND=">=app-eselect/eselect-lib-bin-symlink-0.1.1
 	!<media-sound/cdparanoia-3.10.2-r5"
 DEPEND=${RDEPEND}
 S=${FILESDIR}
 src_install() {
 	insinto /usr/share/eselect/modules
 	newins cdparanoia.eselect-${PV} cdparanoia.eselect
 }
--- a/app-eselect/eselect-mpg123/Manifest
+++ b/app-eselect/eselect-mpg123/Manifest
@ -1,4 +1,3 @@
 AUX mpg123.eselect-0.1 343 BLAKE2B 192ca6ef608cbdcab5b5c866515b25dd5e7110479fef2741fc6deed0b809dff3519ef36451cd017f03063381dca5d04023f4d885c5f9db9ee83075059640326f SHA512 b11891308231ff322c0028eca8fcbac999a74c31a26e5e0376195276fc52c210febc21a46a78b23a1ca6099abb27e5ef401d4b3f50de3c98eba3631dabee3593
-EBUILD eselect-mpg123-0.1-r1.ebuild 543 BLAKE2B 6be2f7bdeec1b514379f86715568b8096a78d57ecde7514e7293ddfbe2d0ef198a71b664115cdc22c7d4c066ad1c95a7b548e7fba6420d8e60f516ed573bf4a7 SHA512 cb62397d9fcd04dde9626357a1a1fa9e4f490836589f4c6e39345cd288a45358221fc7334af2190922ac1a11a9851558a91f639a8b09523dfd565615ed90e3bb
+EBUILD eselect-mpg123-0.1-r1.ebuild 536 BLAKE2B c55bd4279fd11b586cad239c42cecf73289935ba7a31a4c3f03f5e61d0f97577d468aabeb9fcde0880f83643a07523d88e2ecadfed78e2fec0db5b7d94d80182 SHA512 a33653d469b7a08412af3d58e17c13f6f513d09cf518f3169db91e398a0849cff89921c643b4716eceeeb047ff704ed67fd63073992c558a8fcdb3471e43cc4a
 EBUILD eselect-mpg123-0.1.ebuild 580 BLAKE2B df20cb73731043fc3a32f11209e0d585078b0caf5d7586d1305dce5ee49d11e10621782c8322ace9fc0aef9e2d3d45fd5fe1598e8fc52325940b55f874ea3a16 SHA512 2ee83de33e741d936fed91cb51eab652ef4751e800092ab7dab7b033a7aaa08c058dd383a4cfe7af1a585d6888bf151840268e7f04231a112f6fccec8eca8344
 MISC metadata.xml 277 BLAKE2B 35a106d1d8e47c9f07c219869060cb03d99ffeff39280e946d5e20588db856f81f0d85b88fdc1579f3ffccefff0d8a78b1c5844822a4e89ec35f55e912f6f9d0 SHA512 ad7844b9de76df83b163da2bfda97755433e905fef9609753b7a7e809503cbfee67d115309f66cffbba94ee3175ecfa88e3403ac1103d6bcaa96484c6aca7d0a
--- a/app-eselect/eselect-mpg123/eselect-mpg123-0.1-r1.ebuild
+++ b/app-eselect/eselect-mpg123/eselect-mpg123-0.1-r1.ebuild
@ -9,7 +9,7 @@ SRC_URI=""
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
 RDEPEND="app-eselect/eselect-lib-bin-symlink"
--- a/app-eselect/eselect-mpg123/eselect-mpg123-0.1.ebuild
+++ b/app-eselect/eselect-mpg123/eselect-mpg123-0.1.ebuild
@ -1,24 +0,0 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 EAPI=5
 DESCRIPTION="Manage /usr/bin/mpg123 symlink"
 HOMEPAGE="https://www.gentoo.org/proj/en/eselect/"
 SRC_URI=""
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE=""
 RDEPEND=">=app-eselect/eselect-lib-bin-symlink-0.1.1
 	!<media-sound/mpg123-1.14.4-r1"
 DEPEND=${RDEPEND}
 S=${FILESDIR}
 src_install() {
 	insinto /usr/share/eselect/modules
 	newins mpg123.eselect-${PV} mpg123.eselect
 }
--- a/app-eselect/eselect-repository/Manifest
+++ b/app-eselect/eselect-repository/Manifest
@ -1,7 +1,5 @@
 DIST eselect-repository-10.tar.gz 7123 BLAKE2B 786255e8b83c1348c16ec6e30495e7a0c305d48430712fd2bba28367d27d0e5eea1fe9176636f7896f48feebb71a9a3daa025fdc2f8032d2e6a3c59bd6b5c0c4 SHA512 4a03e1b9ddf3d8f79429e0a98cd03804867ba4594945ddda518be06c07e6e5737c77b8c57893a8cf5930548c96f0d436786d95bed624041ad52ab603348337b2
 DIST eselect-repository-8.tar.gz 6774 BLAKE2B d22c2befc744e21b7619a490e9c41f1052c4077135ba5247ea9558f15f7dc5c06642dd934c41ad8cb3bedb40398876ea9d508276bde6f214fe06d5f80b19911b SHA512 b1fd13e3bfa323dea7fec53a33865352545a070df472c9db0b2901945a795833eb8a2b7b264005d94fe6e92dce57414a7e995157d28c8d26048bedcbf42adf96
 DIST eselect-repository-9.tar.gz 6791 BLAKE2B 66ca783b66ead0bef0e85839723844147919ca7caf4e66f962a869118bd0f7484ec183c5c7ab0327d960cb8ec9c5aae0d46b5565c121f9df9d3fe90a19426354 SHA512 9bd1f1ce15da01f76248d93d368c133e22ed77aa6dfd778d10295db649783583c203bc6c0388dec712eea5cc38b76b7527528a1e27a6a526f024eaf73e06b6ab
 EBUILD eselect-repository-10.ebuild 981 BLAKE2B 8cf3719cfa9192850304a4406b4a0cad51c2535eafa6917eaf21b65ebd499c2c6da326bf93572cbf2e6b45ea56211cc2e861b72337ea10dac9702323b777b98b SHA512 1cb9075807b851492bd14f0d38fdb5faef3069be20863045ae45a60beb6b50a7902c6e3b95e61d4285729512dd16abdb6ca52f289b27840a390d0de9aa09ca61
-EBUILD eselect-repository-8.ebuild 981 BLAKE2B 8d53a95bdca2f28c61097b1229a90d79b413a229f3e5e978650dbc417c1cc874da4224537b32c4c13a9f14025af0160b81e4507de3d40608b55e0cd8440c5426 SHA512 c7c654e46793a037e7922fedb551263e4017a289a136b068fd6e907803efd162426934c0586ab66a6371695e274f99aa7d930bdedbad9c661a87f6b37e34b09b
+EBUILD eselect-repository-9.ebuild 975 BLAKE2B 2c20086412e71e0fccaea146bc9aaf79b0d81e81fa51a3ef2d048baed86175a4ea0d92e849c80e2a71befdf116e759518fcf095944b784a430c21693c7fcec5a SHA512 58c67bd341b3edfdc09b0eb4234b07700d6b18c921dd8c30e4055ee7bd63ffef19ad0addea87d21ccf52285d3e1d9fc8eb3e214fc6d6711d831baeedffd0a8ed
 EBUILD eselect-repository-9.ebuild 981 BLAKE2B 8cf3719cfa9192850304a4406b4a0cad51c2535eafa6917eaf21b65ebd499c2c6da326bf93572cbf2e6b45ea56211cc2e861b72337ea10dac9702323b777b98b SHA512 1cb9075807b851492bd14f0d38fdb5faef3069be20863045ae45a60beb6b50a7902c6e3b95e61d4285729512dd16abdb6ca52f289b27840a390d0de9aa09ca61
 MISC metadata.xml 361 BLAKE2B 65f6d76855e7205041fd10b416774d373f2cbf3ef3c13ccbad5069edb5f2d980c67cd1f188471df59ce784ff5b8a100c984644dadacaa4ace8d42c22993fc594 SHA512 40082f5d7899074e331edbe92d13784a3ccff5e04f60db71297ded20b2f1cca88e70b1f4fd6cc94e76048b7f3a718b586ced406452d816333e969e64ac5a3c8e
--- a/app-eselect/eselect-repository/eselect-repository-8.ebuild
+++ b/app-eselect/eselect-repository/eselect-repository-8.ebuild
@ -1,41 +0,0 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 EAPI=6
 PYTHON_COMPAT=( python{3_7,3_8,3_9} )
 inherit python-single-r1
 DESCRIPTION="Manage repos.conf via eselect"
 HOMEPAGE="https://github.com/mgorny/eselect-repository"
 SRC_URI="https://github.com/mgorny/eselect-repository/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 LICENSE="BSD-2"
 SLOT="0"
 KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 sparc x86 ~x64-macos"
 IUSE=""
 REQUIRED_USE=${PYTHON_REQUIRED_USE}
 RDEPEND="${PYTHON_DEPS}
 	app-admin/eselect
 	$(python_gen_cond_dep '
 		dev-python/lxml[${PYTHON_MULTI_USEDEP}]
 	')
 	net-misc/wget"
 src_compile() {
 	MAKEARGS=(
 		PREFIX="${EPREFIX}/usr"
 		SYSCONFDIR="${EPREFIX}/etc"
 		SHAREDSTATEDIR="${EPREFIX}/var"
 		ESELECTDIR="${EPREFIX}/usr/share/eselect/modules"
 	)
 	emake "${MAKEARGS[@]}"
 	python_fix_shebang eselect-repo-helper
 }
 src_install() {
 	emake "${MAKEARGS[@]}" DESTDIR="${D}" install
 	einstalldocs
 }
--- a/app-eselect/eselect-repository/eselect-repository-9.ebuild
+++ b/app-eselect/eselect-repository/eselect-repository-9.ebuild
@ -12,7 +12,7 @@ SRC_URI="https://github.com/mgorny/eselect-repository/archive/v${PV}.tar.gz -> $
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
 REQUIRED_USE=${PYTHON_REQUIRED_USE}
 RDEPEND="${PYTHON_DEPS}
--- a/app-metrics/Manifest.gz
+++ b/app-metrics/Manifest.gz
--- a/app-metrics/alertmanager/Manifest
+++ b/app-metrics/alertmanager/Manifest
@ -1,9 +1,6 @@
 AUX alertmanager.confd 135 BLAKE2B 7a3dd341e63a73e9782d44dc59c8a65ea1c855ae0589ce80e616be6d8faf24224f804c564296955487760c155649c184b3132a2741cf30d171c88dcfdd469583 SHA512 391eb26d67310fba9371d274b1e9552cf0c9c02de1e3616c3e5514ae99bf7d36b52c6caa7e94a96f640b0f8542b15b4dded9d59154173c01d4e9a99ec2219fbc
 AUX alertmanager.initd 817 BLAKE2B 74a7e6c292ac52f4d6d00644038e74624be41ed632a6db389a7c226b3a37d43f22f1c8c098d34f652d9b6b9cb407523b375c884e75fe3740578f26e822df21c7 SHA512 34ae9348f5e054543bdbffd29e30d1fb6147d47e74cecb1755c29bf4327bd56ac4fae4cecddf2c515b6ddffbce4ad7151ae3a3e7f283db2d6b74619f5faa44ac
-DIST alertmanager-0.18.0.tar.gz 5181819 BLAKE2B efcc856ccacb97646915e8d622179cf3cc7554351036cf556347ec46cdede5c9223139cb209b52376964c7b19b119f3683f82698d1e7c07b1432bb3e4bb37239 SHA512 59faec308abaac3d2b59198fef25109b208de1a807b38803dc10722ff0caf1bac9d9795005fefb3b4e2acda62be136bfcafe7b9702ae52565021a424f99fa730
+AUX alertmanager.service 730 BLAKE2B 39897ef3ae23ea477066ebbc11d26a561ad1377efd0b58a36685fd1aee4ed3ea0655f5858d41fb6e7c6a49d7695aa1d45da734f62386c4b171e1a5ef83bba289 SHA512 325f894be21dd5eb44397168591f0096a6d0adfa6ff3559541f359e72f49daf3ba08f2db33c4c3b0f0c7ff2052c56bc1f0fa99829c72430c273833013b2633d5
 DIST alertmanager-0.19.0.tar.gz 5862442 BLAKE2B a79336286ca1099dcc73cce897eccaff8d40f8d3140ebf1943a1189cf1d2ec58738cbe7fc02221826ffc0e1535954a11a461ac6ea222113c79a44d43cc9eda83 SHA512 2c21bfbb1001e07e81b1115439ad15e7c0e7089839e56a19c445177e322b8ef9aa2b85e96478f3c3d709cbbd3a5447662a8c55da370b84aa4b6b24f83848744b
 DIST alertmanager-0.21.0.tar.gz 5704209 BLAKE2B 646ac0b05eb194d1c35f49e38c0a206d09a9c45d4f2f7c371a53ecfff5deba6e2c2af82f3f4ce2b591338c557241766395f42b8bd3c91ae2da4ef7e570666fda SHA512 72568407af4e90455975eff504ed49f4877eb517673532f655b6b0459725db5df7bbd1a3be120106c46b30dd7056714cc0b34b46df9c4d8c98e1f8c9eb0c39da
-EBUILD alertmanager-0.18.0.ebuild 1389 BLAKE2B 4757558e01287f8afff1a39c04dfd1cccaaae3ee14584c8196300280acea50393a05b56e6a255cc35cca408464044273e9935e37ecfd03f86ceb17867ac814f9 SHA512 e64b174b7433b0bab0d6c549d470582737a6b138f0d79e042a9bb7e9b7220dcfe5f22652188f159b6a550622a9bd160c6dac34a910ab2f8b0a30ce5ba4910e32
+EBUILD alertmanager-0.21.0-r2.ebuild 1187 BLAKE2B 138a27e405b094ce8d546fbe00837bca014bf21046472275de167d6b4b5eab8282415bac29a1fbd81c2cad43c928b845e6e6c1930c4b30d53cfa889a6a59caf2 SHA512 5514b5c10b1a7c416eb28233146b71fbf8aa82c72d75405c760fc0ede6c6740cf05fc9b79a541483e6bab24c33716ef82e2d0023af746a6f2c3cb94104a461fd
 EBUILD alertmanager-0.19.0.ebuild 1389 BLAKE2B e4845bb46c400e9185c28f13b43432c177a8708bb08cbc36f27ea1c9cb90ca5c8d6172090dc84c156acd288b5f812b5a64ce1668f5aff318d4a59e60c583c329 SHA512 fa273caa4bc24e6cfb118b370605ae0513975c8184f1e14ce98f48fd036d10aa21f0e5b5c45393dbfee0e1f1002c03c3571c09ba1701c6a7fe8a2a0eb2b8802c
 EBUILD alertmanager-0.21.0-r1.ebuild 1118 BLAKE2B 7e51c846ef4939c2cd5aa32581c8b1b9961c7837c9c57b81d3d6fa0370f37d15450d466d91164cd516398445301ee655429027787c18de14a54ed1c30da09f1d SHA512 51a9cf4994c518c4b35387f15e48cfb20a6d9f498e4ac6c92334f0ae1a60a22061d42bbef7a7d172ed09804a61bfbae4bf7c070a1e98cd986bc64169c257d002
 MISC metadata.xml 336 BLAKE2B 2cab21f76be9803ce08848025fd889354e4595fe5195f36361a4b5a2f2bc2e8e3e0c697fef2933db48d178d10f838a960e7ad2a8ea74bae42ebe395a6d150484 SHA512 63a13c6b9bff1f75c79b2c0cf1cb16e4973d58e666e04e1ef50bb746caaea8e5358cb61a39c257c082b67264960dbcc78da5ae24dcad94d7e72f833483c8e5bd
--- a/app-metrics/alertmanager/alertmanager-0.18.0.ebuild
+++ b/app-metrics/alertmanager/alertmanager-0.18.0.ebuild
@ -1,53 +0,0 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 EAPI=6
 inherit user golang-build golang-vcs-snapshot
 EGO_PN="github.com/prometheus/alertmanager"
 EGIT_COMMIT="v${PV/_rc/-rc.}"
 ALERTMANAGER_COMMIT="1ace0f7"
 ARCHIVE_URI="https://${EGO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
 KEYWORDS="~amd64"
 DESCRIPTION="Alertmanager for alerts sent by client applications such as Prometheus"
 HOMEPAGE="https://github.com/prometheus/alertmanager"
 SRC_URI="${ARCHIVE_URI}"
 LICENSE="Apache-2.0 BSD BSD-2 MIT MPL-2.0"
 SLOT="0"
 IUSE=""
 DEPEND=">=dev-lang/go-1.11
 	dev-util/promu"
 RESTRICT="test"
 pkg_setup() {
 	enewgroup ${PN}
 	enewuser ${PN} -1 -1 -1 ${PN}
 }
 src_prepare() {
 	default
 	sed -i -e "s/{{.Revision}}/${ALERTMANAGER_COMMIT}/" src/${EGO_PN}/.promu.yml || die
 }
 src_compile() {
 	pushd src/${EGO_PN} || die
 	mkdir -p bin || die
 	GO111MODULE=on GOPATH="${S}" GOCACHE="${T}/go-cache" promu build -v --prefix bin || die
 	popd || die
 }
 src_install() {
 	pushd src/${EGO_PN} || die
 	dobin bin/*
 	dodoc {README,CHANGELOG,CONTRIBUTING}.md
 	insinto /etc/alertmanager/
 	newins doc/examples/simple.yml config.yml.example
 	popd || die
 	keepdir /var/lib/alertmanager /var/log/alertmanager
 	fowners ${PN}:${PN} /var/lib/alertmanager /var/log/alertmanager
 	newinitd "${FILESDIR}"/${PN}.initd ${PN}
 	newconfd "${FILESDIR}"/${PN}.confd ${PN}
 }
--- a/app-metrics/alertmanager/alertmanager-0.19.0.ebuild
+++ b/app-metrics/alertmanager/alertmanager-0.19.0.ebuild
@ -1,53 +0,0 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 EAPI=6
 inherit user golang-build golang-vcs-snapshot
 EGO_PN="github.com/prometheus/alertmanager"
 EGIT_COMMIT="v${PV/_rc/-rc.}"
 ALERTMANAGER_COMMIT="7aa5d19"
 ARCHIVE_URI="https://${EGO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
 KEYWORDS="~amd64"
 DESCRIPTION="Alertmanager for alerts sent by client applications such as Prometheus"
 HOMEPAGE="https://github.com/prometheus/alertmanager"
 SRC_URI="${ARCHIVE_URI}"
 LICENSE="Apache-2.0 BSD BSD-2 MIT MPL-2.0"
 SLOT="0"
 IUSE=""
 DEPEND=">=dev-lang/go-1.11
 	dev-util/promu"
 RESTRICT="test"
 pkg_setup() {
 	enewgroup ${PN}
 	enewuser ${PN} -1 -1 -1 ${PN}
 }
 src_prepare() {
 	default
 	sed -i -e "s/{{.Revision}}/${ALERTMANAGER_COMMIT}/" src/${EGO_PN}/.promu.yml || die
 }
 src_compile() {
 	pushd src/${EGO_PN} || die
 	mkdir -p bin || die
 	GO111MODULE=on GOPATH="${S}" GOCACHE="${T}/go-cache" promu build -v --prefix bin || die
 	popd || die
 }
 src_install() {
 	pushd src/${EGO_PN} || die
 	dobin bin/*
 	dodoc {README,CHANGELOG,CONTRIBUTING}.md
 	insinto /etc/alertmanager/
 	newins doc/examples/simple.yml config.yml.example
 	popd || die
 	keepdir /var/lib/alertmanager /var/log/alertmanager
 	fowners ${PN}:${PN} /var/lib/alertmanager /var/log/alertmanager
 	newinitd "${FILESDIR}"/${PN}.initd ${PN}
 	newconfd "${FILESDIR}"/${PN}.confd ${PN}
 }
--- a/app-metrics/alertmanager/alertmanager-0.21.0-r2.ebuild
+++ b/app-metrics/alertmanager/alertmanager-0.21.0-r2.ebuild
@ -3,7 +3,7 @@
 EAPI=7
-inherit go-module
+inherit go-module systemd
 GIT_COMMIT=4c6c03eb
 MY_PV="${PV/_rc/-rc.}"
@ -41,9 +41,10 @@ src_install() {
 	dobin bin/*
 	dodoc {README,CHANGELOG}.md
 	insinto /etc/alertmanager/
-	newins doc/examples/simple.yml config.yml.example
+	newins doc/examples/simple.yml config.yml
 	keepdir /var/lib/alertmanager /var/log/alertmanager
 	systemd_dounit "${FILESDIR}"/alertmanager.service
 	newinitd "${FILESDIR}"/${PN}.initd ${PN}
 	newconfd "${FILESDIR}"/${PN}.confd ${PN}
-	fowners ${PN}:${PN} /var/lib/alertmanager /var/log/alertmanager
+	fowners ${PN}:${PN} /etc/alertmanager /var/lib/alertmanager /var/log/alertmanager
 }
--- a/app-metrics/alertmanager/files/alertmanager.service
+++ b/app-metrics/alertmanager/files/alertmanager.service
@ -0,0 +1,28 @@
 [Unit]
 Description=Alertmanager for prometheus
 Documentation=https://prometheus.io/docs/alerting/alertmanager/
 Requires=network-online.target
 After=network-online.target
 [Service]
 User=alertmanager
 ExecStart=/usr/bin/alertmanager --cluster.listen-address= --config.file=/etc/alertmanager/config.yml --storage.path=/var/lib/alertmanager/
 ExecReload=/bin/kill -HUP $MAINPID
 NoNewPrivileges=true
 ProtectHome=true
 ProtectSystem=full
 ProtectHostname=true
 ProtectControlGroups=true
 ProtectKernelModules=true
 ProtectKernelTunables=true
 LockPersonality=true
 PrivateTmp=true
 PrivateDevices=True
 RestrictRealtime=true
 CapabilityBoundingSet=
 SystemCallArchitectures=native
 MemoryDenyWriteExecute=true
 [Install]
 WantedBy=multi-user.target
--- a/app-misc/Manifest.gz
+++ b/app-misc/Manifest.gz
--- a/app-misc/mosquitto/Manifest
+++ b/app-misc/mosquitto/Manifest
@ -4,8 +4,10 @@ DIST mosquitto-1.6.10.tar.gz 613060 BLAKE2B 8c148479f79a1aa8a9abdb2bd386dbf9466f
 DIST mosquitto-1.6.12.tar.gz 618718 BLAKE2B 4e7744d212f0fda980e485d102702547e76b39e4b98904afb05b372af8deba4eaaec2186dc61e8b218808a2435ed81f5fa621ebf41d5877c25b091ff64e8eb8b SHA512 68cd2e4aa14254c0332ad78eac1f885e0e4e9f2332540d3778b8c7df096db7618b8467b5bb25f70ddc3306d01dd36eb9a9e2bf2738da77e196c7a1ccaed869d2
 DIST mosquitto-1.6.8.tar.gz 589873 BLAKE2B aa2e13397f7d4b6305af3180cd042cd143054e154cf8e6d93b05bc5a10d48419174711a1893fe60c1303a2f83cfbc5341cf03ec595e3640f503a2407e869491b SHA512 c15897df4e0979ee29a1e67cc671f56db600a078e9eb0bea376248b3f53b13ceed36616ad3678e2c9e07d6834a6d75e4efca2c40086069c1546e0223be04c071
 DIST mosquitto-1.6.9.tar.gz 610934 BLAKE2B 59d126a2b26be895f078be0c0dcf3513e56fc135dc956d9361ee191bd7ad6972b4692cd1824ad7a4e86a982df70c1e198e937f9ab23bf778069690098f87c815 SHA512 f78228a1e8305e4d89b34250981ed2c5fe5317636003636dc90f6fa2b1e3ca3c8fadb705ee7301f5252456cb093a6547bd46a255ca3d9fb5cdced697738d6eb7
 DIST mosquitto-2.0.10.tar.gz 759106 BLAKE2B 9cf94d29ee52a9086d8be176f5bba12b8b958a758fc03765c95298a5e7752c63510f6e12915a67d92a4e49b3ecfaa897b615b825375540728681bc9d628a992c SHA512 c356bfe5dc9317e1943cf14c20ae52af544aefc0138349abd3be5001032ce63579aa059dd62901a0802f08d059a9dc29b6fbcba852e3c4cd702189433ceac174
 EBUILD mosquitto-1.6.10.ebuild 2889 BLAKE2B 592c7c7439864cdc787843d07862f45aee57532f6a4d15840daeb85ccb8c4b635281832a9b1dc6e1e3b405d71f6e028eda56add7e4e71f4aafa645ee3bda2b54 SHA512 8ddc2378385f2f1da78628edcd41e43f541d5fa03574b82ae6bd766b46f0cee87f1f6edcb893c861536bba306a5aa9454841298cbdc0982fdc952f1c555c40b7
 EBUILD mosquitto-1.6.12.ebuild 2887 BLAKE2B eee9bb7f59b73e59671478cf8099523a565c6539781f4092527b05563a6e7377abb66fa09bd8d675adebbe34e1126cc7ce3afbfc6538277d48797456190b5b26 SHA512 1b7f43fb0a47aff7de08cf12a86e5225d4f6830f480e4ad4c7f8d28aa8582dd74a4575798844ed857aabd575d13b4f2355597ff7df435fe0e387e3388f6e320a
 EBUILD mosquitto-1.6.8.ebuild 2842 BLAKE2B 9c3edb2fd1801aaf523029260906bf36d45a30f8e9170f2530e3e142cfa17e0ab0f1067d40540237e0d4995a5fd98c08272aef92a9d9262226296a4656d1abcd SHA512 b4654f1e54c557188967957e62b4def70a3766948a38a7a7d34f70fbd3aa00944feddb9070ccbcbbdcf93cc39cd6bd2bc2b71700b5476e885e7ae79ffa866775
 EBUILD mosquitto-1.6.9.ebuild 2882 BLAKE2B 3fc6ffca0938013e28973b90dd24be274d31a0699e888ba034a77906ed2c97044d9219a91487cd9ec4d19d07c92b2db533cc1d447f5aeb1e010b1e85911203f0 SHA512 557e802c11ffa1ecdc53da365d3a2773997a4571ecb529f1c8a1ec5e07c63ae0f3790e66a7b1e9ab8fffbf197c2f3490558ffcfc5e8c327c05830e10c812f25e
 EBUILD mosquitto-2.0.10.ebuild 2637 BLAKE2B 29e830f1be95286fd4aa21c93c296fb064b7494f01986441fe645fbdc4d15d6a0bf3f2c13ddc8c5469a644a4718312db39d69d5695849579bc0977d0b47d0f50 SHA512 a14e4f43732068997e6590438426c8b9289a6fdc3de0cd1226b65efb7441913d11a1cf4d263340be6f2416046cad9d36c01f3e8b020765ab585fa39f10317474
 MISC metadata.xml 611 BLAKE2B d40adc8754f0c20b5c0634b75f12df935d246c67d3a9edccb8db262888b5dd6154fbfc21c270b854e61bb0389c625e3608623dcec519e05badc96f1bbdadf38f SHA512 93161a58861a9ea1ab372495fb66bb695d3be5e59dea96418aaf1f5fad936827d7d65a154711ef8c6c9fc752a69fef20c90741ac2627dfdefb8d38d63a3121fb
--- a/app-misc/mosquitto/mosquitto-2.0.10.ebuild
+++ b/app-misc/mosquitto/mosquitto-2.0.10.ebuild
@ -0,0 +1,106 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 EAPI=7
 PYTHON_COMPAT=( python3_{6..9} )
 inherit python-any-r1 systemd toolchain-funcs
 DESCRIPTION="An Open Source MQTT v3 Broker"
 HOMEPAGE="https://mosquitto.org/ https://github.com/eclipse/mosquitto"
 SRC_URI="https://mosquitto.org/files/source/${P}.tar.gz"
 LICENSE="EPL-1.0"
 SLOT="0"
 KEYWORDS="~amd64"
 IUSE="bridge examples libressl +persistence +srv ssl tcpd test websockets"
 RESTRICT="!test? ( test )"
 REQUIRED_USE="test? ( bridge )"
 RDEPEND="
 	acct-user/mosquitto
 	acct-group/mosquitto
 	dev-libs/cJSON:=
 	srv? ( net-dns/c-ares:= )
 	ssl? (
 		!libressl? ( dev-libs/openssl:0= )
 		libressl? ( dev-libs/libressl:0= )
 	)
 	tcpd? ( sys-apps/tcp-wrappers )"
 DEPEND="${PYTHON_DEPS}
 	${RDEPEND}
 	test? ( dev-util/cunit )
 	websockets? ( net-libs/libwebsockets[lejp] )"
 _emake() {
 	local LIBDIR=$(get_libdir)
 	emake \
 		CC="$(tc-getCC)" \
 		CLIENT_LDFLAGS="${LDFLAGS}" \
 		LIB_SUFFIX="${LIBDIR:3}" \
 		WITH_BRIDGE="$(usex bridge)" \
 		WITH_PERSISTENCE="$(usex persistence)" \
 		WITH_SRV="$(usex srv)" \
 		WITH_TLS="$(usex ssl)" \
 		WITH_WEBSOCKETS="$(usex websockets)" \
 		WITH_WRAP="$(usex tcpd)" \
 		"$@"
 }
 src_prepare() {
 	default
 	if use persistence; then
 		sed -i -e "/^#autosave_interval/s|^#||" \
 			-e "s|^#persistence false$|persistence true|" \
 			-e "/^#persistence_file/s|^#||" \
 			-e "s|#persistence_location|persistence_location /var/lib/mosquitto/|" \
 			mosquitto.conf || die
 	fi
 	# Remove prestripping
 	sed -i -e 's/-s --strip-program=${CROSS_COMPILE}${STRIP}//'\
 		client/Makefile lib/cpp/Makefile src/Makefile lib/Makefile || die
 	# Remove failing tests
 	sed -i -e '/02-subpub-qos1-bad-pubcomp.py/d' \
 		-e '/02-subpub-qos1-bad-pubrec.py/d' \
 		-e '/02-subpub-qos2-bad-puback-1.py/d' \
 		-e '/02-subpub-qos2-bad-puback-2.py/d' \
 		-e '/02-subpub-qos2-bad-pubcomp.py/d' \
 		test/broker/Makefile || die
 	sed -i -e '/02-subscribe-qos1-async2.test/d' \
 		test/lib/Makefile || die
 	# Extend test timeout to prevent spurious failures
 	sed -i -e 's/SUB_TIMEOUT=1/SUB_TIMEOUT=3/' \
 		test/client/test.sh || die
 	python_setup
 	python_fix_shebang test
 }
 src_compile() {
 	_emake
 }
 src_test() {
 	_emake test
 }
 src_install() {
 	_emake DESTDIR="${D}" prefix=/usr install
 	keepdir /var/lib/mosquitto
 	fowners mosquitto:mosquitto /var/lib/mosquitto
 	dodoc readme.md CONTRIBUTING.md ChangeLog.txt
 	doinitd "${FILESDIR}"/mosquitto
 	insinto /etc/mosquitto
 	doins mosquitto.conf
 	systemd_dounit "${FILESDIR}/mosquitto.service"
 	if use examples; then
 		docompress -x "/usr/share/doc/${PF}/examples"
 		dodoc -r examples
 	fi
 }
--- a/app-text/Manifest.gz
+++ b/app-text/Manifest.gz
--- a/app-text/vgrep/Manifest
+++ b/app-text/vgrep/Manifest
@ -1,12 +1,3 @@
 AUX vgrep-2.5.0-remove-sudo.patch 293 BLAKE2B ea7e903326134859f2d278d568fd02dd13c75442fb27d9261105638bf6597c5fed819ceb834b50edf57925bb614b57716e3c2ae035bd7552584f27276cde9395 SHA512 8879a73a4afa8b2058409311e6b4a8862f853b6eba1edaa158aefaccef58da32f1067c61f359dc6e5fa8223d4c11a3df126b81c366739c6c0ea5412e4388d29e
 DIST vgrep-2.3.1.tar.gz 1149421 BLAKE2B c4c9a414bba5e509d57faa9ca6f6ce5cae1dbb001ff8b410ad54691ec6bf39f41c535fd25bdd5d93fdf89b4e4b49acf4dfa9a8956653e5c5e2ce39bd7da8d484 SHA512 0fa65151ae40f7fefc4e5b1af8e6ea332b50b1136849ec0902dd110786ca14204441e27c65a036b08fa56bf04a6325d8aa8ef2d4d02cdb0e0fe219896e24d694
 DIST vgrep-2.3.3.tar.gz 1149769 BLAKE2B 59f15e0f2d9fd069b4926cb26a0517cb1d201dccce53d7c6b3ec1954693a3286396e8d4d72e2c3bcc4bb8e70083ba1ea349dfc4bec244caa112fcc2289063c25 SHA512 b745ec24bb5c329a3d0e4e756e54432f3acf9c24f9492339b69850d5a8e688074323d7e56c584e59f3aedf3a41b84997497791512dae2950424eaed56d6b7329
 DIST vgrep-2.4.0.tar.gz 1196159 BLAKE2B f8b6b8166feb17ddeea7978ff14fd729ee395feb9658cbfc838f978f33169c7ca15dcd4008af54582aca25a0803924c508da11603d02e42d1e597a5813f78c3b SHA512 c614b52fe7fa720d3d2bb57830805c1ebb7c47db549aadda9309676b9c286447e693e51f74f969ccd0450934510bfe79c1603717022dd69c9f7f2709cbfd4465
 DIST vgrep-2.5.0.tar.gz 1355064 BLAKE2B 7a724fed16ec4589ace159dd5dcbea8e4450393f2c356430d9e8e87b799191b06137e20f2d0c32c53b71ff79d5abaa5551f6254ef6989631d9f6b9d771a5fe18 SHA512 95ee8ff1ca705cec8deaabf8e20d39df23dbac1ab797d025ca253904bcb7f4cbedda3ef052d006064c8d652c06b50cc3e5e532108b23a95511ee7b85b8abb3d4
 DIST vgrep-2.5.1.tar.gz 1355092 BLAKE2B 82b9da137400ede07b3fc2472168139385df8ee639aa0ba34832d20e437ac3da5a86f89fcc9139faa0ca3a037a358a50947b982473d114056483aaf9cfdde52e SHA512 97561ac933fa8a716c9205910d088bf0bb852f2d68ea2226e27e30b5885aabd37223ec4368d72cd0ae5c72735e273004bd054a2b633e61ecb7fd854254cfaecd
-EBUILD vgrep-2.3.1.ebuild 656 BLAKE2B 8d1ec68257d10e042ec75ca12b8f8a0df43f7ecb92ae3be1dffed18cbb326e713b95e460b3c630919b40ec51af30dbe71f82e0f011381b2ba8ce754cffd7e45c SHA512 254a81ae86eed74e50457ebe1041eb526340c6f9075044a68853d802d7f2d724791790b5912db9eae76e3180046d0ef7f4aef253623eb8d0f0c43a20310ab5b8
+EBUILD vgrep-2.5.1.ebuild 645 BLAKE2B 00198ae16ad677349172aa644376ec3057d6e813575c28558ece7aa39ffde63a383bfe69111ce9cf25465cb66f0dfd4b12b4ab1cf1c3bc0cec17626db3b52367 SHA512 42caca3b8423f3189005c74d6bb52aae5f86d62e4b98293887fc5bfce5af4e50c0e6764064006a8ba46ff61977f06b070dc414cebe2a1515a2269e49fb0e5d5e
 EBUILD vgrep-2.3.3.ebuild 656 BLAKE2B 8d1ec68257d10e042ec75ca12b8f8a0df43f7ecb92ae3be1dffed18cbb326e713b95e460b3c630919b40ec51af30dbe71f82e0f011381b2ba8ce754cffd7e45c SHA512 254a81ae86eed74e50457ebe1041eb526340c6f9075044a68853d802d7f2d724791790b5912db9eae76e3180046d0ef7f4aef253623eb8d0f0c43a20310ab5b8
 EBUILD vgrep-2.4.0.ebuild 656 BLAKE2B 8d1ec68257d10e042ec75ca12b8f8a0df43f7ecb92ae3be1dffed18cbb326e713b95e460b3c630919b40ec51af30dbe71f82e0f011381b2ba8ce754cffd7e45c SHA512 254a81ae86eed74e50457ebe1041eb526340c6f9075044a68853d802d7f2d724791790b5912db9eae76e3180046d0ef7f4aef253623eb8d0f0c43a20310ab5b8
 EBUILD vgrep-2.5.0.ebuild 741 BLAKE2B b84a646cab1567983482132464b41a6adfaa29963a36e2bc3381efd8c0ba4164217e03b2df9d9ea2c2852368f26eabaf3d3cc230a6cbbae175ed3e26a73716e4 SHA512 191ebb96d53388ce332a205d2dcc4070a6b676b8c2c4f5a4489f47458cbaec8eff83d5191a477fb83880be1598afa0e1f17bd0078e1a25674896bda39cdbdacb
 EBUILD vgrep-2.5.1.ebuild 684 BLAKE2B b4f4d2c4d18340ebe2f481055097975ac3479a5303b0d2d0b4b55aa87e7876ec6c4f3619064afb4916b3bf408863cf2d632ac18d413a91385adf3a8eaf4a5934 SHA512 4fa96a4333593bc247ad8c072d3b75845a5f343da687e09c923f86d5bea3da2d1ea953b225ba327d24f099a7c4ad69de6b49de5b4954dfea836095d393944d8e
 MISC metadata.xml 394 BLAKE2B 52d95eb8f47c5002203258b8077e0104423472b1f4bdae387fa8194b5056fd4986a9b795d0bbaa7939497ce45ff2ee0ca90e1c44ebeaf31b40725b36ddf1390a SHA512 9f44f00b50a654d27819e20172dc338d3dac8abcdac3933df88153156871612e1c414dcc5b0590795eb58c972302c3b54546b7dbbd539ca60737bcfa5a8989f3
--- a/app-text/vgrep/files/vgrep-2.5.0-remove-sudo.patch
+++ b/app-text/vgrep/files/vgrep-2.5.0-remove-sudo.patch
@ -1,15 +0,0 @@
 https://github.com/vrothberg/vgrep/issues/130
 --- a/Makefile
 +++ b/Makefile
@@ -113,7 +113,8 @@ install: install-docs
 .PHONY: install-docs
 install-docs: docs
 -	sudo cp docs/*.1 ${MAN_DIR}/man1/
 +	mkdir -p ${MAN_DIR}/man1/
 +	cp docs/*.1 ${MAN_DIR}/man1/
 .PHONY: uninstall
 uninstall:
--- a/app-text/vgrep/vgrep-2.3.1.ebuild
+++ b/app-text/vgrep/vgrep-2.3.1.ebuild
@ -1,33 +0,0 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 EAPI="7"
 inherit go-module
 DESCRIPTION="A pager for grep, git-grep and similar grep implementations"
 HOMEPAGE="https://github.com/vrothberg/vgrep"
 SRC_URI="https://github.com/vrothberg/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 LICENSE="BSD GPL-3+ MIT MIT-with-advertising"
 SLOT="0"
 KEYWORDS="~amd64"
 # Uses golangci-lint
 RESTRICT="test"
 DOCS=( README.md )
 # go binary
 QA_PRESTRIPPED="usr/bin/vgrep"
 src_compile() {
 	emake build
 }
 src_install() {
 	local prefix="${D}/usr"
 	mkdir -p "${prefix}"/bin || die
 	emake PREFIX="${prefix}" install
 }
--- a/app-text/vgrep/vgrep-2.3.3.ebuild
+++ b/app-text/vgrep/vgrep-2.3.3.ebuild
@ -1,33 +0,0 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 EAPI="7"
 inherit go-module
 DESCRIPTION="A pager for grep, git-grep and similar grep implementations"
 HOMEPAGE="https://github.com/vrothberg/vgrep"
 SRC_URI="https://github.com/vrothberg/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 LICENSE="BSD GPL-3+ MIT MIT-with-advertising"
 SLOT="0"
 KEYWORDS="~amd64"
 # Uses golangci-lint
 RESTRICT="test"
 DOCS=( README.md )
 # go binary
 QA_PRESTRIPPED="usr/bin/vgrep"
 src_compile() {
 	emake build
 }
 src_install() {
 	local prefix="${D}/usr"
 	mkdir -p "${prefix}"/bin || die
 	emake PREFIX="${prefix}" install
 }
--- a/app-text/vgrep/vgrep-2.4.0.ebuild
+++ b/app-text/vgrep/vgrep-2.4.0.ebuild
@ -1,33 +0,0 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 EAPI="7"
 inherit go-module
 DESCRIPTION="A pager for grep, git-grep and similar grep implementations"
 HOMEPAGE="https://github.com/vrothberg/vgrep"
 SRC_URI="https://github.com/vrothberg/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 LICENSE="BSD GPL-3+ MIT MIT-with-advertising"
 SLOT="0"
 KEYWORDS="~amd64"
 # Uses golangci-lint
 RESTRICT="test"
 DOCS=( README.md )
 # go binary
 QA_PRESTRIPPED="usr/bin/vgrep"
 src_compile() {
 	emake build
 }
 src_install() {
 	local prefix="${D}/usr"
 	mkdir -p "${prefix}"/bin || die
 	emake PREFIX="${prefix}" install
 }
--- a/app-text/vgrep/vgrep-2.5.0.ebuild
+++ b/app-text/vgrep/vgrep-2.5.0.ebuild
@ -1,37 +0,0 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 EAPI="7"
 inherit go-module
 DESCRIPTION="A pager for grep, git-grep and similar grep implementations"
 HOMEPAGE="https://github.com/vrothberg/vgrep"
 SRC_URI="https://github.com/vrothberg/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 LICENSE="BSD GPL-3+ MIT MIT-with-advertising"
 SLOT="0"
 KEYWORDS="~amd64"
 # Uses golangci-lint
 RESTRICT="test"
 BDEPEND="dev-go/go-md2man"
 DOCS=( README.md )
 PATCHES=( "${FILESDIR}"/vgrep-2.5.0-remove-sudo.patch )
 # go binary
 QA_PRESTRIPPED="usr/bin/vgrep"
 src_compile() {
 	emake build
 }
 src_install() {
 	local prefix="${D}/usr"
 	mkdir -p "${prefix}"/bin || die
 	emake PREFIX="${prefix}" install
 }
--- a/app-text/vgrep/vgrep-2.5.1.ebuild
+++ b/app-text/vgrep/vgrep-2.5.1.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"
@ -11,25 +11,20 @@ SRC_URI="https://github.com/vrothberg/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
 LICENSE="BSD GPL-3+ MIT MIT-with-advertising"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
-# Uses golangci-lint
+# golangci-lint is required to run tests which is not yet packaged
-RESTRICT="test"
+RESTRICT="strip test"
 BDEPEND="dev-go/go-md2man"
 DOCS=( README.md )
 # go binary
 QA_PRESTRIPPED="usr/bin/vgrep"
 src_compile() {
 	emake build
 }
 src_install() {
-	local prefix="${D}/usr"
+	emake PREFIX="${D}/usr" install
-	mkdir -p "${prefix}"/bin || die
+	einstalldocs
 	emake PREFIX="${prefix}" install
 }
--- a/app-text/xmlto/Manifest
+++ b/app-text/xmlto/Manifest
@ -1,6 +1,6 @@
 AUX xmlto-0.0.22-format_fo_passivetex_check.patch 2286 BLAKE2B eb004b4fa394840b8e6fd792bfacfee75d180a1493d960348a33c7737a33a15a809fff28f4b6ade3deb045b629eb48a675b56037da56a7fabcd20718dfdaa6a4 SHA512 c8eeb3dc909431dd2fb9f5286b6ee98a40dce80a29606a9884bdab50c039ac90097720b9b968dfac76546492844de0b72f2f6c937da14b47142ad81b897023f4
-AUX xmlto-0.0.28-allow-links.patch 534 BLAKE2B 5af6c8108332c4396fef296d37f8ca1d70f17c6bc53895de5c9d722b8c4e767212d128c067c1fb2c9afca69440d128777d624fa060044eefa03bb522fab74a24 SHA512 9afcde15f8cca6fcf042a6851ba0c820147f7520a1d2a31fcbfeb787ee3235cf87e6fb63d66118d89e111b68d79973882a74a8a592b338345ecf0998eb8e1205
+AUX xmlto-0.0.28-allow-links.patch 535 BLAKE2B 71412bff616c9499ed6cf045a5d7ea1e6c697db791c58c1a56a1fea3bd7c1619814e20cf58e3549609fc104b0223f80c9a84ef4f4b203da90d5a8dc3b6c943b8 SHA512 cc3ccd209872a54cd3d91a1e261348ce412efab3d9d6d0d9199bd40396fa9c8de5e1ba6a5fef2e5d23d2819ae74bc19e2705b54792296eb7a3b8dc82b8637f22
 DIST xmlto-0.0.28.tar.bz2 127921 BLAKE2B 12ef3e2e1436c330e7b003d08f4a4d4032d70255777956949eb8b47b6f5466e7c158b0f85dc87069c1e379603cac0b01c88589f98ca1ef9e862f0aef31169f6d SHA512 6e0c4968d4f1b7a3b132904182aa72a73f6167553eabdeb65cfafa6295ef7b960541685769d04144207963cca77b0c44db4f9fbb2796348ffcb37b3b399f18f1
 EBUILD xmlto-0.0.28-r3.ebuild 1422 BLAKE2B 43874cd448915d6c0787f58639626ee347ad6016815f62fcfad150987f0d6767c86e6b5b394dda30e54642e64254b6df81d99bef5bec85c7ed70dcc2a66ce511 SHA512 2a30f4b373755acda7b36b49811634f5b12946db608889f2a3b57b0b4a351ff8dc6c7545591489475b7575942657f4c34c307368e8ec93361174fdd787726212
-EBUILD xmlto-0.0.28-r5.ebuild 1434 BLAKE2B 0d9830777786cdad0b056f0f9e4b3c60d7dae2c5fa89bcd90e81d9b0e7a538523f5ee918f7944c18179bad04a0eaf581c1bc4f83e40f02856e70fb89c3282987 SHA512 e6e3c76f5a90e308f29f2a2b4cf61f3d5462322c92a6537be718b73e007e5b2ab92d501d4be72580feb4da8a14ba1f75e0bfcb62b3d1f4856e305202b49e7ea5
+EBUILD xmlto-0.0.28-r6.ebuild 1442 BLAKE2B a5993d04bc74818acd4c4fb2213067f6ded07baa625e602ebf028a6b59188b340bbbc9b2e00cbdf04023eccd20477a0103ade366b489ed1dba409edefe7a32f7 SHA512 bcbe983428e3a8abb22bfc1fea7bc200a77ede274432c903887053dd5da1a90b4ef9b5c632007466d2050de64fe9463de693309dd6000f04a7d05f2ad53c7a20
 MISC metadata.xml 323 BLAKE2B fc92312d7c96a25a1d35384dd78942a7d6bfdeb0d1c36a7ffddc687d42a83261766e7042dc109b2544da11d72274761a98c62cc8e0ac872e8478e5e027cc69bf SHA512 33789a6e807d048100b32969bfbce0beea9c3b25fe279fe5d318d59b970b4562ec8edd222bf5817a62e46d23961160ccb11384be06e605fb115b3fc7c72299c5
--- a/app-text/xmlto/files/xmlto-0.0.28-allow-links.patch
+++ b/app-text/xmlto/files/xmlto-0.0.28-allow-links.patch
@ -9,7 +9,7 @@ Thanks-to: dolphinling
 -AC_ARG_VAR([LINKS], [Name and path of the `elinks' browser.])
 -AC_PATH_PROG([LINKS], [elinks], [elinks])
 +AC_ARG_VAR([LINKS], [Name and path of the `links/elinks' browser.])
-+AC_PATH_PROG([LINKS], [links elinks], [links])
+AC_PATH_PROGS([LINKS], [links elinks], [links])
 AC_ARG_VAR([W3M], [Name and path of the `w3m' browser.])
 AC_PATH_PROG([W3M], [w3m], [w3m])
--- a/app-text/xmlto/xmlto-0.0.28-r6.ebuild
+++ b/app-text/xmlto/xmlto-0.0.28-r6.ebuild
@ -11,7 +11,7 @@ SRC_URI="https://releases.pagure.org/${PN}/${P}.tar.bz2"
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="latex text"
 RDEPEND="
--- a/dev-cpp/Manifest.gz
+++ b/dev-cpp/Manifest.gz
--- a/dev-cpp/catch/Manifest
+++ b/dev-cpp/catch/Manifest
@ -1,9 +1,7 @@
 DIST Catch-1.12.2.tar.gz 377265 BLAKE2B bc27b4daee950f8fb93d65f3aed032e72bc856ee27a8dc28c35b89e33f414d68ba4cf00951e476688eddf9e4c0514036bd6916fa6cfa9e3359e6c625984f114f SHA512 ed963cdca9fe307ee02928677f81cafcb41cd607faaa315182fdf898d0f2aa28f0be2141bd642f46fdfac400c38f6d065e00a595a1e5879fe2335c4a3851e844
 DIST Catch2-2.13.3.tar.gz 655431 BLAKE2B 4343dab41818a4c85b875752b8d86a0dd1a46ce8c94d6773cee210a133f164b669053973c6678228b3afb356e25a3e705c8220b138c247a230e624b3f2412784 SHA512 caf0e3a39a2b5983346c2709ce06113da62881780117021c64db987d6c5190c41a9070fb70caa0ee6957cfef0baad87fff4e6558c9fea4fa464e82882fe17d55
 DIST Catch2-2.13.4.tar.gz 656645 BLAKE2B 7a8afb099d410af3a7641c948a59307ac72338174356c1219834f050e0971e410275f1eda911444c3e956320fa25b60f91a3aba75aa36d375ba38626a0246485 SHA512 eac081d750e65d4d8d8d5f32b53bd963c6566caabaff424c479fe080416f59b5387adbdf6dbac30fe265243cb5ed184baf6f8a9625052bd498c098b83463390d
 EBUILD catch-1.12.2.ebuild 822 BLAKE2B 52621e2c55af3d4591bace41a4c21a49bd4e19a94685f7bcdc5214fbc9765ad3f0105fb5181e080b413f644dc572c2d283354d6b41a2ef3d5bde24a7cf9694d3 SHA512 8d8985429614e0276c5e3a95406bb363b0e405fd670bf078af9edc598fc5d1a8cd22703bf6b02a2fdf7a7de533e064f5b8824a6903e5707fc70df140d7daa8ed
 EBUILD catch-1.9999.ebuild 812 BLAKE2B 9b65c1ee08f9a4b25bdf2f2e8961e725902936cd9818c6227459493e53b771ffc2a4c396fd40f3feec715d95c2fa901ccee8c4f42680d2da08d058c0701fad1e SHA512 c3766bec94da74b8a4e2e54078e1b6b71db5a5403865123798ac00584e57fb8ebc6e29db40e5e426aebef26929ec1b89c997f717d2b6b4bc6e218f04c19b4832
 EBUILD catch-2.13.3.ebuild 914 BLAKE2B 3dfcc8823cc2f69d66fd255005f8aacd4a78813127f16dc84e9ecaffceee5d1430c4a06e790ec3a12c3bd0fc627da4df8e04f041283ecfe75fd2846e2468198c SHA512 6bff9973c470a356fb495ce003e910e5c645352abbb9facd6686269a5b5e14c753c18b0e1e90aee452263dbc2e791f03922a8df836fdc0ae9847c2d9b4d78528
 EBUILD catch-2.13.4.ebuild 914 BLAKE2B 3dfcc8823cc2f69d66fd255005f8aacd4a78813127f16dc84e9ecaffceee5d1430c4a06e790ec3a12c3bd0fc627da4df8e04f041283ecfe75fd2846e2468198c SHA512 6bff9973c470a356fb495ce003e910e5c645352abbb9facd6686269a5b5e14c753c18b0e1e90aee452263dbc2e791f03922a8df836fdc0ae9847c2d9b4d78528
 EBUILD catch-9999.ebuild 957 BLAKE2B d8834959413b85dc5a5181a060a4e75730d5b258b113024e7e426793dfab806475bec2dd02ec24149086e98cfcc35e1def04a63b604f2fd98cf53034616586be SHA512 ded76b95e18991428e08d15533ec76db77226687955888f8db016d35c47aa00d25cac0e1749899dd5884d28c7f2e3afa77976ce3505f5e47a3e652c62383ef38
 MISC metadata.xml 324 BLAKE2B e32ed47ddce7e517244ff26e70d1bd31cdaa33bef0bf4a6cf4284f3688745760a9538f9bf6d9d25a9fabd3f5f6901a1b91c76d2fe290427a55bcc74d4f17be7b SHA512 094af03b1e2befa015f1faaca9ecf4158fffedfe7ef8a2873e9e6cd6e4e7d26f276e357ac1989c2809702abc3ada590668adc37c9d804cee31ae564f88c3315f
--- a/dev-cpp/catch/catch-2.13.3.ebuild
+++ b/dev-cpp/catch/catch-2.13.3.ebuild
@ -1,44 +0,0 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 EAPI=7
 PYTHON_COMPAT=( python3_{7..9} )
 inherit cmake python-any-r1
 if [[ ${PV} == *9999 ]]; then
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/catchorg/Catch2.git"
 else
 	MY_P=${PN^}2-${PV}
 	SRC_URI="https://github.com/catchorg/Catch2/archive/v${PV}.tar.gz -> ${MY_P}.tar.gz"
 	KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
 	S="${WORKDIR}/${MY_P}"
 fi
 DESCRIPTION="Modern C++ header-only framework for unit-tests"
 HOMEPAGE="https://github.com/catchorg/Catch2"
 LICENSE="Boost-1.0"
 SLOT="0"
 IUSE="test"
 RESTRICT="!test? ( test )"
 BDEPEND="test? ( ${PYTHON_DEPS} )"
 pkg_setup() {
 	use test && python-any-r1_pkg_setup
 }
 src_configure() {
 	local mycmakeargs=(
 		-DCATCH_ENABLE_WERROR=OFF
 		-DBUILD_TESTING=$(usex test)
 	)
 	use test &&
 		mycmakeargs+=(-DPYTHON_EXECUTABLE="${PYTHON}")
 	cmake_src_configure
 }
--- a/dev-db/Manifest.gz
+++ b/dev-db/Manifest.gz
--- a/dev-db/innotop/Manifest
+++ b/dev-db/innotop/Manifest
@ -1,3 +1,5 @@
 DIST innotop-1.12.0.tar.gz 182854 BLAKE2B 1470f21fe7882e920966a856365586c37461c955f0d07ea72a9bffa16b1a112fe5daa2dec585f888c90570d28f9af4e88885a36910bf892cc4f69abd044a4494 SHA512 bc650cd8fb5e5b83f12ccccc852802d676500d7241fe0beaa2a67c3dcca90ab06f329f0a6750789b6097ab201630b9ecf494159086d904ce7c1cfe7aefb5a635
 DIST innotop-1.13.0.tar.gz 189278 BLAKE2B 0e7334c983aa441c130ded820e76afb72a324b52dc6b444fb5e5813dc09c19a656d42b449b43af682d61620305062929d87a78db4298e17bed36eca62ff6f53a SHA512 827a6ec36355af023d24b85afdaabac44ef0c33c853c133d39f0725b2da3585cf1bc7b21e501d436a28ac6b798d9d502b4a81c2c9c28373abf91543519b4f45a
 EBUILD innotop-1.12.0.ebuild 633 BLAKE2B 7f987ee26b6f469700f107f5b27b5b15e81790656c326c36fec36c3429dac8aa9c982fc62700bf6004103419e1a96c43aa90be83ce01eaf5d6fd8d3937d0224f SHA512 978a673305506a4abf085f6fa5eb9dc2d895e0f550b1f757589cdd3a512ce8ddb881932b478a6096a6a4ddc38c5608286ad0704eb6681069b4df77c845f71931
 EBUILD innotop-1.13.0.ebuild 633 BLAKE2B 0cad7292de8e0a57dde2ac431d0dd8003ab599805901fe2f4b3a4e28b6acf797606faf8b3b481c51af0645a34c98e0345ba5b97eff4314c43a5154d57c657a63 SHA512 beafdee5a672ab87dc60af15610a5d7149eddc726407eac6baf324e2dbb3b629b9c911210ac2bc483815b6be4713be8cea0ac53b937bc02a0e325aac233cc4c3
 MISC metadata.xml 323 BLAKE2B ef1085ada1002903fc3f252f7a38f52013bcfe81673aa5c95a785686819c33acdab73320da750879762a0427dae35e298cec3c98d5e8bc586394d3595487640a SHA512 dbe7b4ae5d53e8bc778187bf5e29771cf289e5463f74a156bff7cd83febe9f592c0650e2de6051f6f7de6626d9c38c54162d8d3b0e302c4aba57ae0473fe444d
--- a/dev-db/innotop/innotop-1.13.0.ebuild
+++ b/dev-db/innotop/innotop-1.13.0.ebuild
@ -0,0 +1,27 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 EAPI="7"
 inherit perl-module
 DESCRIPTION="A text-mode MySQL and InnoDB monitor like mytop, but with many more features"
 HOMEPAGE="https://github.com/innotop/innotop"
 SRC_URI="https://github.com/innotop/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 LICENSE="|| ( Artistic GPL-2 )"
 KEYWORDS="~alpha ~amd64 ~ppc ~sparc ~x86"
 SLOT="0"
 IUSE=""
 DEPEND="dev-perl/DBI
 	dev-perl/DBD-mysql
 	dev-perl/TermReadKey
 	virtual/perl-Term-ANSIColor
 	virtual/perl-Time-HiRes"
 DIST_TEST="do parallel"
 src_install() {
 	perl-module_src_install
 }
--- a/dev-java/Manifest.gz
+++ b/dev-java/Manifest.gz
--- a/dev-java/slf4j-simple/Manifest
+++ b/dev-java/slf4j-simple/Manifest
@ -3,4 +3,4 @@ DIST slf4j-1.7.30-sources.tar.gz 2272772 BLAKE2B c6692a20406983fa333bdb27bf8da59
 DIST slf4j-1.7.7.tar.gz 3031017 BLAKE2B 55020b493f9f0df534d199d86e8d312dcd64831155f6d18d5f2de6f5157ecb20853cc96689e25ded8c7f4f858481567eb67a21a1cf96a7c3a33ed1ddf9aa47eb SHA512 aefefe049ed36e8ec938469067be8d73d2c7a28189f54cf434606fecab1d380f00fdf8349a23ed99d574067d9a613b0aec48b913705cd27524af5a4a5d887418
 EBUILD slf4j-simple-1.7.30.ebuild 2001 BLAKE2B 9fa3427b1e67e98316e2dd5929adb47b3d0500139414c976d59c1d9e0690f56c2f22f274235f0615be629ba7e5d9852c70521aca993023417d6155a8a8ad2bd2 SHA512 8fd8c37755450b33d77cd655bae9dcfdaf82913a7ab518f41293bebd5d52f0cf8f12f438126c89c488c1d113a7ad7a054c9722ee7ae7e6b78f282e51fbcc34a8
 EBUILD slf4j-simple-1.7.7.ebuild 1120 BLAKE2B 5a068ac3357e5d18ae85f2d210ba2f83a68d05395e176b6ab1a5d8a4851534051a631bbd2d5b97f5ca38f36073a901035c64e4d60390eb42e1f05ca119a8d67c SHA512 06e6dfdb72ad88e9eb69fb97e093b479cf2cfc2d2168ad37573c430f2edd92677473f97a8a8444430e7acfdfd4e38e15fd05e037b342e2a6070357fb00e15786
-MISC metadata.xml 242 BLAKE2B 6bf5b48906c64a18d9f27e7ecec168ed039f8d390792d62aedb8c86627a13ff09d583a736982057d245fe5db27c4016257125d69792d6bbe424e7d2a35067675 SHA512 50f4d6219b995b723d6ebbb4f2a18adbf558a685f862aea00f072254dcc0fe6c1388e4aeaf21fb3ce0fb840a2ef4851807536d037c9682b21cb1986198715a4f
+MISC metadata.xml 366 BLAKE2B fcc9f77c9b83f1d612815cd6e9e8814ba364c8407422ec822f0c60ccc2176dc724e826ce9fdbdd7fb1290f669fd332b93a74650628840d30d1dd2d68184d9893 SHA512 628c4e1ed007e31d4b8a3769fb2f4bd5c4f8041d99ef656508927302345a16573713abe0da228546f8a976d8e3e5de4538f838437623149c7f5b14bfee12abd1
--- a/dev-java/slf4j-simple/metadata.xml
+++ b/dev-java/slf4j-simple/metadata.xml
@ -5,4 +5,8 @@
 		<email>java@gentoo.org</email>
 		<name>Java</name>
 	</maintainer>
 	<upstream>
 		<doc>http://www.slf4j.org/docs.html</doc>
 		<bugs-to>http://www.slf4j.org/bug-reporting.html</bugs-to>
 	</upstream>
 </pkgmetadata>
--- a/dev-lang/Manifest.gz
+++ b/dev-lang/Manifest.gz
--- a/dev-lang/erlang/Manifest
+++ b/dev-lang/erlang/Manifest
@ -19,7 +19,7 @@ DIST erlang_doc_man_23.2.tar.gz 1386417 BLAKE2B 91fb2646461330c2f3793e7819e4c77b
 DIST erlang_doc_man_23.3.tar.gz 1456501 BLAKE2B 414bedee0e316d97b26d9d6418b799a9434a22e9980e7d3a83e2478d184d63d1633c0e10d0e180d929a3cacd82b4d703be86cbc8e99996037f6b37ea122f7a8c SHA512 6c661c210ffec4752afe624fa46700a0f62cc6589b74b859ab1dfde77d289e992988ac8744f7b4126d7512cd6d0aab3321f710a6324552b259bd7acd5b54a05e
 EBUILD erlang-23.0.4.ebuild 4563 BLAKE2B d144bc5d0c8f802d720fd36a53663692f8e335f766ced3c9bfab0c9dc5086c875df2b6cb42fb840304a659f203c70ec150fffea072d9e04dc5e151a55325c067 SHA512 a16aa96dafb7729c137e06c5d4c654965437a80becd9a5913d33ced734063e0947d61c2a2672e1ef6fff8dbec14b9a736e8d4b94a839a7da4e8add656645269e
 EBUILD erlang-23.2.3.ebuild 4563 BLAKE2B 32e12007a6f1414bf47bf4ecc4ba714c5f6ed8b1845a410e49b8ae796b9c349cdf4216d97fb93779f0104c83bb743b6359b1313d1689d0c9cae4a11fe7bb7333 SHA512 64ea869b959a0c8cc2b179ee5f817d773db388f3a30c73dddfeab0cc92ef5aa7b19e09c56d64be77a14ec568a250883495a667fc884bed9019901d784e9b7adc
-EBUILD erlang-23.2.7.ebuild 4567 BLAKE2B 58e00aa4415c86f7835b84a5e07630e0e57976e38874683cb8bb3e2a6e5e64549105d345f7cb06c2a1f01f615899934a74957662cf48ee9fe385b0533d919697 SHA512 3098c3c345e47bb3284313ef7b6e8e2adf695c2413e849e379272194d8a9c3cc60dec624cb75f948348f27650a0cbdc9e12384dfd8177aba02b20ddc828df8bd
+EBUILD erlang-23.2.7.ebuild 4566 BLAKE2B 08ef0957d2f8165ff8697e5660da2a6ff23f8f6b50a3a7b6e9341fb03e472a61d05b3acf81a49a1391df51978251f49530019bf3b3f8fb9505e265189eb8622e SHA512 68171ac66c8cefd3689aa8edcb4c0a53161911977b1b0e35ba5d7804cff24626a23d23d2489573f41379424b6e46e43b0ca063eab6ef4bb681f49e588c796afa
 EBUILD erlang-23.3.1.ebuild 4568 BLAKE2B afa013bfe43d1c6c8a9853f4ffaa3ce26095d5eba4dba1383f56ac0378fe1f3d73f2cfbfdb17df4c689764eaedcb349d65ea2b99aac67ff452f14a3d2d17be44 SHA512 7e8a5cb7c184d4e0ae500593764f6fbd9866e0ffc22c33359d0b2911b0b98a546da0998fb0aba17534e97ddb7ebc981f2e470c542378b0def45897383d26bd8a
 EBUILD erlang-23.3.ebuild 4568 BLAKE2B afa013bfe43d1c6c8a9853f4ffaa3ce26095d5eba4dba1383f56ac0378fe1f3d73f2cfbfdb17df4c689764eaedcb349d65ea2b99aac67ff452f14a3d2d17be44 SHA512 7e8a5cb7c184d4e0ae500593764f6fbd9866e0ffc22c33359d0b2911b0b98a546da0998fb0aba17534e97ddb7ebc981f2e470c542378b0def45897383d26bd8a
 MISC metadata.xml 864 BLAKE2B fb20217a05650be9d9f454a7ffe45aeb7e41ad4f9b1616efa94f5609db4d8de1b5848268e6224c256c2ff86b0d3bad578d6e4f0e43c4e8bf433e7a7e9210ae98 SHA512 c4aae8e974789ce095eeaf7d7517da16351b1ebb60cc98abdeebc41147be4bce084081d4f7a03727f9070434a9e1347c0ebf809a99931bc7177525726cb9c161
--- a/dev-lang/erlang/erlang-23.2.7.ebuild
+++ b/dev-lang/erlang/erlang-23.2.7.ebuild
@ -22,7 +22,7 @@ LICENSE="Apache-2.0"
 # same build of ERTS that was used when compiling the code.  See
 # http://erlang.org/doc/system_principles/misc.html for more information.
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ppc64 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
 IUSE="doc emacs +hipe java +kpoll libressl odbc sctp ssl systemd tk wxwidgets"
 RDEPEND="
--- a/dev-lang/julia-bin/Manifest
+++ b/dev-lang/julia-bin/Manifest
@ -8,6 +8,14 @@ DIST julia-1.5.3-linux-aarch64.tar.gz 97086173 BLAKE2B 5353a516f24c151d6213ed4c6
 DIST julia-1.5.3-linux-i686.tar.gz 101362522 BLAKE2B aba1270fc85cc1afc19856768a39d1cf1c40fb32b676be5da47dc7747294299a044a5202c547d19ad8aa56060b04d7583d7e7c19176f2fdbcccb863593fffccb SHA512 0abaab22626cbd4da4a2389b2aca639f993aa442a8423cba2fda3d9693e0dab4f5b82592691ad74bb7ddf1ae48739406b61fe76b7da626a1f22fe01077b011d2
 DIST julia-1.5.3-linux-x86_64.tar.gz 105260711 BLAKE2B b132fbe090ca4a4cba518efcf2e475f0ceaebcbe2e5ef4eee33697909995ea58d97c3e5015b96eaf2ff23e5ff6b5b67eed62b94a34580961d5671c4f019d4847 SHA512 f0460da198797c92d39d361278be6959e90b2b3d08e070b705c1a5de3a17c0e6b0b010a397d0b02e613d060959fff14c074cf12fdeb956e8f8565989f084d86b
 DIST julia-1.5.3-musl-x86_64.tar.gz 101802400 BLAKE2B da69c1b4ff5bde8692c3fc9ed3d60fd655a32121a0e11a4d1f00b5e4494cc4bcdb0e323a2644cca3a291fa7f7604925d387204df90cc19fee89048c4ba83b2d5 SHA512 e98c74ce2a49532a491a46efe81a2edc85103f9ec04347fe6b052cffdaecadcecb48a02b15ad71853fff6ebb2281498000e89d44732f36d31b6252a1a88bd0a6
-EBUILD julia-bin-1.5.2.ebuild 1238 BLAKE2B 1f20fe4f0fabe3953a53fc3f810992bc545dd4d56d92a49628486a3d65fa2e9fb671619560d6a0409e398d441249df0c74448eb6fbfd70c49a955292c70a8016 SHA512 2174cc671417ff92eeb245a1bce7a722f8b76b37dbee11f72b1503e494b1c9a15eb0936e0bb9b4437546be64d4a2377573f76bd364977293f422261c98b8a177
+DIST julia-1.6.0-freebsd-x86_64.tar.gz 107111472 BLAKE2B a5adcc4eda19249e82e2ab8e897d191b18d03169892e315afce33bf8daf9b12bbae8b7648feff1aacb746185822c504e2d9cfa33ab63cd0e5478a2b70d83d5b1 SHA512 3ac69aa22fb61df5c6a2a12013b07c01e4fa16867f092dae7eb6a22c90efd736e24b0e7f6d4599ec87c079e02e95548fbc2507de12ac386d19d23786280f8d31
-EBUILD julia-bin-1.5.3.ebuild 1238 BLAKE2B 1f20fe4f0fabe3953a53fc3f810992bc545dd4d56d92a49628486a3d65fa2e9fb671619560d6a0409e398d441249df0c74448eb6fbfd70c49a955292c70a8016 SHA512 2174cc671417ff92eeb245a1bce7a722f8b76b37dbee11f72b1503e494b1c9a15eb0936e0bb9b4437546be64d4a2377573f76bd364977293f422261c98b8a177
+DIST julia-1.6.0-linux-aarch64.tar.gz 106139244 BLAKE2B cd6deda04a1ffa3a15300648bad6194d008ae43651601969fa30a53e97c3642dad316dd6f1934b64c61187921e990cca41f1466ed9c9aac355d4fdba02e6cb67 SHA512 ba6b8948189285e004d2c6aa6166df264c4a1713b18c80b3b9458b6964d8c13123fe271c409be7b626e500295314b162fdb70fe7cce27d285f792b4b4fc570fe
-MISC metadata.xml 1299 BLAKE2B 58046d07189fcdada72dc58487d1316cfe7d7d189170ddb59f3ee88edd0edf7f043d40f2420d84411e928f57c177d6d98f0ce5862ef7bdadbd8aaa5194f75601 SHA512 b7e1e0cdbc2ace51b3b78432b4edf553d5e9dce4cbe9ed8a0d9d77a01d8eee33842f5f5b70deadc9073db09cca8f47b00db11ff25366e055f6d93fe49ba1f83f
+DIST julia-1.6.0-linux-i686.tar.gz 109636279 BLAKE2B 905bf491935267ba53e14e29093c86125049be554fa778670196e38cde9b1e661869e858785ac0f116c57badb50ae8300b42cb405364424e1cdd9b85f9785f81 SHA512 8d4e6d770b1643f669046b453e8965a5373466f944ed6244a2c45687b2c7faba1bb1f725556f295ee7c18ecde8dae7ad08291c9be2414b95b66063b4a4b0703b
 DIST julia-1.6.0-linux-ppc64le.tar.gz 98427694 BLAKE2B 67a2d04f1ae9e8e8e2165c7dcb5c504729ed13772bcffe3e4fb259944f86fcb5c1e699fe077fcf9250941feb936434f555c17888cad3dd3c7f92787c5c7bdca1 SHA512 a1f691a22764764e97b9f8bd322bf3a141c06ab7ea60be5d393f4adb614ff6d284c095a870df5ac6c38614ad17dc85a82e12b5b35598146062916918183e6681
 DIST julia-1.6.0-linux-x86_64.tar.gz 112838927 BLAKE2B 991b91101e4556c36d1ac4c35f650cc42a2eb87f00fa1f0fad8f1f567cc77c3290df052e14a83aea610213a72b856a031c3a84e4f8f968b141818b96b7cd9fa4 SHA512 f007f9730ce01fb8dbbaaab1d1f029393c43ca075a626024b98d54b55e94dde7f7be4872e59244e89f4c4b7725cdb5a619b7576f832561c17c119db58a8be407
 DIST julia-1.6.0-musl-x86_64.tar.gz 111773706 BLAKE2B a812f3b323650f2d62756d94b4cb6bfac7d49fbbcaa0eff7da8fdcd5857473985b2985c127895c47b8ec8afac1c67e2297dd118604fb0e6638408491245cb442 SHA512 0773df79840b24f019337407e9330f4255994457380d48045c3972145125c4ca7475fde5ffd9c53e4350ec87bdbac5ba299527a9dbcbb1c9c531172edf35a688
 EBUILD julia-bin-1.5.2.ebuild 1412 BLAKE2B 61edd4fc8374f7f6725f603899651e1cb8e7b806c9370d8b460f7f9a805e4c29e0e0dd823df83c378f32751648ef9dbffc54de2969f944b7b22ba4af2eca47e4 SHA512 62f2e741cd079f1e3241671565dc0cfce0360e7cabd66d9c6e41c4750d4eb3be135d9790479f2031ba7c976021299b17d724916037b0bfdfb5613e11dc652ab7
 EBUILD julia-bin-1.5.3.ebuild 1411 BLAKE2B 1229b41a0cf35ab622270776b750627ab05dfffefcfe5bd616ce6bf415515ed9429660a10fd18b83ffb3c0805693bb7291d08b37b582356ab7c1287982715f01 SHA512 ac8eed683574d6fe35f07d320201e121afc9a106c10f0d51adf9d9858a78e7461e00301028e8ac05c9370d6427dc3da395d5e6368dc724af2def1f7b5ce5271e
 EBUILD julia-bin-1.6.0.ebuild 1490 BLAKE2B 3831ab003e01e396e7c6e9c55f9bef1f2c2043ee8195f734671f6216a062ee5f00f5b3f45489c7b07671c8d0e131ca7cfc39c0b52b07890c805db7ff5e243f04 SHA512 5e3470c808dc5bdfb0a3d070e2817fab06b1cd3e9b7cac20b218eb2010555a0a985524d46b7d83f447cd7f6296f0295e3a70d23cdc6cf5ef2d736fdb4955fb11
 EBUILD julia-bin-9999.ebuild 1192 BLAKE2B 098e8f09ff23f3d86db7f72a1cfdb3cc1d2c032cfa957ef7ec25af3fde5f0b0020aae75a925c4bae9485e49cf930823094da1bc749206754efdd66a0d390f254 SHA512 2e9dc86409ce250c779bbd45b5bd7f9ada9231d4951ee80658dbe8469e2e0ea0534e366579457b442856829d2790e3ed19e53d2ec38c68dfbff88c4a4a21d6d5
 MISC metadata.xml 1182 BLAKE2B b8aa31ee79e327ac5c3383e946d1842cefb2ce9b068324e2a8e48e50dbec7ab374bd9c075cf20dd5a741f69f077c6e79ef93ea67adf1873ef9eb58acb66b8838 SHA512 2b1717cd0e39c85064a926a07bb68b7ccbf5be1be88afb1d19572544b00431d9075a6ec617322d7daedd232639c706464fa7e647b26219107c61c8dd7402e731
--- a/dev-lang/julia-bin/julia-bin-1.5.2.ebuild
+++ b/dev-lang/julia-bin/julia-bin-1.5.2.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
@ -20,11 +20,14 @@ SRC_URI="
 "
 LICENSE="MIT"
-SLOT="0"
+SLOT="${MY_PV}"
 KEYWORDS="-* ~amd64 ~x86"
 IUSE="elibc_glibc"
-RDEPEND="!dev-lang/julia"
+RDEPEND="
 	!dev-lang/julia
 	app-arch/p7zip
 "
 DEPEND="${RDEPEND}"
 RESTRICT="strip"
@ -42,10 +45,11 @@ src_install() {
 	doins -r ./share
 	exeinto "/usr/$(get_libdir)/${MY_P}/bin"
-	doexe bin/julia
+	doexe "bin/${MY_PN}"
 	dosym "../$(get_libdir)/${MY_P}/bin/${MY_PN}" "/usr/bin/${MY_PN}${SLOT}"
-	cat > 99julia-bin <<-EOF
+	local revord=$(( 9999 - $(ver_cut 1) * 100 - $(ver_cut 2) )) # 1.6 -> 106
 	newenvd - "99${MY_PN}${revord}" <<-EOF
 		PATH="${EROOT}/usr/$(get_libdir)/${MY_P}/bin"
 	EOF
 	doenvd 99julia-bin
 }
--- a/dev-lang/julia-bin/julia-bin-1.5.3.ebuild
+++ b/dev-lang/julia-bin/julia-bin-1.5.3.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
@ -20,11 +20,14 @@ SRC_URI="
 "
 LICENSE="MIT"
-SLOT="0"
+SLOT="${MY_PV}"
 KEYWORDS="-* ~amd64 ~x86"
 IUSE="elibc_glibc"
-RDEPEND="!dev-lang/julia"
+RDEPEND="
 	!dev-lang/julia
 	app-arch/p7zip
 "
 DEPEND="${RDEPEND}"
 RESTRICT="strip"
@ -42,10 +45,11 @@ src_install() {
 	doins -r ./share
 	exeinto "/usr/$(get_libdir)/${MY_P}/bin"
-	doexe bin/julia
+	doexe "bin/${MY_PN}"
 	dosym "../$(get_libdir)/${MY_P}/bin/${MY_PN}" "/usr/bin/${MY_PN}${SLOT}"
-	cat > 99julia-bin <<-EOF
+	local revord=$(( 9999 - $(ver_cut 1) * 100 - $(ver_cut 2) )) # 1.6 -> 106
 	newenvd - "99${MY_PN}{revord}" <<-EOF
 		PATH="${EROOT}/usr/$(get_libdir)/${MY_P}/bin"
 	EOF
 	doenvd 99julia-bin
 }
--- a/dev-lang/julia-bin/julia-bin-1.6.0.ebuild
+++ b/dev-lang/julia-bin/julia-bin-1.6.0.ebuild
@ -0,0 +1,56 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 EAPI=7
 MY_PN=${PN/-bin/}
 MY_P=${MY_PN}-${PV/_/-}
 MY_PV=$(ver_cut 1-2)
 BASE_SRC_URI="https://julialang-s3.julialang.org/bin"
 DESCRIPTION="High-performance programming language for technical computing"
 HOMEPAGE="https://julialang.org/"
 SRC_URI="
 	x86? ( ${BASE_SRC_URI}/linux/x86/${MY_PV}/${MY_P}-linux-i686.tar.gz )
 	amd64? (
 		elibc_glibc? ( ${BASE_SRC_URI}/linux/x64/${MY_PV}/${MY_P}-linux-x86_64.tar.gz )
 		elibc_musl? ( ${BASE_SRC_URI}/musl/x64/${MY_PV}/${MY_P}-musl-x86_64.tar.gz )
 	)
 	amd64-fbsd? ( ${BASE_SRC_URI}/freebsd/x64/${MY_PV}/${MY_P}-freebsd-x86_64.tar.gz )
 	arm64? ( ${BASE_SRC_URI}/linux/aarch64/${MY_PV}/${MY_P}-linux-aarch64.tar.gz )
 	ppc64? ( ${BASE_SRC_URI}/linux/ppc64le/${MY_PV}/${MY_P}-linux-ppc64le.tar.gz )
 "
 LICENSE="MIT"
 SLOT="${MY_PV}"
 KEYWORDS="-* ~amd64 ~x86"
 IUSE="elibc_glibc"
 RDEPEND="
 	!dev-lang/julia
 	app-arch/p7zip
 "
 DEPEND="${RDEPEND}"
 RESTRICT="strip"
 QA_PREBUILT="*"
 QA_SONAME="*"
 S="${WORKDIR}/${MY_P}"
 src_install() {
 	insinto "/usr/$(get_libdir)/${MY_P}/"
 	doins -r ./etc
 	doins -r ./include
 	doins -r ./lib
 	doins -r ./share
 	exeinto "/usr/$(get_libdir)/${MY_P}/bin"
 	doexe "bin/${MY_PN}"
 	dosym "../$(get_libdir)/${MY_P}/bin/${MY_PN}" "/usr/bin/${MY_PN}${SLOT}"
 	local revord=$(( 9999 - $(ver_cut 1) * 100 - $(ver_cut 2) )) # 1.6 -> 106
 	newenvd - 99${MY_PN}${revord} <<-EOF
 		PATH="${EROOT}/usr/$(get_libdir)/${MY_P}/bin"
 	EOF
 }
--- a/dev-lang/julia-bin/julia-bin-9999.ebuild
+++ b/dev-lang/julia-bin/julia-bin-9999.ebuild
@ -0,0 +1,55 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 EAPI=7
 MY_PN=${PN/-bin/}
 DESCRIPTION="High-performance programming language for technical computing"
 HOMEPAGE="https://julialang.org/"
 PROPERTIES="live"
 MY_P=${MY_PN}-latest
 SRC_URI=""
 LICENSE="MIT"
 SLOT="9999"
 IUSE="elibc_glibc elibc_FreeBSD"
 RDEPEND="!dev-lang/julia
 	app-arch/p7zip
 "
 DEPEND="${RDEPEND}"
 RESTRICT="strip"
 QA_PREBUILT="*"
 S="${WORKDIR}/"
 src_unpack() {
 	NIGHTLIES_S3="https://julialangnightlies-s3.julialang.org/bin"
 	if use x86; then
 		URI="${NIGHTLIES_S3}/linux/x86/${MY_P}-linux32.tar.gz"
 	elif use amd64; then
 		URI="${NIGHTLIES_S3}/linux/x64/${MY_P}-linux64.tar.gz"
 	elif use arm64; then
 		URI="${NIGHTLIES_S3}/linux/aarch64/${MY_P}-linuxaarch64.tar.gz"
 	else
 		die "arch not supported"
 	fi
 	wget -O "${T}/julia.tar.gz" "${URI}"
 	unpack "${T}/julia.tar.gz"
 }
 src_install() {
 	insinto "/usr/$(get_libdir)/${MY_P}/"
 	doins -r ./julia-*/etc
 	doins -r ./julia-*/include
 	doins -r ./julia-*/lib
 	doins -r ./julia-*/share
 	exeinto "/usr/$(get_libdir)/${MY_P}/bin"
 	doexe ./julia-*/bin/julia
 	dosym "../$(get_libdir)/${MY_P}/bin/julia" "/usr/bin/julia${PV}"
 }
--- a/dev-lang/julia-bin/metadata.xml
+++ b/dev-lang/julia-bin/metadata.xml
@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="proxy">
 		<email>tamiko@gentoo.org</email>
 		<name>Matthias Maier</name>
 	</maintainer>
@ -9,10 +9,6 @@
 		<email>jeffrey@icurse.nl</email>
 		<name>Jeffrey Lin</name>
 	</maintainer>
 	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
 	<longdescription lang="en">
 		Julia is a high-level, high-performance dynamic programming language for
 		technical computing, with syntax that is familiar to users of other
--- a/dev-lang/julia/Manifest
+++ b/dev-lang/julia/Manifest
@ -1,24 +1,19 @@
 AUX julia-1.1.0-fix_build_system.patch 1651 BLAKE2B 62123d16fe25bd6d77ac7af05297bc2cb5529b58943fcd13060f0b2b3f329571ebbd82208793651ac5120cd4ed19b6eca6c3d0c829509288460a9e0e78817b48 SHA512 70f5cf43261216e16001acc2c64e0bc1457e1fd48a918b218f8b0b21877a44c274f3aad81f68f7176665ec94c2d17f89a880e1c0a9332beae9d25668f9a85a25
 AUX julia-1.1.0-fix_llvm_install.patch 680 BLAKE2B ca0d95c503b8f6e76722d54147f7a64cda5781cefc6e05ed7cfc631b356c3131d43ce6703da6c61b791da08836d9a6b5b494556c2a0ecba8960f8a9395b2d66a SHA512 4d474c1ab1d74aeb98367d55ec557e22e43a3e3d35615b7cde20fb9a194b94f24237735ad431800ded6e120beae9d2d3706b778ea7f26409790e3649ba39117b
 AUX julia-1.4.0-no_symlink_llvm.patch 335 BLAKE2B 0df56ed45619df80b669bc790e0f93e475c94dac39fc8efcbdaa677a6ab02a6a3f832abf07990e8f50df8d900147f5e0ac9e2896edbbc4a015e49e74864315fa SHA512 563ed79132655b8c28a01d17fb8765ed774c069e00d29847f864152f7641b53758c6d8ba5544789e8d3aeb0e1686ea946c31837b1e1b0a6f4bce6d531d5511ed
 AUX julia-1.6.0-fix-system-csl.patch 11191 BLAKE2B 224ce4e2abe11c2b4d91b63e6f717080150baf45219d2c94f31d78d962db5b139d791ce8d2761b7ac4e22201d4b5770ac9211d354b24285da3ca7e0b78f00baf SHA512 bb32848b96b7933f11c9db2d52494576e4b669c375721e7715654370413733762077a670a1102cb27d177b6ee798e312c7388febfef98948bcb39fad67d815b9
 AUX julia-1.6.0-fix_build_system.patch 1639 BLAKE2B 23338e7a37141267b935571fa3a90d6e23665d071d866ad2bd50d47c8cd04a180d8bd6aa8094238aa8ffed211a74953f5329f744fc5d67c4f924018c22946610 SHA512 862710df024c77ab75510a0099611832ec9f0a0a23ff506adf7c0723aba1dbcd6436829d2939369a6815d0a1692380636d9afa20da2da885ce1e4ebf0356bdac
 DIST julia-1.5.2.tar.gz 6945862 BLAKE2B 9dd9f83fb9ae251f66ae65e14a252b662c3c7d6f92638d91ef6e286032020052e1812f2891270854e0ddeda474afff55c8f87d300550503c1093f4c5e0a51959 SHA512 aa177d03bbde4f368dd2fb14f64d21130531616bcd544af7babbb7fb7c9ee5ea7528c756e10f78468aaffebbcbc6f48e92397c1c13dc3f130b64a82e478f43dc
 DIST julia-1.5.3.tar.gz 6949901 BLAKE2B 08f8496980a9bbb9effc0c72cb6b7a5ce1dbd1774735caa366ddc1bb5404117111c624a639f6eb48360061f9fc597a7b37dff24f8555f03ebc4a22524cbeb3b8 SHA512 9e644a64fd6e2caf0390a2bc470084406c078244e65b70a2e3b031d5806c1dff780273ccccfe4bccfd8c03778b7d3a44de7a84bd13f3512afe6864efa5a730fc
 DIST julia-1.6.0.tar.gz 7711314 BLAKE2B 135862347a7f3a954acb8d8e17350fbdda84b4813d8498b862e107836a0d29d6e70a26c39c0c29655e6348a5a3afd5b4d7e9824cb88c9e8d31c4515468f46d5b SHA512 41dea60c08882a8f8f9024eb2285c30dbbc68e2256ed6afd5bf956a1828239128b2f39b4ce733a438eafe3b2324ff06dec5c1eb7c9b0f838b2daa972f587d909
 DIST julia-Pkg-05fa7f93f73afdabd251247d03144de9f7b36b50.tar.gz 388550 BLAKE2B ec248dbd06a25014905b55cbd6ca55ef245d09b15d4a9b78ec98fd6fe59b318047914698ece8ef85b6a161f115a227ee5346c5f1698bcb74174bca77dbde9968 SHA512 8f1660e55bd8730ab816109fe802edd14c2ab46aed0db7f04e520b371a9f7296c3ab85d42af64174b0989fa55bb089b1450dcee28e67dbb996471235dbba35c1
 DIST julia-Pkg-49908bffe83790bc7cf3c5d46faf3667f8902ad4.tar.gz 389738 BLAKE2B 1ed9201badf0a1db5142e0566bfe085b364e4681670937ac5fa53c15312ff8eb29d5e783b75fe3f4f379b041ba38c66ce94962fa7d98fcfd0b7b49acd1749d69 SHA512 a85aa80b3080794a8e3ae5ce54856e63457c461659c12fde5dde1b5ec33176ea06af49ee516d01ccd7b78d8358de2fe0ffcd5c6a6d5a5088cdcd76a0133780eb
 DIST julia-UnicodeData-13.0.0.txt 1851767 BLAKE2B 72bbcf352f2f6a004abb3f351fe5da160e83644feea8de0ca154b5a1aa78f36cb04b252d0c7b64a5eeca388e600b2875bb76bc2746ee799a1a6eff97c1fe8b06 SHA512 1a4a662e2ab33469976bf5f91aa6933ed9b73f6d4179a2daffb349e1869d7d6cfa885b164e82d15dcdad7458cd451c81add58d875eb0c70de854589dc97b2055
 DIST julia-dsfmt-2.2.3.tar.gz 291773 BLAKE2B 6ffae90494d72527920c80fc0fb005da1c7b84f8a03a7ecb0789434c0fff97359e5098e85431896dffccc7d5148c414e847aaba5feef648b8788421a466ff65e SHA512 6d8ddcd01aab3f9039f4f0288a8af53e290cc2f293ed8c4a8c9f3b3f12398e7eedfce8016117b425766ba89c61c86c13b3e420035b5f9bf91315b8b814c03662
 DIST julia-dsfmt-2.2.4.tar.gz 4984255 BLAKE2B 6119445d93cb45faab28dfb52a18c07cd5703b243b3cddde35fff7a5e948fa8788dfe8428ae8e0a52604f91ac07fe7b3bb0f6c438ef93b5257b42baee9dfdec5 SHA512 fe84e986cbf198172340adfac0436b08f087643eca3f1ceccacde146cbfd8c41e3eb0dfbb062f7ca5f462db13c386abd7c269bc0cbefc9a0ecf97a8a8870a2e4
 DIST julia-libuv-1fcc6d66f9df74189c74d3d390f02202bb7db953.tar.gz 1590342 BLAKE2B eca658f74421587aec78cb38f5a712033afb072e6425a6ce28fd5d4bac61e41cacbd5a850c1f2b29c386b944d1d9c4f16b7d090f7d2dd6b963b5dbc94ae18981 SHA512 70b0c738a60b4e476750b7de8d120e735359e2c36fcb3a8a38628a0ae326210ed3b15d793dfd5443d7aa5603e83e7d99f567aa4c1696846d950df9f83648669c
 DIST julia-libuv-35b1504507a7a4168caae3d78db54d1121b121e1.tar.gz 1577394 BLAKE2B 8ab36f781619f710a64ddc6cf257a4c2f6d27ac22e33ed6f184902d0c6cc3a3941254e0a825071fcd57f869e3ccc5eaf71856539cf6b484358d5aafe383000a9 SHA512 5932e9105346e952fd0f51f79898e5b9c993261ec1558408437647ab3b3ce282562f1e0a16db5704cb66e7aa7a4c6a75dd7f0da498a98b1b6af48da88b4869f0
 DIST julia-libuv-fb3e3364c33ae48c827f6b103e05c3f0e78b79a9.tar.gz 1643008 BLAKE2B b2a121e0b94cd1f5d40e292fc2356e8940bf8dfe1e6a200b50caf60def1982b705d1d42dd234e9e8b0aa70439bf34a5bce71761424623cbfcd20c9131ce09c25 SHA512 29947c236aef8931be4767df1cd8404ee9b036ee107b31cbce6fad9a97743df57d068b15bc4bd00320b9b81cd879258a9ec9dc675853e424ccdb8d6bdd226240
 DIST julia-libwhich-81e9723c0273d78493dc8c8ed570f68d9ce7e89e.tar.gz 4183 BLAKE2B c932e23b1b476d3fd16cf6f451efd5fc6d9c1ec2c53e8ac086340a100817d9b30dae3eff50b284a42c09b2bbae30b9e2fd38b2881f8cbf4974a89f3bd0c87599 SHA512 6fb77b715d70d9bc95a8546c3bf97bd3677c7ea344b88bb5bc3bbfac9dceabe8a8cde7a0f64dec884cde802e4a3000e30837d3f824b5a9242348c4fe061526a3
 DIST julia-utf8proc-0890a538bf8238cded9be0c81171f57e43f2c755.tar.gz 155521 BLAKE2B 32dc1a8fb641e89057d317e579f1802b7f7dfbdbea7f91c01b282b9a88c2fc6143743d5e45f46d6d465857cfe1b28bd39e9a0da19e80516536c57cb62b139d27 SHA512 95d6dba2bbdfc5003f6d21fd02c926c7db9661895010041aacee55fa11dc2524bcffaa90965e2a9a8f2a9e49e93ec7572d6a4de6d5d9f9e075b787537864ea20
 DIST julia-utf8proc-3203baa7374d67132384e2830b2183c92351bffc.tar.gz 182914 BLAKE2B 73ebddea183a5993528b1671d365520bea5087e169c79dde33d225cd19af6daa43624acf1afa52da1fd22cd155819e0497830740d70387d10a94de0397c1f5c0 SHA512 912d51e5c2daf80865e862daba2971e3a77b224d40179225d5908385d2f7f543a92cd2d9b6cecacfab185d8bd8f2732cad7a9d217f25f1e10a77083fda74f0b5
 DIST llvm-11.0.1.src.tar.xz 38914796 BLAKE2B ccdec0632c9cf5fae8e6947c266136e04dc8c609e2ca9c1efb1205767d9181301e0de14601d11e2f27ec0ebc0749858a5f1089d8a40a9ae3f22582cbf6abef6e SHA512 b42c67ef88e09dd94171f85cdf49a421a15cfc82ff715c7ce6de22f98cefbe6c7cdf6bf4af7ca017d56ecf6aa3e36df3d823a78cf2dd5312de4301b54b43dbe8
 DIST llvm-9.0.1.src.tar.xz 33035112 BLAKE2B 5ae7ac42507cb14983eec0785dfc9b9c788cae75d5493ddf6734da55d3733cc90e35634aa39aa536654d4b68c3ccb7c2f989746f21c634c8989a57d9d32a15b2 SHA512 bfb6960a4dd1e18f4005f324f478a781c69e8ec7c20569d9b243fcb9372dc7733b254f26c683373537990cc9c109c78eaf0f65449629ee17caca1bce9b9ccccd
-EBUILD julia-1.5.2-r1.ebuild 5859 BLAKE2B ea9d7704aa427f936df848f0a9aa1897b01f5f375379ca78cc3c14709c6a2d1a53222c8576b4cf12797918529922c553a4be4442e73d3120669ea00bcc2ca04d SHA512 42299e82b2d07964e70be5556dab6bc6ba3eaa9c9fa533d9d139067934315f8e7b6897ada249892d04d8e3fab303d38502cb83633c1498ca89d59c290f38c427
+EBUILD julia-1.5.3.ebuild 6132 BLAKE2B 3b810ee69e088d3efc193644b0aadd4d1cc9c92ebe86ae9e9aea4551b37b28868c228b96baf7007dd703db7ea1ea70003c33fa69812795afbcea48c546ea8d5b SHA512 30a16c894ac50cb763eaa97a4148dd105f61563d119ccaf47bbb36f0d2a392c5e10bbd2096bb19e8ed9022543adc861b57a1cf9718797e0bdfc953fc20f7ca6a
-EBUILD julia-1.5.3.ebuild 6067 BLAKE2B 027053e1570505acb7feb8bff3776169847e01b0a1232c6ac104ee77f44117ac7c97061fb59bb5fa55d1dcc319d4dfa7eb97c84dbd15ba0a1a34b7f3c47e5681 SHA512 f82396f0e0eecb1723d269c890e1f684f9834804e95a7b8fcc88661907ed1cc7a33c74ddc9d7f0f4ff36a345f316cb6a9a1f012a6f54b02ff672369af0516093
+EBUILD julia-1.6.0.ebuild 4550 BLAKE2B 1b16d447378afac015b1d38246556720af0fd9a987ff3710fcfe4791999fbe59c3296abaf4ca307ec580b3f221ab1edf8090d698decfdaa8b39cca02582faa52 SHA512 1bc67d11083af8324af94e1fcc774851689408488ea691422c09681588bcb32ec16ef5eaea121d9f2fe8b08f36263f78aa9f32376dd1076520d6152fa6e026cb
-EBUILD julia-1.6.0.ebuild 6255 BLAKE2B e601075e39152587f6af951a080619ff38d2908c2a381c6d297f51c7e29d8e042dd20d8d3a35f653bcd537efbd9c411cfd69f3c647579acf4d17b48dca31acb6 SHA512 0f20cc39479708b05fd352e2e10bdf543e42744d78081d037ef20d591b8a3e2a22b371b8c5a604a656107d7265ebfd05c3e71d8e2eea026ce51697f529faa38d
+MISC metadata.xml 1529 BLAKE2B b752619b747acd64cb6d5c966d087033f6c2510464a97c1cb4d8f53e9a123fd49f632e8311cfdc7d088ce84a604e747131067e371c2a6898b3f684a5e455610b SHA512 63df8eded4fb5c80e54c92d692ad03caae5f441fafd1d87f4a6af1140556a55d3419a1a716496ddfb7b20503a872ba95e08fd534bd6bcae09d9fe51d10616fc0
 MISC metadata.xml 1388 BLAKE2B b58f320281f3b56151e4f647b3124b2bd915c9194041c7aa3e228cceb56f1d4d6625b9b86394a39c1fb7c0bb524e792cd60576ec76a766dba41204297d792ddd SHA512 91835d230909a2d10ac26280e49d3538e57fc708f141ce366d55d21dc66b588e551aa4e054e76a44695c065a82e6aa09962b84e86eb1f4f12b87ecd90ca256b5
--- a/dev-lang/julia/files/julia-1.6.0-fix-system-csl.patch
+++ b/dev-lang/julia/files/julia-1.6.0-fix-system-csl.patch
@ -0,0 +1,271 @@
 From 71d7a8a8c12b72bfa362ae955d2ce4dfbdf5b8ba Mon Sep 17 00:00:00 2001
 From: Elliot Saba <staticfloat@gmail.com>
 Date: Fri, 26 Mar 2021 18:40:07 +0000
 Subject: [PATCH 1/2] [build] Add `symlink_system_library` calls for CSL
 We differentiate between a `USE_BINARYBUILDER_CSL=0` configuration
 (where we copy the CSL libraries into the Julia build tree) versus a
 `USE_SYSTEM_CSL=1` configuration (where we symlink them in a manner
 similar to other system libararies)
 ---
 Make.inc      | 23 +++++++++++++-
 base/Makefile | 88 ++++++++++++++++++++++++++++++---------------------
 deps/csl.mk   | 40 ++++++++---------------
 3 files changed, 87 insertions(+), 64 deletions(-)
 diff --git a/Make.inc b/Make.inc
 index 519720a861ed7..7cba05806e684 100644
 --- a/Make.inc
 +++ b/Make.inc
@@ -596,6 +596,21 @@ else
   SHLIB_EXT := so
 endif
 +ifeq ($(OS),WINNT)
 +define versioned_libname
 +$$(if $(2),$(1)-$(2).$(SHLIB_EXT),$(1).$(SHLIB_EXT))
 +endef
 +else ifeq ($(OS),Darwin)
 +define versioned_libname
 +$$(if $(2),$(1).$(2).$(SHLIB_EXT),$(1).$(SHLIB_EXT))
 +endef
 +else
 +define versioned_libname
 +$$(if $(2),$(1).$(SHLIB_EXT).$(2),$(1).$(SHLIB_EXT))
 +endef
 +endif
 +
 +
 ifeq ($(SHLIB_EXT), so)
 define SONAME_FLAGS
   -Wl,-soname=$1
@@ -1147,6 +1162,8 @@ BB_TRIPLET_LIBGFORTRAN := $(subst $(SPACE),-,$(filter-out cxx%,$(subst -,$(SPACE
 BB_TRIPLET_CXXABI := $(subst $(SPACE),-,$(filter-out libgfortran%,$(subst -,$(SPACE),$(BB_TRIPLET_LIBGFORTRAN_CXXABI))))
 BB_TRIPLET := $(subst $(SPACE),-,$(filter-out cxx%,$(filter-out libgfortran%,$(subst -,$(SPACE),$(BB_TRIPLET_LIBGFORTRAN_CXXABI)))))
 +LIBGFORTRAN_VERSION := $(subst libgfortran,,$(filter libgfortran%,$(subst -,$(SPACE),$(BB_TRIPLET_LIBGFORTRAN))))
 +
 # This is the set of projects that BinaryBuilder dependencies are hooked up for.
 BB_PROJECTS := BLASTRAMPOLINE OPENBLAS LLVM SUITESPARSE OPENLIBM GMP MBEDTLS LIBSSH2 NGHTTP2 MPFR CURL LIBGIT2 PCRE LIBUV LIBUNWIND DSFMT OBJCONV ZLIB P7ZIP CSL
 define SET_BB_DEFAULT
@@ -1479,8 +1496,12 @@ ifneq ($(findstring $(OS),Linux FreeBSD),)
 LIBGCC_NAME := libgcc_s.$(SHLIB_EXT).1
 endif
 -
 +# USE_SYSTEM_CSL causes it to get symlinked into build_private_shlibdir
 +ifeq ($(USE_SYSTEM_CSL),1)
 +LIBGCC_BUILD_DEPLIB := $(call dep_lib_path,$(build_libdir),$(build_private_shlibdir)/$(LIBGCC_NAME))
 +else
 LIBGCC_BUILD_DEPLIB := $(call dep_lib_path,$(build_libdir),$(build_shlibdir)/$(LIBGCC_NAME))
 +endif
 LIBGCC_INSTALL_DEPLIB := $(call dep_lib_path,$(libdir),$(private_shlibdir)/$(LIBGCC_NAME))
 # USE_SYSTEM_LIBM and USE_SYSTEM_OPENLIBM causes it to get symlinked into build_private_shlibdir
 diff --git a/base/Makefile b/base/Makefile
 index e024e546f94d3..2bef6aab7f1f4 100644
 --- a/base/Makefile
 +++ b/base/Makefile
@@ -169,53 +169,69 @@ endif
 #	echo "$$P"
 define symlink_system_library
 -symlink_$1: $$(build_private_libdir)/$1.$$(SHLIB_EXT)
 -$$(build_private_libdir)/$1.$$(SHLIB_EXT):
 -	REALPATH=`$$(call spawn,$$(build_depsbindir)/libwhich) -p $$(notdir $$@)` && \
 -	$$(call resolve_path,REALPATH) && \
 -	[ -e "$$$$REALPATH" ] && \
 -	([ ! -e "$$@" ] || rm "$$@") && \
 -	echo ln -sf "$$$$REALPATH" "$$@" && \
 -	ln -sf "$$$$REALPATH" "$$@"
 -ifneq ($2,)
 -ifneq ($$(USE_SYSTEM_$2),0)
 -SYMLINK_SYSTEM_LIBRARIES += symlink_$1
 -endif
 +libname_$2 := $$(notdir $(call versioned_libname,$2,$3))
 +libpath_$2 := $$(shell $$(call spawn,$$(build_depsbindir)/libwhich) -p $$(libname_$2) 2>/dev/null)
 +symlink_$2: $$(build_private_libdir)/$$(libname_$2)
 +$$(build_private_libdir)/$$(libname_$2):
 +	@if [ -e "$$(libpath_$2)" ]; then \
 +		REALPATH=$$(libpath_$2); \
 +		$$(call resolve_path,REALPATH) && \
 +		[ -e "$$$$REALPATH" ] && \
 +		([ ! -e "$$@" ] || rm "$$@") && \
 +		echo ln -sf "$$$$REALPATH" "$$@" && \
 +		ln -sf "$$$$REALPATH" "$$@"; \
 +	else \
 +		if [ "$4" != "ALLOW_FAILURE" ]; then \
 +			echo "System library symlink failure: Unable to locate $$(libname_$2) on your system!" >&2; \
 +			false; \
 +		fi; \
 +	fi
 +ifneq ($$(USE_SYSTEM_$1),0)
 +SYMLINK_SYSTEM_LIBRARIES += symlink_$2
 endif
 endef
 # the following excludes: libuv.a, libutf8proc.a
 -$(eval $(call symlink_system_library,$(LIBMNAME)))
 ifneq ($(USE_SYSTEM_LIBM),0)
 -SYMLINK_SYSTEM_LIBRARIES += symlink_$(LIBMNAME)
 +$(eval $(call symlink_system_library,LIBM,$(LIBMNAME)))
 else ifneq ($(USE_SYSTEM_OPENLIBM),0)
 -SYMLINK_SYSTEM_LIBRARIES += symlink_$(LIBMNAME)
 +$(eval $(call symlink_system_library,OPENLIBM,$(LIBMNAME)))
 endif
 -$(eval $(call symlink_system_library,libpcre2-8,PCRE))
 -$(eval $(call symlink_system_library,libdSFMT,DSFMT))
 -$(eval $(call symlink_system_library,$(LIBBLASNAME),BLAS))
 +$(eval $(call symlink_system_library,CSL,libgcc_s,1))
 +ifneq (,$(LIBGFORTRAN_VERSION))
 +$(eval $(call symlink_system_library,CSL,libgfortran,$(LIBGFORTRAN_VERSION)))
 +endif
 +$(eval $(call symlink_system_library,CSL,libquadmath,0))
 +$(eval $(call symlink_system_library,CSL,libstdc++,6))
 +# We allow libssp, libatomic and libgomp to fail as they are not available on all systems
 +$(eval $(call symlink_system_library,CSL,libssp,0,ALLOW_FAILURE))
 +$(eval $(call symlink_system_library,CSL,libatomic,1,ALLOW_FAILURE))
 +$(eval $(call symlink_system_library,CSL,libgomp,1,ALLOW_FAILURE))
 +$(eval $(call symlink_system_library,PCRE,libpcre2-8))
 +$(eval $(call symlink_system_library,DSFMT,libdSFMT))
 +$(eval $(call symlink_system_library,BLAS,$(LIBBLASNAME)))
 ifneq ($(LIBLAPACKNAME),$(LIBBLASNAME))
 -$(eval $(call symlink_system_library,$(LIBLAPACKNAME),LAPACK))
 +$(eval $(call symlink_system_library,LAPACK,$(LIBLAPACKNAME)))
 endif
 -$(eval $(call symlink_system_library,libgmp,GMP))
 -$(eval $(call symlink_system_library,libmpfr,MPFR))
 -$(eval $(call symlink_system_library,libmbedtls,MBEDTLS))
 -$(eval $(call symlink_system_library,libmbedcrypto,MBEDTLS))
 -$(eval $(call symlink_system_library,libmbedx509,MBEDTLS))
 -$(eval $(call symlink_system_library,libssh2,LIBSSH2))
 -$(eval $(call symlink_system_library,libnghttp2,NGHTTP2))
 -$(eval $(call symlink_system_library,libcurl,CURL))
 -$(eval $(call symlink_system_library,libgit2,LIBGIT2))
 -$(eval $(call symlink_system_library,libamd,SUITESPARSE))
 -$(eval $(call symlink_system_library,libcamd,SUITESPARSE))
 -$(eval $(call symlink_system_library,libccolamd,SUITESPARSE))
 -$(eval $(call symlink_system_library,libcholmod,SUITESPARSE))
 -$(eval $(call symlink_system_library,libcolamd,SUITESPARSE))
 -$(eval $(call symlink_system_library,libumfpack,SUITESPARSE))
 -$(eval $(call symlink_system_library,libspqr,SUITESPARSE))
 -$(eval $(call symlink_system_library,libsuitesparseconfig,SUITESPARSE))
 +$(eval $(call symlink_system_library,GMP,libgmp))
 +$(eval $(call symlink_system_library,MPFR,libmpfr))
 +$(eval $(call symlink_system_library,MBEDTLS,libmbedtls))
 +$(eval $(call symlink_system_library,MBEDTLS,libmbedcrypto))
 +$(eval $(call symlink_system_library,MBEDTLS,libmbedx509))
 +$(eval $(call symlink_system_library,LIBSSH2,libssh2))
 +$(eval $(call symlink_system_library,NGHTTP2,libnghttp2))
 +$(eval $(call symlink_system_library,CURL,libcurl))
 +$(eval $(call symlink_system_library,LIBGIT2,libgit2))
 +$(eval $(call symlink_system_library,SUITESPARSE,libamd))
 +$(eval $(call symlink_system_library,SUITESPARSE,libcamd))
 +$(eval $(call symlink_system_library,SUITESPARSE,libccolamd))
 +$(eval $(call symlink_system_library,SUITESPARSE,libcholmod))
 +$(eval $(call symlink_system_library,SUITESPARSE,libcolamd))
 +$(eval $(call symlink_system_library,SUITESPARSE,libumfpack))
 +$(eval $(call symlink_system_library,SUITESPARSE,libspqr))
 +$(eval $(call symlink_system_library,SUITESPARSE,libsuitesparseconfig))
 # EXCLUDED LIBRARIES (installed/used, but not vendored for use with dlopen):
 # libunwind
 endif # WINNT
 diff --git a/deps/csl.mk b/deps/csl.mk
 index 095d4ceec4a1e..423201cbb5a0c 100644
 --- a/deps/csl.mk
 +++ b/deps/csl.mk
@@ -19,48 +19,34 @@ $$(build_shlibdir)/$(1): | $$(build_shlibdir)
 	[ -n "$$$${SRC_LIB}" ] && cp $$$${SRC_LIB} $$(build_shlibdir)
 endef
 -ifeq ($(OS),WINNT)
 -define gen_libname
 -$$(if $(2),lib$(1)-$(2).$(SHLIB_EXT),lib$(1).$(SHLIB_EXT))
 -endef
 -else ifeq ($(OS),Darwin)
 -define gen_libname
 -$$(if $(2),lib$(1).$(2).$(SHLIB_EXT),lib$(1).$(SHLIB_EXT))
 -endef
 -else
 -define gen_libname
 -$$(if $(2),lib$(1).$(SHLIB_EXT).$(2),lib$(1).$(SHLIB_EXT))
 -endef
 -endif
 -
 # libgfortran has multiple names; we're just going to copy any version we can find
 # Since we're only looking in the location given by `$(FC)` this should only succeed for one.
 -$(eval $(call copy_csl,$(call gen_libname,gfortran,3)))
 -$(eval $(call copy_csl,$(call gen_libname,gfortran,4)))
 -$(eval $(call copy_csl,$(call gen_libname,gfortran,5)))
 +$(eval $(call copy_csl,$(call versioned_libname,libgfortran,3)))
 +$(eval $(call copy_csl,$(call versioned_libname,libgfortran,4)))
 +$(eval $(call copy_csl,$(call versioned_libname,libgfortran,5)))
 # These are all libraries that we should always have
 -$(eval $(call copy_csl,$(call gen_libname,quadmath,0)))
 -$(eval $(call copy_csl,$(call gen_libname,stdc++,6)))
 -$(eval $(call copy_csl,$(call gen_libname,ssp,0)))
 -$(eval $(call copy_csl,$(call gen_libname,atomic,1)))
 -$(eval $(call copy_csl,$(call gen_libname,gomp,1)))
 +$(eval $(call copy_csl,$(call versioned_libname,libquadmath,0)))
 +$(eval $(call copy_csl,$(call versioned_libname,libstdc++,6)))
 +$(eval $(call copy_csl,$(call versioned_libname,libssp,0)))
 +$(eval $(call copy_csl,$(call versioned_libname,libatomic,1)))
 +$(eval $(call copy_csl,$(call versioned_libname,libgomp,1)))
 ifeq ($(OS),WINNT)
 # Windwos has special gcc_s names
 ifeq ($(ARCH),i686)
 -$(eval $(call copy_csl,$(call gen_libname,gcc_s_sjlj,1)))
 +$(eval $(call copy_csl,$(call versioned_libname,libgcc_s_sjlj,1)))
 else
 -$(eval $(call copy_csl,$(call gen_libname,gcc_s_seh,1)))
 +$(eval $(call copy_csl,$(call versioned_libname,libgcc_s_seh,1)))
 endif
 else
 -$(eval $(call copy_csl,$(call gen_libname,gcc_s,1)))
 +$(eval $(call copy_csl,$(call versioned_libname,libgcc_s,1)))
 endif
 # winpthread is only Windows, pthread is only others
 ifeq ($(OS),WINNT)
 -$(eval $(call copy_csl,$(call gen_libname,winpthread,1)))
 +$(eval $(call copy_csl,$(call versioned_libname,libwinpthread,1)))
 else
 -$(eval $(call copy_csl,$(call gen_libname,pthread,0)))
 +$(eval $(call copy_csl,$(call versioned_libname,libpthread,0)))
 endif
 get-csl:
 From 6536b8519b25db844f2a1866d056879cb87d1c66 Mon Sep 17 00:00:00 2001
 From: Elliot Saba <staticfloat@gmail.com>
 Date: Fri, 26 Mar 2021 22:32:04 +0000
 Subject: [PATCH 2/2] Expand `JL_PRIVATE_LIBS-1` for versioned library names as
 well
 Without this, we fail to install things like `libgcc_s.so.1` when
 installed into the private libdir by `symlink_system_libraries`.
 ---
 Makefile | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)
 diff --git a/Makefile b/Makefile
 index 823ff3b86339d..e08f0e959e1b3 100644
 --- a/Makefile
 +++ b/Makefile
@@ -290,8 +290,11 @@ endif
 		done \
 	done
 	for suffix in $(JL_PRIVATE_LIBS-1) ; do \
 -		lib=$(build_private_libdir)/$${suffix}.$(SHLIB_EXT); \
 -		$(INSTALL_M) $$lib $(DESTDIR)$(private_libdir) ; \
 +		for lib in $(build_private_libdir)/$${suffix}.$(SHLIB_EXT)*; do \
 +			if [ "$${lib##*.}" != "dSYM" ]; then \
 +				$(INSTALL_M) $$lib $(DESTDIR)$(private_libdir) ; \
 +			fi \
 +		done \
 	done
 endif
 	# Install `7z` into libexec/
--- a/dev-lang/julia/julia-1.5.2-r1.ebuild
+++ b/dev-lang/julia/julia-1.5.2-r1.ebuild
@ -1,208 +0,0 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 EAPI=7
 inherit llvm pax-utils toolchain-funcs
 # correct versions for stdlibs are in deps/checksums
 # for everything else, run with network-sandbox and wait for the crash
 MY_PV="${PV//_rc/-rc}"
 MY_DSFMT_V="2.2.3"
 MY_LIBUV_V="35b1504507a7a4168caae3d78db54d1121b121e1"
 MY_LIBWHICH_V="81e9723c0273d78493dc8c8ed570f68d9ce7e89e"
 MY_LLVM_V="9.0.1"
 MY_PKG_V="49908bffe83790bc7cf3c5d46faf3667f8902ad4"
 MY_UNICODE_V="13.0.0"
 MY_UTF8PROC_V="0890a538bf8238cded9be0c81171f57e43f2c755"
 DESCRIPTION="High-performance programming language for technical computing"
 HOMEPAGE="https://julialang.org/"
 SRC_URI="
 	https://github.com/JuliaLang/${PN}/releases/download/v${MY_PV}/${PN}-${MY_PV}.tar.gz
 	https://api.github.com/repos/JuliaLang/libuv/tarball/${MY_LIBUV_V} -> ${PN}-libuv-${MY_LIBUV_V}.tar.gz
 	https://api.github.com/repos/JuliaLang/utf8proc/tarball/${MY_UTF8PROC_V} -> ${PN}-utf8proc-${MY_UTF8PROC_V}.tar.gz
 	https://api.github.com/repos/vtjnash/libwhich/tarball/${MY_LIBWHICH_V} -> ${PN}-libwhich-${MY_LIBWHICH_V}.tar.gz
 	http://www.math.sci.hiroshima-u.ac.jp/~m-mat/MT/SFMT/dSFMT-src-${MY_DSFMT_V}.tar.gz -> ${PN}-dsfmt-${MY_DSFMT_V}.tar.gz
 	http://www.unicode.org/Public/${MY_UNICODE_V}/ucd/UnicodeData.txt -> ${PN}-UnicodeData-${MY_UNICODE_V}.txt
 	https://dev.gentoo.org/~tamiko/distfiles/Pkg-${MY_PKG_V}.tar.gz -> ${PN}-Pkg-${MY_PKG_V}.tar.gz
 	!system-llvm? ( https://github.com/llvm/llvm-project/releases/download/llvmorg-${MY_LLVM_V}/llvm-${MY_LLVM_V}.src.tar.xz )
 "
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="system-llvm"
 RDEPEND="
 	system-llvm? ( sys-devel/llvm:9=[llvm_targets_NVPTX(-)] )
 	!system-llvm? ( dev-util/cmake )
 "
 LLVM_MAX_SLOT=9
 RDEPEND+="
 	dev-libs/double-conversion:0=
 	dev-libs/gmp:0=
 	dev-libs/libgit2:0
 	>=dev-libs/libpcre2-10.23:0=[jit,unicode]
 	dev-libs/mpfr:0=
 	dev-libs/openspecfun
 	>=net-libs/mbedtls-2.2
 	net-libs/libssh2
 	sci-libs/amd:0=
 	sci-libs/arpack:0=
 	sci-libs/camd:0=
 	sci-libs/ccolamd:0=
 	sci-libs/cholmod:0=
 	sci-libs/colamd:0=
 	sci-libs/fftw:3.0=[threads]
 	sci-libs/openlibm:0=
 	sci-libs/spqr:0=
 	sci-libs/umfpack:0=
 	sci-mathematics/glpk:0=
 	>=sys-libs/libunwind-1.1:0=
 	sys-libs/readline:0=
 	sys-libs/zlib:0=
 	>=virtual/blas-3.6
 	virtual/lapack"
 DEPEND="${RDEPEND}
 	dev-util/patchelf
 	virtual/pkgconfig"
 PATCHES=(
 	"${FILESDIR}"/${PN}-1.1.0-fix_build_system.patch
 	"${FILESDIR}"/${PN}-1.1.0-fix_llvm_install.patch
 	"${FILESDIR}"/${PN}-1.4.0-no_symlink_llvm.patch
 )
 S="${WORKDIR}/${PN}-${MY_PV}"
 pkg_setup() {
 	use system-llvm && llvm_pkg_setup
 }
 src_unpack() {
 	tounpack=(${A})
 	# the main source tree, followed by deps
 	unpack "${A/%\ */}"
 	mkdir -p "${S}/deps/srccache/"
 	for i in "${tounpack[@]:1}"; do
 		if [[ $i == *Pkg* ]] || [[ $i = *Statistics* ]]; then
 			# Bundled Pkg and Statistics packages go into ./stdlib
 			local tarball="${i#julia-}"
 			cp "${DISTDIR}/${i}" "${S}/stdlib/srccache/${tarball}" || die
 			# and we have to fix up the sha1sum
 			local name="${tarball%-*}"
 			local sha1="${tarball#*-}"
 			sha1="${sha1%.tar*}"
 			einfo "using patched stdlib package \"${name}\""
 			sed -i -e "s/PKG_SHA1 = .*/PKG_SHA1 = ${sha1}/" "${S}/stdlib/${name}.version" || die
 		else
 			cp "${DISTDIR}/${i}" "${S}/deps/srccache/${i#julia-}" || die
 		fi
 	done
 }
 src_prepare() {
 	default
 	# Sledgehammer:
 	# - prevent fetching of bundled stuff in compile and install phase
 	# - respect CFLAGS
 	# - respect EPREFIX and Gentoo specific paths
 	sed -i \
 		-e "s|GENTOOCFLAGS|${CFLAGS}|g" \
 		-e "s|/usr/include|${EPREFIX}/usr/include|g" \
 		deps/Makefile || die
 	sed -i \
 		-e "s|GENTOOCFLAGS|${CFLAGS}|g" \
 		-e "s|GENTOOLIBDIR|$(get_libdir)|" \
 		Make.inc || die
 	sed -i \
 		-e "s|,lib)|,$(get_libdir))|g" \
 		-e "s|\$(BUILD)/lib|\$(BUILD)/$(get_libdir)|g" \
 		Makefile || die
 	sed -i \
 		-e "s|ar -rcs|$(tc-getAR) -rcs|g" \
 		src/Makefile || die
 	# disable doc install starting	git fetching
 	sed -i -e 's~install: $(build_depsbindir)/stringreplace $(BUILDROOT)/doc/_build/html/en/index.html~install: $(build_depsbindir)/stringreplace~' Makefile || die
 }
 src_configure() {
 	# julia does not play well with the system versions of dsfmt, libuv,
 	# and utf8proc
 	use system-llvm && ewarn "You have enabled system-llvm. This is unsupported by upstream and may not work."
 	# USE_SYSTEM_LIBM=0 implies using external openlibm
 	cat <<-EOF > Make.user
 		USE_BINARYBUILDER:=0
 		USE_SYSTEM_LLVM:=$(usex system-llvm 1 0)
 		USE_SYSTEM_LIBUNWIND:=1
 		USE_SYSTEM_PCRE:=1
 		USE_SYSTEM_LIBM:=0
 		USE_SYSTEM_OPENLIBM:=1
 		USE_SYSTEM_DSFMT:=0
 		USE_SYSTEM_BLAS:=1
 		USE_SYSTEM_LAPACK:=1
 		USE_SYSTEM_GMP:=1
 		USE_SYSTEM_MPFR:=1
 		USE_SYSTEM_SUITESPARSE:=1
 		USE_SYSTEM_LIBUV:=0
 		USE_SYSTEM_UTF8PROC:=0
 		USE_SYSTEM_MBEDTLS:=1
 		USE_SYSTEM_LIBSSH2:=1
 		USE_SYSTEM_CURL:=1
 		USE_SYSTEM_LIBGIT2:=1
 		USE_SYSTEM_PATCHELF:=1
 		USE_SYSTEM_ZLIB:=1
 		USE_SYSTEM_P7ZIP:=1
 		VERBOSE=1
 		libdir="${EROOT}/usr/$(get_libdir)"
 	EOF
 }
 src_compile() {
 	# Julia accesses /proc/self/mem on Linux
 	addpredict /proc/self/mem
 	emake julia-release \
 		prefix="${EPREFIX}/usr" DESTDIR="${D}" \
 		CC="$(tc-getCC)" CXX="$(tc-getCXX)"
 	pax-mark m "$(file usr/bin/julia-* | awk -F : '/ELF/ {print $1}')"
 	emake
 }
 src_install() {
 	emake install \
 		prefix="${EPREFIX}/usr" DESTDIR="${D}" \
 		CC="$(tc-getCC)" CXX="$(tc-getCXX)"
 	if ! use system-llvm ; then
 		cp "${S}/usr/lib/libLLVM"-?jl.so "${ED}/usr/$(get_libdir)/julia/" || die
 	fi
 	dodoc README.md
 	mv "${ED}"/usr/etc/julia "${ED}"/etc || die
 	rmdir "${ED}"/usr/etc || die
 	mv "${ED}"/usr/share/doc/julia/html "${ED}"/usr/share/doc/"${PF}" || die
 	rmdir "${ED}"/usr/share/doc/julia || die
 	# The appdata directory is deprecated.
 	mv "${ED}"/usr/share/{appdata,metainfo}/ || die
 }
 pkg_postinst() {
 	elog "To use Plots, you will need to install sci-visualization/gr."
 }
--- a/dev-lang/julia/julia-1.5.3.ebuild
+++ b/dev-lang/julia/julia-1.5.3.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
@ -35,9 +35,10 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="system-llvm"
 	# llvm:9 has been removed from the tree USE=-system-llvm force in
 	# profiles
 	#system-llvm? ( sys-devel/llvm:9=[llvm_targets_NVPTX(-)] )
 RDEPEND="
 	system-llvm? ( sys-devel/llvm:9=[llvm_targets_NVPTX(-)] )
 	!system-llvm? ( dev-util/cmake )
 "
 LLVM_MAX_SLOT=9
@ -74,7 +75,8 @@ RDEPEND+="
 DEPEND="${RDEPEND}
 	dev-util/patchelf
-	virtual/pkgconfig"
+	virtual/pkgconfig
 	!system-llvm? ( dev-util/cmake )"
 PATCHES=(
 	"${FILESDIR}"/${PN}-1.1.0-fix_build_system.patch
@ -182,7 +184,7 @@ src_compile() {
 	addpredict /proc/self/mem
 	emake \
-		prefix="${EPREFIX}/usr" DESTDIR="${D}" \
+		prefix="${EPREFIX}/usr" \
 		CC="$(tc-getCC)" CXX="$(tc-getCXX)" AR="$(tc-getAR)"
 	pax-mark m "$(file usr/bin/julia-* | awk -F : '/ELF/ {print $1}')"
 }
--- a/dev-lang/julia/julia-1.6.0.ebuild
+++ b/dev-lang/julia/julia-1.6.0.ebuild
@ -8,52 +8,40 @@ inherit llvm pax-utils toolchain-funcs
 # correct versions for stdlibs are in deps/checksums
 # for everything else, run with network-sandbox and wait for the crash
 MY_PV="${PV//_rc/-rc}"
 MY_DSFMT_V="2.2.4"
 MY_LIBUV_V="fb3e3364c33ae48c827f6b103e05c3f0e78b79a9"
 MY_LIBWHICH_V="81e9723c0273d78493dc8c8ed570f68d9ce7e89e"
 MY_LLVM_V="11.0.1"
 MY_PKG_V="05fa7f93f73afdabd251247d03144de9f7b36b50"
 MY_UNICODE_V="13.0.0"
 MY_UTF8PROC_V="3203baa7374d67132384e2830b2183c92351bffc"
 DESCRIPTION="High-performance programming language for technical computing"
 HOMEPAGE="https://julialang.org/"
 SRC_URI="
-	https://github.com/JuliaLang/${PN}/releases/download/v${MY_PV}/${PN}-${MY_PV}.tar.gz
+	https://github.com/JuliaLang/julia/releases/download/v${PV}/${P}.tar.gz
 	https://api.github.com/repos/JuliaLang/libuv/tarball/${MY_LIBUV_V} -> ${PN}-libuv-${MY_LIBUV_V}.tar.gz
 	https://api.github.com/repos/JuliaLang/utf8proc/tarball/${MY_UTF8PROC_V} -> ${PN}-utf8proc-${MY_UTF8PROC_V}.tar.gz
 	https://api.github.com/repos/vtjnash/libwhich/tarball/${MY_LIBWHICH_V} -> ${PN}-libwhich-${MY_LIBWHICH_V}.tar.gz
 	https://github.com/MersenneTwister-Lab/dSFMT/archive/v${MY_DSFMT_V}.tar.gz -> ${PN}-dsfmt-${MY_DSFMT_V}.tar.gz
 	http://www.unicode.org/Public/${MY_UNICODE_V}/ucd/UnicodeData.txt -> ${PN}-UnicodeData-${MY_UNICODE_V}.txt
 	https://dev.gentoo.org/~patrick/Pkg-${MY_PKG_V}.tar.gz -> ${PN}-Pkg-${MY_PKG_V}.tar.gz
 	!system-llvm? ( https://github.com/llvm/llvm-project/releases/download/llvmorg-${MY_LLVM_V}/llvm-${MY_LLVM_V}.src.tar.xz )
 "
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="system-llvm"
+IUSE="+system-llvm"
 RDEPEND="
 	system-llvm? ( sys-devel/llvm:11=[llvm_targets_NVPTX(-)] )
 	!system-llvm? ( dev-util/cmake )
 "
 LLVM_MAX_SLOT=11
 # Silence some QA warnings. The julia build system does not use user
 # defined CFLAGS for some of the generated binary modules.
 QA_FLAGS_IGNORED='.*'
 RDEPEND+="
-	dev-libs/double-conversion:0=
+	app-arch/p7zip
 	dev-libs/gmp:0=
 	dev-libs/libgit2:0
 	>=dev-libs/libpcre2-10.23:0=[jit,unicode]
 	dev-libs/mpfr:0=
-	dev-libs/openspecfun
+	dev-libs/libutf8proc:0=
-	net-libs/libssh2
+	dev-util/patchelf
 	>=net-libs/mbedtls-2.2
 	net-misc/curl[http2,ssh]
 	sci-libs/amd:0=
 	sci-libs/arpack:0=
 	sci-libs/camd:0=
@ -64,50 +52,35 @@ RDEPEND+="
 	sci-libs/openlibm:0=
 	sci-libs/spqr:0=
 	sci-libs/umfpack:0=
-	sci-mathematics/glpk:0=
+	>=sci-mathematics/dsfmt-2.2.4
 	sci-mathematics/z3
 	>=sys-libs/libunwind-1.1:0=
 	sys-libs/readline:0=
 	sys-libs/zlib:0=
 	>=virtual/blas-3.6
 	virtual/lapack"
 DEPEND="${RDEPEND}
 	dev-util/patchelf
-	virtual/pkgconfig"
+	virtual/pkgconfig
 	!system-llvm? ( dev-util/cmake )"
 PATCHES=(
-	"${FILESDIR}"/${PN}-1.6.0-fix_build_system.patch
+	"${FILESDIR}/${PN}"-1.1.0-fix_llvm_install.patch
-	"${FILESDIR}"/${PN}-1.1.0-fix_llvm_install.patch
+	"${FILESDIR}/${PN}"-1.4.0-no_symlink_llvm.patch
-	"${FILESDIR}"/${PN}-1.4.0-no_symlink_llvm.patch
+	"${FILESDIR}/${PN}"-1.6.0-fix-system-csl.patch
 )
 S="${WORKDIR}/${PN}-${MY_PV}"
 pkg_setup() {
 	use system-llvm && llvm_pkg_setup
 }
 src_unpack() {
-	tounpack=(${A})
+	local tounpack=(${A})
 	# the main source tree, followed by deps
-	unpack "${A/%\ */}"
+	unpack "${tounpack[0]}"
 	mkdir -p "${S}/deps/srccache/"
 	for i in "${tounpack[@]:1}"; do
 		if [[ $i == *Pkg* ]] || [[ $i = *Statistics* ]]; then
 			# Bundled Pkg and Statistics packages go into ./stdlib
 			local tarball="${i#julia-}"
 			cp "${DISTDIR}/${i}" "${S}/stdlib/srccache/${tarball}" || die
 			# and we have to fix up the sha1sum
 			local name="${tarball%-*}"
 			local sha1="${tarball#*-}"
 			sha1="${sha1%.tar*}"
 			einfo "using patched stdlib package \"${name}\""
 			sed -i -e "s/PKG_SHA1 = .*/PKG_SHA1 = ${sha1}/" "${S}/stdlib/Pkg.version" || die
 		else
 		cp "${DISTDIR}/${i}" "${S}/deps/srccache/${i#julia-}" || die
 		fi
 	done
 }
@ -120,84 +93,72 @@ src_prepare() {
 	# - respect EPREFIX and Gentoo specific paths
 	sed -i \
-		-e "s|GENTOOCFLAGS|${CFLAGS}|g" \
+		-e "\|SHIPFLAGS :=|c\\SHIPFLAGS := ${CFLAGS}" \
 		-e "s|/usr/include|${EPREFIX}/usr/include|g" \
 		deps/Makefile || die
 	sed -i \
 		-e "s|GENTOOCFLAGS|${CFLAGS}|g" \
 		-e "s|GENTOOLIBDIR|$(get_libdir)|" \
 		Make.inc || die
 	sed -i \
 		-e "s|,lib)|,$(get_libdir))|g" \
 		-e "s|\$(BUILD)/lib|\$(BUILD)/$(get_libdir)|g" \
 		Makefile || die
 	sed -i \
 		-e "s|ar -rcs|$(tc-getAR) -rcs|g" \
 		src/Makefile || die
 	# disable doc install starting	git fetching
 	sed -i -e 's~install: $(build_depsbindir)/stringreplace $(BUILDROOT)/doc/_build/html/en/index.html~install: $(build_depsbindir)/stringreplace~' Makefile || die
 	# now using sha512 additionally, so need to recreate checksum -
 	sha512sum "${S}/stdlib/srccache/Pkg-${MY_PKG_V}.tar.gz" | awk '{ print $1; }' >  "${S}/deps/checksums/Pkg-${MY_PKG_V}.tar.gz/sha512" || die
 }
 src_configure() {
 	# julia does not play well with the system versions of dsfmt, libuv,
 	# and utf8proc
 	use system-llvm && ewarn "You have enabled system-llvm. This is unsupported by upstream and may not work."
 	# julia does not play well with the system versions of libuv
 	# USE_SYSTEM_LIBM=0 implies using external openlibm
 	cat <<-EOF > Make.user
 		LOCALBASE:="${EPREFIX}/usr"
 		override prefix:="${EPREFIX}/usr"
 		override libdir:="\$(prefix)/$(get_libdir)"
 		override CC:=$(tc-getCC)
 		override CXX:=$(tc-getCXX)
 		override AR:=$(tc-getAR)
 		BUNDLE_DEBUG_LIBS:=0
 		USE_BINARYBUILDER:=0
 		USE_SYSTEM_CSL:=1
 		USE_SYSTEM_LLVM:=$(usex system-llvm 1 0)
 		USE_SYSTEM_LIBUNWIND:=1
 		USE_SYSTEM_PCRE:=1
 		USE_SYSTEM_LIBM:=0
 		USE_SYSTEM_OPENLIBM:=1
-		USE_SYSTEM_DSFMT:=0
+		USE_SYSTEM_DSFMT:=1
 		USE_SYSTEM_BLAS:=1
 		USE_SYSTEM_LAPACK:=1
 		USE_SYSTEM_GMP:=1
 		USE_SYSTEM_MPFR:=1
 		USE_SYSTEM_SUITESPARSE:=1
 		USE_SYSTEM_LIBUV:=0
-		USE_SYSTEM_UTF8PROC:=0
+		USE_SYSTEM_UTF8PROC:=1
 		USE_SYSTEM_MBEDTLS:=1
 		USE_SYSTEM_LIBSSH2:=1
 		USE_SYSTEM_NGHTTP2:=1
 		USE_SYSTEM_CURL:=1
 		USE_SYSTEM_LIBGIT2:=1
 		USE_SYSTEM_PATCHELF:=1
 		USE_SYSTEM_ZLIB:=1
 		USE_SYSTEM_P7ZIP:=1
-		VERBOSE=1
+		VERBOSE:=1
 		libdir="${EROOT}/usr/$(get_libdir)"
 	EOF
 }
 src_compile() {
 	# Julia accesses /proc/self/mem on Linux
 	addpredict /proc/self/mem
-	emake \
+	default
 		prefix="${EPREFIX}/usr" DESTDIR="${D}" \
 		CC="$(tc-getCC)" CXX="$(tc-getCXX)" AR="$(tc-getAR)"
 	pax-mark m "$(file usr/bin/julia-* | awk -F : '/ELF/ {print $1}')"
 }
 src_install() {
-	emake install \
+	emake install DESTDIR="${D}"
 		prefix="${EPREFIX}/usr" DESTDIR="${D}" \
 		CC="$(tc-getCC)" CXX="$(tc-getCXX)" AR="$(tc-getAR)" \
 		BUNDLE_DEBUG_LIBS=0
 	if ! use system-llvm ; then
-		cp "${S}/usr/lib/libLLVM"-?jl.so "${ED}/usr/$(get_libdir)/julia/" || die
+		local llvmslot=$(ver_cut 1 ${MY_LLVM_V})
 		cp "${S}/usr/lib/libLLVM-${llvmslot}jl.so" "${ED}/usr/$(get_libdir)/julia/" || die
 	fi
 	dodoc README.md
--- a/dev-lang/julia/metadata.xml
+++ b/dev-lang/julia/metadata.xml
@ -1,7 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
+  <maintainer type="project">
    <email>sci@gentoo.org</email>
    <name>Gentoo Science Project</name>
  </maintainer>
  <maintainer type="person" proxied="yes">
    <email>jeffrey@icurse.nl</email>
    <name>Jeffrey Lin</name>
  </maintainer>
  <maintainer type="person" proxied="proxy">
    <email>tamiko@gentoo.org</email>
    <name>Matthias Maier</name>
  </maintainer>
@ -9,10 +17,6 @@
    <email>patrick@gentoo.org</email>
    <name>Patrick Lauer</name>
  </maintainer>
  <maintainer type="project">
    <email>sci@gentoo.org</email>
    <name>Gentoo Science Project</name>
  </maintainer>
  <longdescription lang="en">
  Julia is a high-level, high-performance dynamic programming language for
  technical computing, with syntax that is familiar to users of other
--- a/dev-libs/Manifest.gz
+++ b/dev-libs/Manifest.gz
--- a/dev-libs/cJSON/Manifest
+++ b/dev-libs/cJSON/Manifest
@ -0,0 +1,3 @@
 DIST cJSON-1.7.14.tar.gz 352028 BLAKE2B 203795f004496793fb04577df1e4a917df2424bf7866e32459584d3dc776ee13263c5e62ded01e3776973d2210e642d1066d3126e2c737bd0fa048464f3aed84 SHA512 8de1dedc123ed025a9cbe6764e5963eb0550f726d06a8f6bedfe05b84e852cd9c1587cd381669663073967f42be894a535ba239013f304ce544c3b15a6477c01
 EBUILD cJSON-1.7.14.ebuild 575 BLAKE2B 18bdd27c0ab70f7575dca499dfed38af207e2a2a0695fb8508eecdd038a8e4ad7807c7b85889e2b6ddfa21a7d3a99d76e7edab2e5138995225809389d485f336 SHA512 b75bc6eb4a87051c67065b91e57ba8aad92067d92e7c39701edac46c3405cd5cdfd2700e983e7575c80da983ee0435c1f685554a7d7c556fcd39df652623b5df
 MISC metadata.xml 337 BLAKE2B 978c9df8613b18cfc28abbc3c97f01db84578bf7f8679dff0e6267989de828840cd60c7c5fcb93031b7b166108399ac12782364b3fd9e9189c5af615188481a0 SHA512 7a3117192e55ea42f26b1a48969fe68cd4086fd3269714231481abbee471ec271de15113426a38ba23e3eb119518ba49c7424a7803e46f8e17040a5044dc2724
--- a/dev-libs/cJSON/cJSON-1.7.14.ebuild
+++ b/dev-libs/cJSON/cJSON-1.7.14.ebuild
@ -0,0 +1,30 @@
 # Copyright 2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 EAPI=7
 inherit cmake
 DESCRIPTION=" Ultralightweight JSON parser in ANSI C"
 HOMEPAGE="https://github.com/DaveGamble/cJSON"
 SRC_URI="https://github.com/DaveGamble/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~amd64"
 IUSE="test"
 RESTRICT="!test? ( test )"
 src_prepare() {
 	cmake_src_prepare
 	sed -i -e '/-Werror/d' CMakeLists.txt || die
 }
 src_configure() {
 	local mycmakeargs=(
 		-DENABLE_CJSON_TEST=$(usex test)
 	)
 	cmake_src_configure
 }
--- a/dev-libs/cJSON/metadata.xml
+++ b/dev-libs/cJSON/metadata.xml
@ -0,0 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
  <maintainer type="person">
    <email>mattst88@gentoo.org</email>
    <name>Matt Turner</name>
  </maintainer>
  <upstream>
    <remote-id type="github">DaveGamble/cJSON</remote-id>
  </upstream>
 </pkgmetadata>
--- a/dev-libs/icu-layoutex/Manifest
+++ b/dev-libs/icu-layoutex/Manifest
@ -1,4 +1,6 @@
 AUX icu-layoutex-65.1-remove-bashisms.patch 4963 BLAKE2B fb781741a7a908638876729d573a73e42b7b3f0f3e692b54799fed0dac006ecb731583d90d849ea06be47259a0a236933fa7a78a96b3a8107ee85f916dc2000a SHA512 67e60068c356ca8d93b137eadeef2562ff7d8f38153babc97edd92a2c38d7113396d63d4a09364dacefc612b4b3ea28872a4f767c4f38d3e725943b32f98c5bc
 DIST icu4c-68_2-src.tgz 24737478 BLAKE2B ff54f903aed1a16928656e5f4fee79e4301038a70ba1d389fb2a2cc7c7dc4c76bc2430c810cea484c0ef69fbafc5728e71776c39874a5395c9dd06d573e8ea90 SHA512 24f3b7981667b37df58118f56ae76a09b719358c1efa8d6f044d28ef8df1c722a894957acadfb3c37aee39ac845893924fc3370d6bbe09875aec8d937059f84b
 DIST icu4c-69_1-src.tgz 24814903 BLAKE2B ef95a04e238f0de96e969d580ef64000ab04a4a0003e8f31fd02baab35387d5ab2c4d792ae0d14f3de8e48aa28570237ccd67fb32e03b13d1572e4a995b1de76 SHA512 d4aeb781715144ea6e3c6b98df5bbe0490bfa3175221a1d667f3e6851b7bd4a638fa4a37d4a921ccb31f02b5d15a6dded9464d98051964a86f7b1cde0ff0aab7
 EBUILD icu-layoutex-68.2.ebuild 2503 BLAKE2B 5c5bfd5784eda15dc43f871c4f2a178a4860e2af59bb1a535e3e0029d988c2084567d92e464b084efbbff0c0fa149b69b1e23f0c8ae662f50e44d7f9cf32bb2a SHA512 bdf1ef449aca671bdad889d213183b6e9c02be1b23af916f1db8d3a3f256442bcb770dc809bf881777593743aae6904e30f8b872d74e901b3c31e8b09b2e7037
 EBUILD icu-layoutex-69.1.ebuild 2508 BLAKE2B 4c9ffe7646a368f7ed77e09eecd0c316eadb0a4a7dbfaa4ae87661a91f0625b8cc1fe78184f34edb2dd7cfba946ff915ec99d621fcab2d1fec7b7dedcb7db77c SHA512 aa19d35f20cd9503458e4eab052c6d83667c92eb7be47bf653c61db17cf51b2717317c36adc90c6ab89985770992745cfc10949a759781f56fa567e6ceef92d2
 MISC metadata.xml 379 BLAKE2B 7dd7c9bef21ada3af657ec75d323fa890bb02e04b1760fb5791bdbddf8d5eaa1126ab80058e73977a5bede8c8e655f9fc7045f43d4fadcb0213ea8a122258380 SHA512 45e7eab7e7d954331f7d64582eaef71c18316335fca7cbf6bbdf8e71555301e995ff7ab04e35977be8a82fc8360af00115567aeddd710b253c6a68fd893228aa
--- a/dev-libs/icu-layoutex/icu-layoutex-69.1.ebuild
+++ b/dev-libs/icu-layoutex/icu-layoutex-69.1.ebuild
@ -0,0 +1,109 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 EAPI=7
 inherit autotools flag-o-matic multilib-minimal toolchain-funcs
 DESCRIPTION="External layout part of International Components for Unicode"
 HOMEPAGE="http://www.icu-project.org/"
 SRC_URI="https://github.com/unicode-org/icu/releases/download/release-${PV//./-}/icu4c-${PV//./_}-src.tgz"
 LICENSE="BSD"
 SLOT="0/${PV}"
 KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE="debug static-libs"
 BDEPEND="
 	virtual/pkgconfig
 "
 DEPEND="
 	~dev-libs/icu-${PV}[${MULTILIB_USEDEP}]
 	dev-libs/icu-le-hb[${MULTILIB_USEDEP}]
 "
 RDEPEND="${DEPEND}"
 S="${WORKDIR}/${PN/-layoutex}/source"
 PATCHES=(
 	"${FILESDIR}/${PN}-65.1-remove-bashisms.patch"
 )
 src_prepare() {
 	# apply patches
 	default
 	# Disable renaming as it is stupid thing to do
 	sed -i \
 		-e "s/#define U_DISABLE_RENAMING 0/#define U_DISABLE_RENAMING 1/" \
 		common/unicode/uconfig.h || die
 	# Fix linking of icudata
 	sed -i \
 		-e "s:LDFLAGSICUDT=-nodefaultlibs -nostdlib:LDFLAGSICUDT=:" \
 		config/mh-linux || die
 	eautoreconf
 }
 src_configure() {
 	# Use C++14
 	append-cxxflags -std=c++14
 	if tc-is-cross-compiler; then
 		mkdir "${WORKDIR}"/host || die
 		pushd "${WORKDIR}"/host >/dev/null || die
 		CFLAGS="" CXXFLAGS="" ASFLAGS="" LDFLAGS="" \
 		CC="$(tc-getBUILD_CC)" CXX="$(tc-getBUILD_CXX)" AR="$(tc-getBUILD_AR)" \
 		RANLIB="$(tc-getBUILD_RANLIB)" LD="$(tc-getBUILD_LD)" \
 		"${S}"/configure --disable-renaming --disable-debug \
 			--disable-samples --enable-static || die
 		emake
 		popd >/dev/null || die
 	fi
 	multilib-minimal_src_configure
 }
 multilib_src_configure() {
 	local myeconfargs=(
 		--disable-renaming
 		--disable-samples
 		--enable-layoutex
 		$(use_enable debug)
 		$(use_enable static-libs static)
 	)
 	tc-is-cross-compiler && myeconfargs+=(
 		--with-cross-build="${WORKDIR}"/host
 	)
 	# icu tries to use clang by default
 	tc-export CC CXX
 	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
 }
 multilib_src_test() {
 	# INTLTEST_OPTS: intltest options
 	#   -e: Exhaustive testing
 	#   -l: Reporting of memory leaks
 	#   -v: Increased verbosity
 	# IOTEST_OPTS: iotest options
 	#   -e: Exhaustive testing
 	#   -v: Increased verbosity
 	# CINTLTST_OPTS: cintltst options
 	#   -e: Exhaustive testing
 	#   -v: Increased verbosity
 	pushd layoutex &>/dev/null || die
 	emake -j1 VERBOSE="1" check
 	popd &>/dev/null || die
 }
 multilib_src_install() {
 	pushd layoutex &>/dev/null || die
 	default
 	popd &>/dev/null || die
 }
--- a/dev-libs/icu/Manifest
+++ b/dev-libs/icu/Manifest
@ -2,5 +2,7 @@ AUX icu-64.2-darwin.patch 2136 BLAKE2B 3c54a15e351a97f7c423128e493ed158e56191738
 AUX icu-65.1-remove-bashisms.patch 4963 BLAKE2B fb781741a7a908638876729d573a73e42b7b3f0f3e692b54799fed0dac006ecb731583d90d849ea06be47259a0a236933fa7a78a96b3a8107ee85f916dc2000a SHA512 67e60068c356ca8d93b137eadeef2562ff7d8f38153babc97edd92a2c38d7113396d63d4a09364dacefc612b4b3ea28872a4f767c4f38d3e725943b32f98c5bc
 AUX icu-68.1-nonunicode.patch 477 BLAKE2B 5e74142e5adbf8f3fffa23c8fb08657b5b75d12941db39980abea1fff2328c112196b62cc89d521e8cc2a1f7c11b58816401a838bb8fcbe50036e80d3d9e4343 SHA512 5d605cc1cbbd16221603a9509d07713d64201f4fc1a372d29c18f8d49a4618fcd7e0a0bb0a459024a288e5c2c339a9aa0849abe88691ee2cdb24b92c9b61e290
 DIST icu4c-68_2-src.tgz 24737478 BLAKE2B ff54f903aed1a16928656e5f4fee79e4301038a70ba1d389fb2a2cc7c7dc4c76bc2430c810cea484c0ef69fbafc5728e71776c39874a5395c9dd06d573e8ea90 SHA512 24f3b7981667b37df58118f56ae76a09b719358c1efa8d6f044d28ef8df1c722a894957acadfb3c37aee39ac845893924fc3370d6bbe09875aec8d937059f84b
 DIST icu4c-69_1-src.tgz 24814903 BLAKE2B ef95a04e238f0de96e969d580ef64000ab04a4a0003e8f31fd02baab35387d5ab2c4d792ae0d14f3de8e48aa28570237ccd67fb32e03b13d1572e4a995b1de76 SHA512 d4aeb781715144ea6e3c6b98df5bbe0490bfa3175221a1d667f3e6851b7bd4a638fa4a37d4a921ccb31f02b5d15a6dded9464d98051964a86f7b1cde0ff0aab7
 EBUILD icu-68.2.ebuild 3513 BLAKE2B 96030ab9f3819d5c9d60adc9cb044150abf0adb958bef0925dae595ea4139bc80fc02d1743df56feb6b9a4ee8235d62a24280457710f6a51d720746535a50b1a SHA512 f1aba2f2669183077e5d46356ffaa570b7dcfab7531e0e4c33b6b6a4d1d8b19ef63422396b9dd8be03488089faafd4e66d61e60c763330f94dc03b9d83d55e63
 EBUILD icu-69.1.ebuild 3521 BLAKE2B 78e7c37da536a36de76cd071139c037935c959f5c15448107b2508e6e9ec325f98fc194d5c08dcd101e37bedeb188ad823ee44475a6dba12fe41df3137f218b7 SHA512 d9e95da2917901daa3c3189d2055de4a96794ff990e557bf7ad58b9bbd653e47faff354b4e9c63effe846be2c6f1465792caefebefb2366cb7b94c20793438b4
 MISC metadata.xml 255 BLAKE2B 9b8486730bea2158e8be5cbbe0552c5460d1b18e2236a68e3f11d85ce4eeb96eb0e746f44a10cb7cdcf1bf498190a512ef42f47852c6843b9a3c937ceabc338d SHA512 ac646e8ac676faf0aac283e4be31c5f2b29e98ccf07327073ed05e688ce696caf639bdfea63e4aed141a90e84c0a86892bc717a52b95cdf1739aaa15240013c3
--- a/dev-libs/icu/icu-69.1.ebuild
+++ b/dev-libs/icu/icu-69.1.ebuild
@ -0,0 +1,147 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 EAPI=7
 PYTHON_COMPAT=( python3_{7..9} )
 inherit autotools flag-o-matic multilib-minimal python-any-r1 toolchain-funcs
 DESCRIPTION="International Components for Unicode"
 HOMEPAGE="http://site.icu-project.org/"
 SRC_URI="https://github.com/unicode-org/icu/releases/download/release-${PV//./-}/icu4c-${PV//./_}-src.tgz"
 LICENSE="BSD"
 SLOT="0/${PV}"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 IUSE="debug doc examples static-libs"
 BDEPEND="${PYTHON_DEPS}
 	virtual/pkgconfig
 	doc? ( app-doc/doxygen[dot] )
 "
 S="${WORKDIR}/${PN}/source"
 MULTILIB_CHOST_TOOLS=(
 	/usr/bin/icu-config
 )
 PATCHES=(
 	"${FILESDIR}/${PN}-65.1-remove-bashisms.patch"
 	"${FILESDIR}/${PN}-64.2-darwin.patch"
 	"${FILESDIR}/${PN}-68.1-nonunicode.patch"
 )
 src_prepare() {
 	default
 	local variable
 	# Disable renaming as it is stupid thing to do
 	sed -i \
 		-e "s/#define U_DISABLE_RENAMING 0/#define U_DISABLE_RENAMING 1/" \
 		common/unicode/uconfig.h || die
 	# Fix linking of icudata
 	sed -i \
 		-e "s:LDFLAGSICUDT=-nodefaultlibs -nostdlib:LDFLAGSICUDT=:" \
 		config/mh-linux || die
 	# Append doxygen configuration to configure
 	sed -i \
 		-e 's:icudefs.mk:icudefs.mk Doxyfile:' \
 		configure.ac || die
 	eautoreconf
 }
 src_configure() {
 	append-cxxflags -std=c++14
 	if tc-is-cross-compiler; then
 		mkdir "${WORKDIR}"/host || die
 		pushd "${WORKDIR}"/host >/dev/null || die
 		CFLAGS="" CXXFLAGS="" ASFLAGS="" LDFLAGS="" \
 		CC="$(tc-getBUILD_CC)" CXX="$(tc-getBUILD_CXX)" AR="$(tc-getBUILD_AR)" \
 		RANLIB="$(tc-getBUILD_RANLIB)" LD="$(tc-getBUILD_LD)" \
 		"${S}"/configure --disable-renaming --disable-debug \
 			--disable-samples --enable-static || die
 		emake
 		popd >/dev/null || die
 	fi
 	multilib-minimal_src_configure
 }
 multilib_src_configure() {
 	local myeconfargs=(
 		--disable-renaming
 		--disable-samples
 		--disable-layoutex
 		$(use_enable debug)
 		$(use_enable static-libs static)
 		$(multilib_native_use_enable examples samples)
 	)
 	tc-is-cross-compiler && myeconfargs+=(
 		--with-cross-build="${WORKDIR}"/host
 	)
 	# work around cross-endian testing failures with LTO #757681
 	if tc-is-cross-compiler && is-flagq '-flto*' ; then
 		myeconfargs+=( --disable-strict )
 	fi
 	# icu tries to use clang by default
 	tc-export CC CXX
 	# make sure we configure with the same shell as we run icu-config
 	# with, or ECHO_N, ECHO_T and ECHO_C will be wrongly defined
 	export CONFIG_SHELL="${EPREFIX}/bin/sh"
 	# probably have no /bin/sh in prefix-chain
 	[[ -x ${CONFIG_SHELL} ]] || CONFIG_SHELL="${BASH}"
 	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
 }
 multilib_src_compile() {
 	default
 	if multilib_is_native_abi && use doc; then
 		doxygen -u Doxyfile || die
 		doxygen Doxyfile || die
 	fi
 }
 multilib_src_test() {
 	# INTLTEST_OPTS: intltest options
 	#   -e: Exhaustive testing
 	#   -l: Reporting of memory leaks
 	#   -v: Increased verbosity
 	# IOTEST_OPTS: iotest options
 	#   -e: Exhaustive testing
 	#   -v: Increased verbosity
 	# CINTLTST_OPTS: cintltst options
 	#   -e: Exhaustive testing
 	#   -v: Increased verbosity
 	emake -j1 VERBOSE="1" check
 }
 multilib_src_install() {
 	default
 	if multilib_is_native_abi && use doc; then
 		docinto html
 		dodoc -r doc/html/*
 	fi
 }
 multilib_src_install_all() {
 	einstalldocs
 	docinto html
 	dodoc ../readme.html
 }
--- a/dev-libs/libfastjson/Manifest
+++ b/dev-libs/libfastjson/Manifest
@ -1,5 +1,5 @@
 DIST libfastjson-0.99.8.tar.gz 433819 BLAKE2B f988c01de8e7becc5a848825c18151fec2b80f81eb5b50e459b1a3bb535f5521fb63e9350eb133eb984f57f42c5f529220a0c9461eb4689e1421ad815c4c4d87 SHA512 1e7eb7eaae2c6ccb78b77ac883808e1d311b03bad083dc72ab7712765a2ed139accd762850d60f54c6fe0ad48c4385714818fd2c8ed76700ce3546e5aff1c823
 DIST libfastjson-0.99.9.tar.gz 436502 BLAKE2B 5ed542f373dee2e28c85f8b48e9d35c7727d7e565c691f90caed7a9ac1192814c6371e03bce18dd9765b4251e6a78b7e612eeb38872d2833cd72021d41fb889a SHA512 90505fba033179aa92f12ac5dbbb071f69f3491de5bbbbb46d553b08ac325448459c9e33ba22ef4f9db0bae4496cca60046eebf6325d70b045c1a0a9845b0d48
 EBUILD libfastjson-0.99.8.ebuild 798 BLAKE2B 128eb7191ddb61e58a1fbf7a0d3628c7e2be7e75b95b177e9052c41f29eea8fe0f286a6fb9e3980b0896ac0626bf05618e6b5e51d7166113f758f20401fffbb8 SHA512 9609f897070f08b031ff226023afe58db45cd34b2200c5f636d71f1bc1665214e054004e3117edd5bf0f01fc1c30cb4542e0fbd9c2b24c91bab5c29b6945526b
-EBUILD libfastjson-0.99.9.ebuild 798 BLAKE2B 1f5a95d34fb3657cf14ca2f4e383888eb5725383c2fe4c92d6ad112837593da17e69d8089e8d3b3915ad2594a322922d11a41501b32d3de67463f5074b403ea5 SHA512 2cac4ee2a7d9e59e53e96ae023bf2daec65b9657e502c180e225d111b81737f3164d642c88156b1c7e8b64264c0de846c21fc6a92ca175b162303c4a1b09136b
+EBUILD libfastjson-0.99.9.ebuild 797 BLAKE2B 879d9774b9fa08110cc2f2a4d5b93c8b8838e310b0d6d7af66c70610bc4bdd99980127753bd1016315403c0dc5352a4a938165120b933f0fc1168113ffebfc1e SHA512 99455fe6dc1f5a25fcfd54a3c7f5bc716fae37b4e2663e1048e47faa7aade7d43ad484db52b625737459c769f3829f816dc006b11a3bc515dce338d4baddb113
 MISC metadata.xml 538 BLAKE2B 55f8eeaa861845ba5d7c7386fe38f1e45ccf57d3c619dee616c890af65cdbccc115df324e873b90fee67375f6caabda26dcb870297e39575188196b2d7275eb3 SHA512 10dc8d8104e44fd107c150d272da317812755a36f44e56521dbf43259e33247f4080273b1dbc0577ebf5430798e48b2c64ed17d311070e31f9191708f79a4f31
--- a/dev-libs/libfastjson/libfastjson-0.99.9.ebuild
+++ b/dev-libs/libfastjson/libfastjson-0.99.9.ebuild
@ -10,7 +10,7 @@ HOMEPAGE="https://www.rsyslog.com/tag/libfastjson/"
 SRC_URI="http://download.rsyslog.com/${PN}/${P}.tar.gz"
 LICENSE="MIT"
 SLOT="0/4.3.0"
-KEYWORDS="amd64 ~arm ~arm64 ~hppa ~sparc x86"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa sparc x86"
 IUSE="static-libs"
 DEPEND=">=sys-devel/autoconf-archive-2015.02.04"
--- a/dev-libs/quazip/Manifest
+++ b/dev-libs/quazip/Manifest
@ -4,5 +4,5 @@ AUX quazip-1.1-cmake.patch 3279 BLAKE2B 5b596da742e87c00c742881a8585d4f48955d99d
 DIST quazip-0.9.1.tar.gz 155775 BLAKE2B 76710f94d055e86e1885f74b85f3e6b25f053eedbb73b4b11163e243d003ea3bad50cf1568fd2dbd37bc5db05fd0a6f8d49f48bd5df22d30b1aad3747e8ab780 SHA512 db31f3c7e3d7e95c25090ceb8379643e0b49ed69ece009dd015bee120b2b60f42e73408f580caed3138fa19ca64dcd23a05f16435abb54e2b8df21105c7b42c0
 DIST quazip-1.1.tar.gz 153870 BLAKE2B c784d21d7c9623472fabf9bbf68c9d191dd0765f6b7114f0ea0b2597bbb31a9957feaea4d0325f98116d71acc4a7057f5c28ce5b84c6317cd25fdade30a279da SHA512 418516759e993c2e5636422c6a14e2caf95f836698b91d2188df5ef9b97879ee326255273793fc802325e14f378cbe2baad7e6ec2e1732e19bf238f70891f22c
 EBUILD quazip-0.9.1.ebuild 810 BLAKE2B f8db2dd4d6d6500b5b3c845a68e2ecf7c7ffca1eaacaf574d70a987f11ca9c14f32910c2d3a7158f18a7be5292d65b2be8100e4e85613ebd54c9223b86ed2d86 SHA512 f6fa2668422c633f620de9b3647f56f9ceee51ff5441cdebe04ac432e4df79864fb956aa5ab9705e6df0e2c82e386661b8b3bcb841450bfed52df65234859c41
-EBUILD quazip-1.1-r1.ebuild 935 BLAKE2B f5702e001bb0226716028e25ccdf9939d62fd40cb1b06447eb1da495d2e148a3f2bbe2a523d48131199b0e6d6b68ce07bab4c1cc6fc1637bc631b18a0d646bc4 SHA512 b15e1f4f044ef478e6d11038454869ebfd1f4e26eaa692aa511e08c4a369f37f18fb62098b43b4de1fc244fe29e6a35e023a3c0e61979838a6ce3b9e1a19347d
+EBUILD quazip-1.1-r1.ebuild 934 BLAKE2B 3bf86d7872c881b8bce8b141e6f6c807e37d396ad54f103e240bb167d22e48ba62124700bcc2438e9ddcf242cc52e9490a839a77cec69f866ed987ced5d476af SHA512 5373be3092940b55575cca3f28645ee8726cc066a71a546964d50e5d9945ddb28f6674eba3ca636178c70b50cf5f3a3ebccc70c309e2553bc961ad8f88b35c32
 MISC metadata.xml 347 BLAKE2B 1e86912a83f631c37ead72278d84fd3cefbce9971290275d83b4bc610739a3ec8dc87f5e7013719f8c39009ea671b0ba4ecc5da35c9cb4b9ae9222f0a19063f3 SHA512 48c3f44c6414f236058d4e3ee963b24ce5852d5742ab7ab4038b6e56a63250fbb4975064ce1f57c0a93084aa836e2c465da57170d55d7208b8032031eac19638
--- a/dev-libs/quazip/quazip-1.1-r1.ebuild
+++ b/dev-libs/quazip/quazip-1.1-r1.ebuild
@ -11,7 +11,7 @@ SRC_URI="https://github.com/stachenov/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
 LICENSE="LGPL-2.1-with-linking-exception"
 SLOT="0/1"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ppc ppc64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ppc ppc64 x86 ~amd64-linux ~x86-linux"
 IUSE="test"
 RESTRICT="!test? ( test )"
--- a/Show More
+++ b/Show More
		`@ -0,0 +1,2 @@`
							`EBUILD snort-0.ebuild 146 BLAKE2B 005f9cdceb0dc59cc49721fded69e56a6b23e4c66a9fe1b12319aec9a73d9158ecebf00f67d98c8e4b06ac4217f50c1a3fedfd7debb5ecb5f7cccd9c68acf1cc SHA512 06eed08d803f36aabd9b1eaffc6207bf2c5be87a2696acd64d019a6c2248a1561ed8b28c249e019f638b6ce1022edd91d82aae099518fa3beb9e4f619e3a6b2b`
							`MISC metadata.xml 388 BLAKE2B f44ba993517ecb2175a9f2d4aa668ad95dd3d57f60a2e5efba2ab0c55bd1931cfbb283e2dd04b994294eef7ed1d8823a332305f10aac8e37a799f3c07fdcfa2e SHA512 3685cd1850ce762cf90185731f4e3deaeccc3dbd0a39514a8b836896495fe7718d0d014010fad50f6e0a49245dab093d2c5379c7de5fb1b356f60b204cc94cf2`
		`@ -0,0 +1,2 @@`
							`EBUILD snort-0.ebuild 220 BLAKE2B 182b20f6e477e5cf055bceed938dece508ffcb144531e445d4db11edbd7c75965be861078a7bfea22ae87f8dba8bd286b56038a3760afdb56d5340c012880a79 SHA512 32ae2d723d3743a766e2939d4d196f9f014cf492f0880db9b75360542144543629d54104c0f1baf60cd97848bfa81687f3226e468aece4a61ac4cecdb01cfdfe`
							`MISC metadata.xml 388 BLAKE2B f44ba993517ecb2175a9f2d4aa668ad95dd3d57f60a2e5efba2ab0c55bd1931cfbb283e2dd04b994294eef7ed1d8823a332305f10aac8e37a799f3c07fdcfa2e SHA512 3685cd1850ce762cf90185731f4e3deaeccc3dbd0a39514a8b836896495fe7718d0d014010fad50f6e0a49245dab093d2c5379c7de5fb1b356f60b204cc94cf2`